[24779] branches/dp2mp-move/base/src/package1.0
source_changes at macosforge.org
source_changes at macosforge.org
Thu May 3 19:37:26 PDT 2007
Revision: 24779
http://trac.macosforge.org/projects/macports/changeset/24779
Author: jmpp at macports.org
Date: 2007-05-03 19:37:25 -0700 (Thu, 03 May 2007)
Log Message:
-----------
First commit moving com.apple.<target> strings in our source code to the org.macports.<target> naming, more to come.
Modified Paths:
--------------
branches/dp2mp-move/base/src/package1.0/portarchive.tcl
branches/dp2mp-move/base/src/package1.0/portdmg.tcl
branches/dp2mp-move/base/src/package1.0/portdpkg.tcl
branches/dp2mp-move/base/src/package1.0/portmpkg.tcl
branches/dp2mp-move/base/src/package1.0/portpkg.tcl
branches/dp2mp-move/base/src/package1.0/portrpmpackage.tcl
branches/dp2mp-move/base/src/package1.0/portunarchive.tcl
Modified: branches/dp2mp-move/base/src/package1.0/portarchive.tcl
===================================================================
--- branches/dp2mp-move/base/src/package1.0/portarchive.tcl 2007-05-03 21:32:31 UTC (rev 24778)
+++ branches/dp2mp-move/base/src/package1.0/portarchive.tcl 2007-05-04 02:37:25 UTC (rev 24779)
@@ -34,12 +34,12 @@
package provide portarchive 1.0
package require portutil 1.0
-set com.apple.archive [target_new com.apple.archive archive_main]
-target_init ${com.apple.archive} archive_init
-target_provides ${com.apple.archive} archive
-target_requires ${com.apple.archive} main fetch extract checksum patch configure build destroot
-target_prerun ${com.apple.archive} archive_start
-target_postrun ${com.apple.archive} archive_finish
+set org.macports.archive [target_new org.macports.archive archive_main]
+target_init ${org.macports.archive} 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
# defaults
default archive.dir {${destpath}}
@@ -87,9 +87,9 @@
# Determine if archive should be skipped
set skipped 0
- if {[check_statefile target com.apple.archive $target_state_fd]} {
+ if {[check_statefile target org.macports.archive $target_state_fd]} {
return 0
- } elseif {[check_statefile target com.apple.unarchive $target_state_fd] && ([info exists ports_binary_only] && $ports_binary_only == "yes")} {
+ } elseif {[check_statefile target org.macports.unarchive $target_state_fd] && ([info exists ports_binary_only] && $ports_binary_only == "yes")} {
ui_debug "Skipping archive ($portname) since binary-only is set"
set skipped 1
} elseif {[info exists ports_source_only] && $ports_source_only == "yes"} {
@@ -113,7 +113,7 @@
}
# Skip archive target by setting state
if {$skipped == 1} {
- write_statefile target "com.apple.archive" $target_state_fd
+ write_statefile target "org.macports.archive" $target_state_fd
}
return 0
Modified: branches/dp2mp-move/base/src/package1.0/portdmg.tcl
===================================================================
--- branches/dp2mp-move/base/src/package1.0/portdmg.tcl 2007-05-03 21:32:31 UTC (rev 24778)
+++ branches/dp2mp-move/base/src/package1.0/portdmg.tcl 2007-05-04 02:37:25 UTC (rev 24779)
@@ -33,10 +33,10 @@
package provide portdmg 1.0
package require portutil 1.0
-set com.apple.dmg [target_new com.apple.dmg dmg_main]
-target_runtype ${com.apple.dmg} always
-target_provides ${com.apple.dmg} dmg
-target_requires ${com.apple.dmg} pkg
+set org.macports.dmg [target_new org.macports.dmg dmg_main]
+target_runtype ${org.macports.dmg} always
+target_provides ${org.macports.dmg} dmg
+target_requires ${org.macports.dmg} pkg
set_ui_prefix
Modified: branches/dp2mp-move/base/src/package1.0/portdpkg.tcl
===================================================================
--- branches/dp2mp-move/base/src/package1.0/portdpkg.tcl 2007-05-03 21:32:31 UTC (rev 24778)
+++ branches/dp2mp-move/base/src/package1.0/portdpkg.tcl 2007-05-04 02:37:25 UTC (rev 24779)
@@ -34,13 +34,13 @@
package provide portdpkg 1.0
package require portutil 1.0
-set com.apple.dpkg [target_new com.apple.dpkg com.apple.dpkg::main]
-target_runtype ${com.apple.dpkg} always
-target_provides ${com.apple.dpkg} dpkg
-target_requires ${com.apple.dpkg} destroot
+set org.macports.dpkg [target_new org.macports.dpkg org.macports.dpkg::main]
+target_runtype ${org.macports.dpkg} always
+target_provides ${org.macports.dpkg} dpkg
+target_requires ${org.macports.dpkg} destroot
# Target Namespace
-namespace eval com.apple.dpkg {
+namespace eval org.macports.dpkg {
}
# Options
@@ -48,7 +48,7 @@
set_ui_prefix
-proc com.apple.dpkg::main {args} {
+proc org.macports.dpkg::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 +160,7 @@
system "rm -rf \"${controlpath}\""
}
-proc com.apple.dpkg::make_dependency_list {portname} {
+proc org.macports.dpkg::make_dependency_list {portname} {
set result {}
if {[catch {set res [mport_search "^$portname\$"]} error]} {
global errorInfo
Modified: branches/dp2mp-move/base/src/package1.0/portmpkg.tcl
===================================================================
--- branches/dp2mp-move/base/src/package1.0/portmpkg.tcl 2007-05-03 21:32:31 UTC (rev 24778)
+++ branches/dp2mp-move/base/src/package1.0/portmpkg.tcl 2007-05-04 02:37:25 UTC (rev 24779)
@@ -33,10 +33,10 @@
package provide portmpkg 1.0
package require portutil 1.0
-set com.apple.mpkg [target_new com.apple.mpkg mpkg_main]
-target_runtype ${com.apple.mpkg} always
-target_provides ${com.apple.mpkg} mpkg
-target_requires ${com.apple.mpkg} pkg
+set org.macports.mpkg [target_new org.macports.mpkg mpkg_main]
+target_runtype ${org.macports.mpkg} always
+target_provides ${org.macports.mpkg} mpkg
+target_requires ${org.macports.mpkg} pkg
# define options
options package.destpath
Modified: branches/dp2mp-move/base/src/package1.0/portpkg.tcl
===================================================================
--- branches/dp2mp-move/base/src/package1.0/portpkg.tcl 2007-05-03 21:32:31 UTC (rev 24778)
+++ branches/dp2mp-move/base/src/package1.0/portpkg.tcl 2007-05-04 02:37:25 UTC (rev 24779)
@@ -33,13 +33,13 @@
package provide portpkg 1.0
package require portutil 1.0
-set com.apple.pkg [target_new com.apple.pkg pkg_main]
-target_runtype ${com.apple.pkg} always
-target_provides ${com.apple.pkg} pkg
+set org.macports.pkg [target_new org.macports.pkg pkg_main]
+target_runtype ${org.macports.pkg} always
+target_provides ${org.macports.pkg} pkg
if {[option portarchivemode] == "yes"} {
- target_requires ${com.apple.pkg} unarchive destroot
+ target_requires ${org.macports.pkg} unarchive destroot
} else {
- target_requires ${com.apple.pkg} destroot
+ target_requires ${org.macports.pkg} destroot
}
# define options
Modified: branches/dp2mp-move/base/src/package1.0/portrpmpackage.tcl
===================================================================
--- branches/dp2mp-move/base/src/package1.0/portrpmpackage.tcl 2007-05-03 21:32:31 UTC (rev 24778)
+++ branches/dp2mp-move/base/src/package1.0/portrpmpackage.tcl 2007-05-04 02:37:25 UTC (rev 24779)
@@ -33,10 +33,10 @@
package provide portrpmpackage 1.0
package require portutil 1.0
-set com.apple.rpmpackage [target_new com.apple.rpmpackage rpmpackage_main]
-target_runtype ${com.apple.rpmpackage} always
-target_provides ${com.apple.rpmpackage} rpmpackage
-target_requires ${com.apple.rpmpackage} destroot
+set org.macports.rpmpackage [target_new org.macports.rpmpackage rpmpackage_main]
+target_runtype ${org.macports.rpmpackage} always
+target_provides ${org.macports.rpmpackage} rpmpackage
+target_requires ${org.macports.rpmpackage} destroot
options package.destpath
Modified: branches/dp2mp-move/base/src/package1.0/portunarchive.tcl
===================================================================
--- branches/dp2mp-move/base/src/package1.0/portunarchive.tcl 2007-05-03 21:32:31 UTC (rev 24778)
+++ branches/dp2mp-move/base/src/package1.0/portunarchive.tcl 2007-05-04 02:37:25 UTC (rev 24779)
@@ -34,13 +34,13 @@
package provide portunarchive 1.0
package require portutil 1.0
-set com.apple.unarchive [target_new com.apple.unarchive unarchive_main]
-target_runtype ${com.apple.unarchive} always
-target_init ${com.apple.unarchive} unarchive_init
-target_provides ${com.apple.unarchive} unarchive
-target_requires ${com.apple.unarchive} main
-target_prerun ${com.apple.unarchive} unarchive_start
-target_postrun ${com.apple.unarchive} unarchive_finish
+set org.macports.unarchive [target_new org.macports.unarchive unarchive_main]
+target_runtype ${org.macports.unarchive} always
+target_init ${org.macports.unarchive} 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
# defaults
default unarchive.dir {${destpath}}
@@ -87,12 +87,12 @@
# Determine if unarchive should be skipped
set skipped 0
- if {[check_statefile target com.apple.unarchive $target_state_fd]} {
+ if {[check_statefile target org.macports.unarchive $target_state_fd]} {
return 0
} elseif {[info exists ports_source_only] && $ports_source_only == "yes"} {
ui_debug "Skipping unarchive ($portname) since source-only is set"
set skipped 1
- } elseif {[check_statefile target com.apple.destroot $target_state_fd]} {
+ } elseif {[check_statefile target org.macports.destroot $target_state_fd]} {
ui_debug "Skipping unarchive ($portname) since destroot completed"
set skipped 1
} elseif {[info exists ports_force] && $ports_force == "yes"} {
@@ -133,7 +133,7 @@
}
# Skip unarchive target by setting state
if {$skipped == 1} {
- write_statefile target "com.apple.unarchive" $target_state_fd
+ write_statefile target "org.macports.unarchive" $target_state_fd
}
return 0
@@ -291,7 +291,7 @@
set target_state_fd [open_statefile]
# Archive unpacked, skip archive target
- write_statefile target "com.apple.archive" $target_state_fd
+ write_statefile target "org.macports.archive" $target_state_fd
# Cleanup all control files when finished
set control_files [glob -nocomplain -types f [file join $destpath +*]]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070503/36f99992/attachment.html
More information about the macports-changes
mailing list