[50252] branches/images-and-archives/base
blb at macports.org
blb at macports.org
Tue Apr 28 00:41:09 PDT 2009
Revision: 50252
http://trac.macports.org/changeset/50252
Author: blb at macports.org
Date: 2009-04-28 00:41:08 -0700 (Tue, 28 Apr 2009)
Log Message:
-----------
Remove image and archive options
Modified Paths:
--------------
branches/images-and-archives/base/doc/macports.conf.in
branches/images-and-archives/base/src/macports1.0/macports.tcl
branches/images-and-archives/base/src/package1.0/portarchive.tcl
branches/images-and-archives/base/src/package1.0/portpkg.tcl
branches/images-and-archives/base/src/package1.0/portunarchive.tcl
branches/images-and-archives/base/src/port1.0/portactivate.tcl
branches/images-and-archives/base/src/port1.0/portinstall.tcl
branches/images-and-archives/base/tests/test-macports.conf
Modified: branches/images-and-archives/base/doc/macports.conf.in
===================================================================
--- branches/images-and-archives/base/doc/macports.conf.in 2009-04-28 06:55:08 UTC (rev 50251)
+++ branches/images-and-archives/base/doc/macports.conf.in 2009-04-28 07:41:08 UTC (rev 50252)
@@ -14,9 +14,6 @@
# NOTE: sqlite not yet supported.
portdbformat flat
-# Type of installation to do for ports, "direct" or "image". See macports.conf(5) and online documentation.
-portinstalltype image
-
# PATH settings that are used for external tools (configure, make, etc.) while installing ports. The default
# paths are given in the example; it need not be uncommented. Customizing binpath is intended for advanced users only.
#binpath @prefix_expanded@/bin:@prefix_expanded@/sbin:/bin:/sbin:/usr/bin:/usr/sbin:@x11prefix@/bin
@@ -36,23 +33,6 @@
# Where to find global variants definition file (optional)
variants_conf @MPCONFIGDIR_EXPANDED@/variants.conf
-# Create and use binary archive packages for installation/reinstallation ease
-portarchivemode no
-
-# Where to store/retrieve ports binary archive files
-portarchivepath @localstatedir_expanded@/macports/packages
-
-# Type of binary archive packages to create when using archive mode
-#
-# Note: Multiple types ARE allowed and must be a colon or comma
-# separated list of choices (NO spaces). Use of multiple types will
-# cause archive creation to build all the specified types in one step.
-# Unarchive uses multiple types as a search list to locate the archive,
-# first archive to match one of the specified types in order is used.
-#
-# Supported types: tgz (default), tar, tbz, tbz2, tlz, xar, zip, cpgz, cpio
-portarchivetype tgz
-
# Use ccache (C/C++ compiler cache) - see http://ccache.samba.org/
configureccache no
Modified: branches/images-and-archives/base/src/macports1.0/macports.tcl
===================================================================
--- branches/images-and-archives/base/src/macports1.0/macports.tcl 2009-04-28 06:55:08 UTC (rev 50251)
+++ branches/images-and-archives/base/src/macports1.0/macports.tcl 2009-04-28 07:41:08 UTC (rev 50252)
@@ -41,7 +41,7 @@
namespace export bootstrap_options user_options portinterp_options open_mports ui_priorities
variable bootstrap_options "\
portdbpath libpath binpath auto_path extra_env sources_conf prefix x11prefix portdbformat \
- portinstalltype portarchivemode portarchivepath portarchivetype portautoclean \
+ portinstalltype portarchivepath portarchivetype portautoclean \
porttrace portverbose destroot_umask variants_conf rsync_server rsync_options \
rsync_dir startupitem_type place_worksymlink xcodeversion xcodebuildcmd \
mp_remote_url mp_remote_submit_url configureccache configuredistcc configurepipe buildnicevalue buildmakejobs \
@@ -50,7 +50,7 @@
variable user_options "submitter_name submitter_email submitter_key"
variable portinterp_options "\
portdbpath porturl portpath portbuildpath auto_path prefix prefix_frozen x11prefix portsharepath \
- registry.path registry.format registry.installtype portarchivemode portarchivepath \
+ registry.path registry.format registry.installtype portarchivepath \
portarchivetype portautoclean porttrace portverbose destroot_umask rsync_server \
rsync_options rsync_dir startupitem_type place_worksymlink \
mp_remote_url mp_remote_submit_url configureccache configuredistcc configurepipe buildnicevalue buildmakejobs \
@@ -545,36 +545,22 @@
}
}
- # Archive mode, whether to create/use binary archive packages
- if {![info exists portarchivemode]} {
- set macports::portarchivemode "yes"
- global macports::portarchivemode
- }
-
# Archive path, where to store/retrieve binary archive packages
- if {![info exists portarchivepath]} {
- set macports::portarchivepath [file join $portdbpath packages]
- global macports::portarchivepath
- }
- if {$portarchivemode == "yes"} {
- if {![file isdirectory $portarchivepath]} {
- if {![file exists $portarchivepath]} {
- if {[catch {file mkdir $portarchivepath} result]} {
- return -code error "portarchivepath $portarchivepath does not exist and could not be created: $result"
- }
+ set macports::portarchivepath [file join $portdbpath packages]
+ global macports::portarchivepath
+ if {![file isdirectory $portarchivepath]} {
+ if {![file exists $portarchivepath]} {
+ if {[catch {file mkdir $portarchivepath} result]} {
+ return -code error "portarchivepath $portarchivepath does not exist and could not be created: $result"
}
}
- if {![file isdirectory $portarchivepath]} {
- return -code error "$portarchivepath is not a directory. Please create the directory $portarchivepath and try again"
- }
}
-
- # Archive type, what type of binary archive to use (CPIO, gzipped
- # CPIO, XAR, etc.)
- if {![info exists portarchivetype]} {
- set macports::portarchivetype "cpgz"
- global macports::portarchivetype
+ if {![file isdirectory $portarchivepath]} {
+ return -code error "$portarchivepath is not a directory. Please create the directory $portarchivepath and try again"
}
+
+ set macports::portarchivetype "tbz"
+ global macports::portarchivetype
# Convert archive type to a list for multi-archive support, colon or
# comma separators indicates to use multiple archive formats
# (reading and writing)
@@ -2152,7 +2138,6 @@
# upgrade procedure
proc macports::upgrade {portname dspec globalvarlist variationslist optionslist {depscachename ""}} {
global macports::registry.installtype
- global macports::portarchivemode
array set options $optionslist
# Note $variationslist is left alone and so retains the original
@@ -2407,11 +2392,7 @@
# install version_in_tree
- if {0 == [string compare "yes" ${macports::portarchivemode}]} {
- set upgrade_action "archive"
- } else {
- set upgrade_action "destroot"
- }
+ set upgrade_action "archive"
if {[catch {set result [mportexec $workername $upgrade_action]} result] || $result != 0} {
global errorInfo
Modified: branches/images-and-archives/base/src/package1.0/portarchive.tcl
===================================================================
--- branches/images-and-archives/base/src/package1.0/portarchive.tcl 2009-04-28 06:55:08 UTC (rev 50251)
+++ branches/images-and-archives/base/src/package1.0/portarchive.tcl 2009-04-28 07:41:08 UTC (rev 50252)
@@ -71,11 +71,6 @@
global archive.destpath archive.type archive.meta
global archive.file archive.path archive.fulldestpath
- # Check mode in case archive called directly by user
- if {[option portarchivemode] != "yes"} {
- return -code error "Archive mode is not enabled!"
- }
-
# Define port variants if not already defined
if { ![info exists portvariants] } {
set portvariants ""
Modified: branches/images-and-archives/base/src/package1.0/portpkg.tcl
===================================================================
--- branches/images-and-archives/base/src/package1.0/portpkg.tcl 2009-04-28 06:55:08 UTC (rev 50251)
+++ branches/images-and-archives/base/src/package1.0/portpkg.tcl 2009-04-28 07:41:08 UTC (rev 50252)
@@ -36,11 +36,7 @@
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"} {
- target_requires ${org.macports.pkg} unarchive destroot
-} else {
- target_requires ${org.macports.pkg} destroot
-}
+target_requires ${org.macports.pkg} unarchive destroot
namespace eval portpkg {
}
Modified: branches/images-and-archives/base/src/package1.0/portunarchive.tcl
===================================================================
--- branches/images-and-archives/base/src/package1.0/portunarchive.tcl 2009-04-28 06:55:08 UTC (rev 50251)
+++ branches/images-and-archives/base/src/package1.0/portunarchive.tcl 2009-04-28 07:41:08 UTC (rev 50252)
@@ -66,11 +66,6 @@
global portname portversion portrevision portvariants portpath
global unarchive.srcpath unarchive.type unarchive.file unarchive.path unarchive.fullsrcpath
- # Check mode in case archive called directly by user
- if {[option portarchivemode] != "yes"} {
- return -code error "Archive mode is not enabled!"
- }
-
# Define port variants if not already defined
if { ![info exists portvariants] } {
set portvariants ""
Modified: branches/images-and-archives/base/src/port1.0/portactivate.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portactivate.tcl 2009-04-28 06:55:08 UTC (rev 50251)
+++ branches/images-and-archives/base/src/port1.0/portactivate.tcl 2009-04-28 07:41:08 UTC (rev 50252)
@@ -40,11 +40,7 @@
target_runtype ${org.macports.activate} always
target_state ${org.macports.activate} no
target_provides ${org.macports.activate} activate
-if {[option portarchivemode] == "yes"} {
- target_requires ${org.macports.activate} main unarchive fetch extract checksum patch configure build destroot archive install
-} else {
- target_requires ${org.macports.activate} main fetch extract checksum patch configure build destroot install
-}
+target_requires ${org.macports.activate} main unarchive fetch extract checksum patch configure build destroot archive install
namespace eval portactivate {
}
Modified: branches/images-and-archives/base/src/port1.0/portinstall.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portinstall.tcl 2009-04-28 06:55:08 UTC (rev 50251)
+++ branches/images-and-archives/base/src/port1.0/portinstall.tcl 2009-04-28 07:41:08 UTC (rev 50252)
@@ -36,11 +36,7 @@
set org.macports.install [target_new org.macports.install portinstall::install_main]
target_provides ${org.macports.install} install
-if {[option portarchivemode] == "yes"} {
- target_requires ${org.macports.install} main unarchive fetch extract checksum patch configure build destroot archive
-} else {
- target_requires ${org.macports.install} main fetch extract checksum patch configure build destroot
-}
+target_requires ${org.macports.install} main unarchive fetch extract checksum patch configure build destroot archive
target_prerun ${org.macports.install} portinstall::install_start
namespace eval portinstall {
Modified: branches/images-and-archives/base/tests/test-macports.conf
===================================================================
--- branches/images-and-archives/base/tests/test-macports.conf 2009-04-28 06:55:08 UTC (rev 50251)
+++ branches/images-and-archives/base/tests/test-macports.conf 2009-04-28 07:41:08 UTC (rev 50252)
@@ -11,9 +11,6 @@
# NOTE: sqlite not yet supported.
portdbformat flat
-# Type of installation to do for ports, "direct" or "image". See macports.conf(5) and online documentation.
-portinstalltype image
-
# Directory containing the X11 installation.
x11prefix /tmp/macports-tests/usr/X11R6
@@ -23,23 +20,6 @@
# Where to find global variants definition file (optional)
#variants_conf /opt/local/etc/macports/variants.conf
-# Create and use binary archive packages for installation/reinstallation ease
-portarchivemode no
-
-# Where to store/retrieve ports binary archive files
-portarchivepath /tmp/macports-tests/opt/local/var/macports/packages
-
-# Type of binary archive packages to create when using archive mode
-#
-# Note: Multiple types ARE allowed and must be a colon or comma
-# separated list of choices (NO spaces). Use of multiple types will
-# cause archive creation to build all the specified types in one step.
-# Unarchive uses multiple types as a search list to locate the archive,
-# first archive to match one of the specified types in order is used.
-#
-# Supported types: tgz (default), tar, tbz, tbz2, xar, zip, cpgz, cpio
-portarchivetype tbz
-
# Set whether to automatically execute "clean" after "install" of ports
portautoclean yes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090428/c4491421/attachment.html>
More information about the macports-changes
mailing list