[49089] trunk/base/src/package1.0
raimue at macports.org
raimue at macports.org
Fri Apr 3 05:26:39 PDT 2009
Revision: 49089
http://trac.macports.org/changeset/49089
Author: raimue at macports.org
Date: 2009-04-03 05:26:37 -0700 (Fri, 03 Apr 2009)
Log Message:
-----------
package1.0:
Create namespaces for the packages in package1.0, stop polluting the global
namespace with many local helper functions.
Modified Paths:
--------------
trunk/base/src/package1.0/portarchive.tcl
trunk/base/src/package1.0/portdmg.tcl
trunk/base/src/package1.0/portdpkg.tcl
trunk/base/src/package1.0/portmdmg.tcl
trunk/base/src/package1.0/portmpkg.tcl
trunk/base/src/package1.0/portpkg.tcl
trunk/base/src/package1.0/portportpkg.tcl
trunk/base/src/package1.0/portrpm.tcl
trunk/base/src/package1.0/portsrpm.tcl
trunk/base/src/package1.0/portunarchive.tcl
Modified: trunk/base/src/package1.0/portarchive.tcl
===================================================================
--- trunk/base/src/package1.0/portarchive.tcl 2009-04-03 12:02:46 UTC (rev 49088)
+++ trunk/base/src/package1.0/portarchive.tcl 2009-04-03 12:26:37 UTC (rev 49089)
@@ -34,13 +34,16 @@
package provide portarchive 1.0
package require portutil 1.0
-set org.macports.archive [target_new org.macports.archive archive_main]
-target_init ${org.macports.archive} archive_init
+set org.macports.archive [target_new org.macports.archive portarchive::archive_main]
+target_init ${org.macports.archive} portarchive::archive_init
target_provides ${org.macports.archive} archive
target_requires ${org.macports.archive} main fetch extract checksum patch configure build destroot
-target_prerun ${org.macports.archive} archive_start
-target_postrun ${org.macports.archive} archive_finish
+target_prerun ${org.macports.archive} portarchive::archive_start
+target_postrun ${org.macports.archive} portarchive::archive_finish
+namespace eval portarchive {
+}
+
# defaults
default archive.dir {${destpath}}
default archive.env {}
@@ -60,7 +63,7 @@
set_ui_prefix
-proc archive_init {args} {
+proc portarchive::archive_init {args} {
global UI_PREFIX target_state_fd
global variations package.destpath workpath
global ports_force ports_source_only ports_binary_only
@@ -129,7 +132,7 @@
return 0
}
-proc archive_start {args} {
+proc portarchive::archive_start {args} {
global UI_PREFIX
global portname portversion portrevision portvariants
@@ -142,7 +145,7 @@
return 0
}
-proc archive_command_setup {args} {
+proc portarchive::archive_command_setup {args} {
global archive.env archive.cmd
global archive.pre_args archive.args archive.post_args
global archive.type archive.path
@@ -258,14 +261,14 @@
return 0
}
-proc putel { fd el data } {
+proc portarchive::putel { fd el data } {
# Quote xml data
set quoted [string map { & & < < > > } $data]
# Write the element
puts $fd "<${el}>${quoted}</${el}>"
}
-proc putlist { fd listel itemel list } {
+proc portarchive::putlist { fd listel itemel list } {
puts $fd "<$listel>"
foreach item $list {
putel $fd $itemel $item
@@ -273,7 +276,7 @@
puts $fd "</$listel>"
}
-proc archive_main {args} {
+proc portarchive::archive_main {args} {
global UI_PREFIX variations
global workpath destpath portpath ports_force
global portname portepoch portversion portrevision portvariants
@@ -459,7 +462,7 @@
return 0
}
-proc archive_finish {args} {
+proc portarchive::archive_finish {args} {
global UI_PREFIX
global portname portversion portrevision portvariants
global destpath
Modified: trunk/base/src/package1.0/portdmg.tcl
===================================================================
--- trunk/base/src/package1.0/portdmg.tcl 2009-04-03 12:02:46 UTC (rev 49088)
+++ trunk/base/src/package1.0/portdmg.tcl 2009-04-03 12:26:37 UTC (rev 49089)
@@ -33,14 +33,17 @@
package provide portdmg 1.0
package require portutil 1.0
-set org.macports.dmg [target_new org.macports.dmg dmg_main]
+set org.macports.dmg [target_new org.macports.dmg portdmg::dmg_main]
target_runtype ${org.macports.dmg} always
target_provides ${org.macports.dmg} dmg
target_requires ${org.macports.dmg} pkg
+namespace eval portdmg {
+}
+
set_ui_prefix
-proc dmg_main {args} {
+proc portdmg::dmg_main {args} {
global portname portversion portrevision package.destpath UI_PREFIX
ui_msg "$UI_PREFIX [format [msgcat::mc "Creating disk image for %s-%s"] ${portname} ${portversion}]"
@@ -48,7 +51,7 @@
return [package_dmg $portname $portversion $portrevision]
}
-proc package_dmg {portname portversion portrevision} {
+proc portdmg::package_dmg {portname portversion portrevision} {
global UI_PREFIX package.destpath portpath
global os.platform os.arch os.version os.major
Modified: trunk/base/src/package1.0/portdpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portdpkg.tcl 2009-04-03 12:02:46 UTC (rev 49088)
+++ trunk/base/src/package1.0/portdpkg.tcl 2009-04-03 12:26:37 UTC (rev 49089)
@@ -34,13 +34,12 @@
package provide portdpkg 1.0
package require portutil 1.0
-set org.macports.dpkg [target_new org.macports.dpkg org.macports.dpkg::main]
+set org.macports.dpkg [target_new org.macports.dpkg portdpkg::main]
target_runtype ${org.macports.dpkg} always
target_provides ${org.macports.dpkg} dpkg
target_requires ${org.macports.dpkg} destroot
-# Target Namespace
-namespace eval org.macports.dpkg {
+namespace eval portdpkg {
}
# Options
@@ -48,7 +47,7 @@
set_ui_prefix
-proc org.macports.dpkg::main {args} {
+proc portdpkg::main {args} {
global UI_PREFIX destpath os.arch os.platform
ui_msg "$UI_PREFIX [format [msgcat::mc "Creating dpkg for %s-%s"] [option portname] [option portversion]]"
@@ -160,7 +159,7 @@
delete "${controlpath}"
}
-proc org.macports.dpkg::make_dependency_list {portname} {
+proc portdpkg::make_dependency_list {portname} {
set result {}
if {[catch {set res [mport_search "^$portname\$"]} error]} {
global errorInfo
Modified: trunk/base/src/package1.0/portmdmg.tcl
===================================================================
--- trunk/base/src/package1.0/portmdmg.tcl 2009-04-03 12:02:46 UTC (rev 49088)
+++ trunk/base/src/package1.0/portmdmg.tcl 2009-04-03 12:26:37 UTC (rev 49089)
@@ -33,14 +33,17 @@
package provide portmdmg 1.0
package require portutil 1.0
-set org.macports.mdmg [target_new org.macports.mdmg mdmg_main]
+set org.macports.mdmg [target_new org.macports.mdmg portmdmg::mdmg_main]
target_runtype ${org.macports.mdmg} always
target_provides ${org.macports.mdmg} mdmg
target_requires ${org.macports.mdmg} mpkg
+namespace eval portmdmg {
+}
+
set_ui_prefix
-proc mdmg_main {args} {
+proc portmdmg::mdmg_main {args} {
global portname portversion portrevision package.destpath UI_PREFIX
ui_msg "$UI_PREFIX [format [msgcat::mc "Creating disk image for %s-%s"] ${portname} ${portversion}]"
@@ -48,7 +51,7 @@
return [package_mdmg $portname $portversion $portrevision]
}
-proc package_mdmg {portname portversion portrevision} {
+proc portmdmg::package_mdmg {portname portversion portrevision} {
global UI_PREFIX package.destpath portpath
global os.platform os.arch os.version os.major
Modified: trunk/base/src/package1.0/portmpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portmpkg.tcl 2009-04-03 12:02:46 UTC (rev 49088)
+++ trunk/base/src/package1.0/portmpkg.tcl 2009-04-03 12:26:37 UTC (rev 49089)
@@ -33,17 +33,20 @@
package provide portmpkg 1.0
package require portutil 1.0
-set org.macports.mpkg [target_new org.macports.mpkg mpkg_main]
+set org.macports.mpkg [target_new org.macports.mpkg portmpkg::mpkg_main]
target_runtype ${org.macports.mpkg} always
target_provides ${org.macports.mpkg} mpkg
target_requires ${org.macports.mpkg} pkg
+namespace eval portmpkg {
+}
+
# define options
options package.destpath package.flat
set_ui_prefix
-proc mpkg_main {args} {
+proc portmpkg::mpkg_main {args} {
global portname portversion portrevision package.destpath package.flat UI_PREFIX
# Make sure the destination path exists.
@@ -52,7 +55,7 @@
return [package_mpkg $portname $portversion $portrevision]
}
-proc make_dependency_list {portname} {
+proc portmpkg::make_dependency_list {portname} {
set result {}
if {[catch {set res [mport_search "^$portname\$"]} error]} {
global errorInfo
@@ -86,7 +89,7 @@
return $result
}
-proc make_one_package {portname portversion destination} {
+proc portmpkg::make_one_package {portname portversion destination} {
global prefix package.destpath package.flat
if {[catch {set res [mport_search "^$portname\$"]} result]} {
global errorInfo
@@ -108,7 +111,7 @@
}
}
-proc package_mpkg {portname portversion portrevision} {
+proc portmpkg::package_mpkg {portname portversion portrevision} {
global portdbpath destpath workpath prefix porturl description package.destpath package.flat long_description homepage depends_run depends_lib
set pkgpath ${package.destpath}/${portname}-${portversion}.pkg
@@ -151,14 +154,14 @@
return 0
}
-proc xml_escape {s} {
+proc portmpkg::xml_escape {s} {
regsub -all {&} $s {\&} s
regsub -all {<} $s {\<} s
regsub -all {>} $s {\>} s
return $s
}
-proc mpkg_write_info_plist {infofile portname portversion portrevision destination dependencies} {
+proc portmpkg::mpkg_write_info_plist {infofile portname portversion portrevision destination dependencies} {
set vers [split $portversion "."]
if {[string index $destination end] != "/"} {
Modified: trunk/base/src/package1.0/portpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portpkg.tcl 2009-04-03 12:02:46 UTC (rev 49088)
+++ trunk/base/src/package1.0/portpkg.tcl 2009-04-03 12:26:37 UTC (rev 49089)
@@ -33,7 +33,7 @@
package provide portpkg 1.0
package require portutil 1.0
-set org.macports.pkg [target_new org.macports.pkg pkg_main]
+set org.macports.pkg [target_new org.macports.pkg portpkg::pkg_main]
target_runtype ${org.macports.pkg} always
target_provides ${org.macports.pkg} pkg
if {[option portarchivemode] == "yes"} {
@@ -42,6 +42,9 @@
target_requires ${org.macports.pkg} destroot
}
+namespace eval portpkg {
+}
+
# define options
options package.type package.destpath package.flat
@@ -51,7 +54,7 @@
set_ui_prefix
-proc pkg_main {args} {
+proc portpkg::pkg_main {args} {
global portname portversion portrevision package.type package.destpath package.flat UI_PREFIX
ui_msg "$UI_PREFIX [format [msgcat::mc "Creating pkg for %s-%s"] ${portname} ${portversion}]"
@@ -59,7 +62,7 @@
return [package_pkg $portname $portversion $portrevision]
}
-proc package_pkg {portname portversion portrevision} {
+proc portpkg::package_pkg {portname portversion portrevision} {
global UI_PREFIX portdbpath destpath workpath prefix description package.destpath package.flat long_description homepage portpath porturl
global os.version os.major
@@ -150,14 +153,14 @@
return 0
}
-proc write_PkgInfo {infofile} {
+proc portpkg::write_PkgInfo {infofile} {
set infofd [open ${infofile} w+]
puts $infofd "pmkrpkg1"
close $infofd
}
# XXX: deprecated
-proc write_info_file {infofile portname portversion description} {
+proc portpkg::write_info_file {infofile portname portversion description} {
set infofd [open ${infofile} w+]
puts $infofd "Title ${portname}
Version ${portversion}
@@ -178,14 +181,14 @@
close $infofd
}
-proc xml_escape {s} {
+proc portpkg::xml_escape {s} {
regsub -all {&} $s {\&} s
regsub -all {<} $s {\<} s
regsub -all {>} $s {\>} s
return $s
}
-proc write_info_plist {infofile portname portversion portrevision} {
+proc portpkg::write_info_plist {infofile portname portversion portrevision} {
set portname [xml_escape $portname]
set portversion [xml_escape $portversion]
set portrevision [xml_escape $portrevision]
@@ -233,7 +236,7 @@
close $infofd
}
-proc write_description_plist {infofile portname portversion description} {
+proc portpkg::write_description_plist {infofile portname portversion description} {
set portname [xml_escape $portname]
set portversion [xml_escape $portversion]
set description [xml_escape $description]
@@ -257,7 +260,7 @@
close $infofd
}
-proc write_welcome_html {filename portname portversion long_description description homepage} {
+proc portpkg::write_welcome_html {filename portname portversion long_description description homepage} {
set fd [open ${filename} w+]
if {$long_description == ""} {
set long_description $description
@@ -292,7 +295,7 @@
close $fd
}
-proc write_sizes_file {sizesfile portname portversion pkgpath destpath} {
+proc portpkg::write_sizes_file {sizesfile portname portversion pkgpath destpath} {
if {[catch {set numFiles [exec lsbom -s ${pkgpath}/Contents/Archive.bom | wc -l]} result]} {
return -code error [format [msgcat::mc "Reading package bom failed: %s"] $result]
@@ -319,7 +322,7 @@
close $fd
}
-proc write_package_info {infofile portname portversion portrevision} {
+proc portpkg::write_package_info {infofile portname portversion portrevision} {
set portname [xml_escape $portname]
set portversion [xml_escape $portversion]
set portrevision [xml_escape $portrevision]
Modified: trunk/base/src/package1.0/portportpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portportpkg.tcl 2009-04-03 12:02:46 UTC (rev 49088)
+++ trunk/base/src/package1.0/portportpkg.tcl 2009-04-03 12:26:37 UTC (rev 49089)
@@ -33,15 +33,18 @@
package provide portportpkg 1.0
package require portutil 1.0
-set org.macports.portpkg [target_new org.macports.portpkg portpkg_main]
+set org.macports.portpkg [target_new org.macports.portpkg portportpkg::portpkg_main]
target_runtype ${org.macports.portpkg} always
target_provides ${org.macports.portpkg} portpkg
target_requires ${org.macports.portpkg} main
+namespace eval portportpkg {
+}
+
set_ui_prefix
-proc xar_path {args} {
+proc portportpkg::xar_path {args} {
global prefix_frozen
set xar ""
foreach path "${portutil::autoconf::xar_path} ${prefix_frozen}/bin/xar xar" {
@@ -61,7 +64,7 @@
# escape quotes, and things that make the shell cry
-proc shell_escape {str} {
+proc portportpkg::shell_escape {str} {
regsub -all -- {\\} $str {\\\\} str
regsub -all -- {"} $str {\"} str
regsub -all -- {'} $str {\'} str
@@ -69,7 +72,7 @@
}
-proc putel { fd el data } {
+proc portportpkg::putel { fd el data } {
# Quote xml data
set quoted [string map { & & < < > > } $data]
# Write the element
@@ -77,7 +80,7 @@
}
-proc putlist { fd listel itemel list } {
+proc portportpkg::putlist { fd listel itemel list } {
puts $fd "<$listel>"
foreach item $list {
putel $fd $itemel $item
@@ -86,7 +89,7 @@
}
-proc create_portpkg {} {
+proc portportpkg::create_portpkg {} {
global portname portversion prefix UI_PREFIX workpath portpath
set xar [xar_path]
@@ -191,7 +194,7 @@
}
-proc portpkg_main {args} {
+proc portportpkg::portpkg_main {args} {
global portname portversion portverbose prefix UI_PREFIX workpath portpath
ui_msg "$UI_PREFIX [format [msgcat::mc "Creating portpkg for %s-%s"] ${portname} ${portversion}]"
Modified: trunk/base/src/package1.0/portrpm.tcl
===================================================================
--- trunk/base/src/package1.0/portrpm.tcl 2009-04-03 12:02:46 UTC (rev 49088)
+++ trunk/base/src/package1.0/portrpm.tcl 2009-04-03 12:26:37 UTC (rev 49089)
@@ -33,16 +33,19 @@
package provide portrpm 1.0
package require portutil 1.0
-set org.macports.rpm [target_new org.macports.rpm rpm_main]
+set org.macports.rpm [target_new org.macports.rpm portrpm::rpm_main]
target_runtype ${org.macports.rpm} always
target_provides ${org.macports.rpm} rpm
target_requires ${org.macports.rpm} destroot
+namespace eval portrpm {
+}
+
options package.destpath
set_ui_prefix
-proc rpm_main {args} {
+proc portrpm::rpm_main {args} {
global portname portversion portrevision UI_PREFIX
ui_msg "$UI_PREFIX [format [msgcat::mc "Creating RPM package for %s-%s"] ${portname} ${portversion}]"
@@ -50,7 +53,7 @@
return [rpm_pkg $portname $portversion $portrevision]
}
-proc rpm_pkg {portname portversion portrevision} {
+proc portrpm::rpm_pkg {portname portversion portrevision} {
global UI_PREFIX package.destpath portdbpath destpath workpath prefix categories maintainers description long_description homepage epoch portpath
global os.platform os.arch os.version os.major
@@ -124,7 +127,7 @@
return 0
}
-proc make_dependency_list {portname} {
+proc portrpm::make_dependency_list {portname} {
set result {}
if {[catch {set res [mport_search "^$portname\$"]} error]} {
global errorInfo
@@ -158,7 +161,7 @@
return $result
}
-proc word_wrap {orig Length} {
+proc portrpm::word_wrap {orig Length} {
set pos 0
set line ""
set text ""
@@ -188,7 +191,7 @@
return $text
}
-proc write_spec {specfile destroot filelist portname portversion portrevision description long_description homepage category license maintainer dependencies epoch} {
+proc portrpm::write_spec {specfile destroot filelist portname portversion portrevision description long_description homepage category license maintainer dependencies epoch} {
set specfd [open ${specfile} w+]
set origportname ${portname}
regsub -all -- "\-" $portversion "_" portversion
Modified: trunk/base/src/package1.0/portsrpm.tcl
===================================================================
--- trunk/base/src/package1.0/portsrpm.tcl 2009-04-03 12:02:46 UTC (rev 49088)
+++ trunk/base/src/package1.0/portsrpm.tcl 2009-04-03 12:26:37 UTC (rev 49089)
@@ -34,16 +34,19 @@
package require portutil 1.0
package require portfetch 1.0
-set org.macports.srpm [target_new org.macports.srpm srpm_main]
+set org.macports.srpm [target_new org.macports.srpm portsrpm::srpm_main]
target_runtype ${org.macports.srpm} always
target_provides ${org.macports.srpm} srpm
target_requires ${org.macports.srpm} checksum
+namespace eval portsrpm {
+}
+
options package.destpath
set_ui_prefix
-proc srpm_main {args} {
+proc portsrpm::srpm_main {args} {
global portname portversion portrevision UI_PREFIX
ui_msg "$UI_PREFIX [format [msgcat::mc "Creating SRPM package for %s-%s"] ${portname} ${portversion}]"
@@ -51,7 +54,7 @@
return [srpm_pkg $portname $portversion $portrevision]
}
-proc srpm_pkg {portname portversion portrevision} {
+proc portsrpm::srpm_pkg {portname portversion portrevision} {
global UI_PREFIX package.destpath portdbpath destpath workpath distpath prefix categories maintainers description long_description homepage epoch portpath distfiles fetch_urls
global os.platform os.arch os.version os.major
@@ -121,7 +124,7 @@
return 0
}
-proc make_dependency_list {portname} {
+proc portsrpm::make_dependency_list {portname} {
set result {}
if {[catch {set res [mport_search "^$portname\$"]} error]} {
global errorInfo
@@ -155,7 +158,7 @@
return $result
}
-proc word_wrap {orig Length} {
+proc portsrpm::word_wrap {orig Length} {
set pos 0
set line ""
set text ""
@@ -185,7 +188,7 @@
return $text
}
-proc write_port_spec {specfile portname portversion portrevision description long_description homepage category license maintainer distfiles fetch_urls dependencies epoch src} {
+proc portsrpm::write_port_spec {specfile portname portversion portrevision description long_description homepage category license maintainer distfiles fetch_urls dependencies epoch src} {
set specfd [open ${specfile} w+]
set origportname ${portname}
regsub -all -- "\-" $portversion "_" portversion
Modified: trunk/base/src/package1.0/portunarchive.tcl
===================================================================
--- trunk/base/src/package1.0/portunarchive.tcl 2009-04-03 12:02:46 UTC (rev 49088)
+++ trunk/base/src/package1.0/portunarchive.tcl 2009-04-03 12:26:37 UTC (rev 49089)
@@ -34,14 +34,17 @@
package provide portunarchive 1.0
package require portutil 1.0
-set org.macports.unarchive [target_new org.macports.unarchive unarchive_main]
+set org.macports.unarchive [target_new org.macports.unarchive portunarchive::unarchive_main]
target_runtype ${org.macports.unarchive} always
-target_init ${org.macports.unarchive} unarchive_init
+target_init ${org.macports.unarchive} portunarchive::unarchive_init
target_provides ${org.macports.unarchive} unarchive
target_requires ${org.macports.unarchive} main
-target_prerun ${org.macports.unarchive} unarchive_start
-target_postrun ${org.macports.unarchive} unarchive_finish
+target_prerun ${org.macports.unarchive} portunarchive::unarchive_start
+target_postrun ${org.macports.unarchive} portunarchive::unarchive_finish
+namespace eval portunarchive {
+}
+
# defaults
default unarchive.dir {${destpath}}
default unarchive.env {}
@@ -57,7 +60,7 @@
set_ui_prefix
-proc unarchive_init {args} {
+proc portunarchive::unarchive_init {args} {
global UI_PREFIX target_state_fd variations workpath
global ports_force ports_source_only ports_binary_only
global portname portversion portrevision portvariants portpath
@@ -141,7 +144,7 @@
return 0
}
-proc unarchive_start {args} {
+proc portunarchive::unarchive_start {args} {
global UI_PREFIX portname portversion portrevision portvariants
global unarchive.type
@@ -150,7 +153,7 @@
return 0
}
-proc unarchive_command_setup {args} {
+proc portunarchive::unarchive_command_setup {args} {
global unarchive.env unarchive.cmd
global unarchive.pre_args unarchive.args unarchive.post_args
global unarchive.type unarchive.path
@@ -259,7 +262,7 @@
return 0
}
-proc unarchive_main {args} {
+proc portunarchive::unarchive_main {args} {
global UI_PREFIX
global portname portversion portrevision portvariants
global unarchive.dir unarchive.file unarchive.pipe_cmd
@@ -283,7 +286,7 @@
return 0
}
-proc unarchive_finish {args} {
+proc portunarchive::unarchive_finish {args} {
global UI_PREFIX target_state_fd unarchive.file portname workpath destpath
# Reset state file with archive version
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090403/cf765c93/attachment-0001.html>
More information about the macports-changes
mailing list