[50725] branches/images-and-archives/base/src
blb at macports.org
blb at macports.org
Thu May 7 23:01:55 PDT 2009
Revision: 50725
http://trac.macports.org/changeset/50725
Author: blb at macports.org
Date: 2009-05-07 23:01:54 -0700 (Thu, 07 May 2009)
Log Message:
-----------
Remove unarchive target
Modified Paths:
--------------
branches/images-and-archives/base/src/package1.0/Makefile
branches/images-and-archives/base/src/package1.0/package.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/port/port-help.tcl
branches/images-and-archives/base/src/port/port.tcl
branches/images-and-archives/base/src/port1.0/portactivate.tcl
branches/images-and-archives/base/src/port1.0/portinstall.tcl
Removed Paths:
-------------
branches/images-and-archives/base/src/package1.0/portunarchive.tcl
Modified: branches/images-and-archives/base/src/package1.0/Makefile
===================================================================
--- branches/images-and-archives/base/src/package1.0/Makefile 2009-05-07 23:53:13 UTC (rev 50724)
+++ branches/images-and-archives/base/src/package1.0/Makefile 2009-05-08 06:01:54 UTC (rev 50725)
@@ -1,7 +1,7 @@
INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/package1.0
SRCS= package.tcl portdmg.tcl portmdmg.tcl portmpkg.tcl portpkg.tcl portportpkg.tcl \
- portrpm.tcl portsrpm.tcl portdpkg.tcl portunarchive.tcl portarchive.tcl
+ portrpm.tcl portsrpm.tcl portdpkg.tcl portarchive.tcl
include ../../Mk/macports.autoconf.mk
Modified: branches/images-and-archives/base/src/package1.0/package.tcl
===================================================================
--- branches/images-and-archives/base/src/package1.0/package.tcl 2009-05-07 23:53:13 UTC (rev 50724)
+++ branches/images-and-archives/base/src/package1.0/package.tcl 2009-05-08 06:01:54 UTC (rev 50725)
@@ -40,5 +40,4 @@
package require portmdmg 1.0
package require portdpkg 1.0
package require portportpkg 1.0
-package require portunarchive 1.0
package require portarchive 1.0
Modified: branches/images-and-archives/base/src/package1.0/portarchive.tcl
===================================================================
--- branches/images-and-archives/base/src/package1.0/portarchive.tcl 2009-05-07 23:53:13 UTC (rev 50724)
+++ branches/images-and-archives/base/src/package1.0/portarchive.tcl 2009-05-08 06:01:54 UTC (rev 50725)
@@ -37,7 +37,7 @@
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 unarchive fetch extract checksum patch configure build destroot
+target_requires ${org.macports.archive} main fetch extract checksum patch configure build destroot
target_prerun ${org.macports.archive} portarchive::archive_start
target_postrun ${org.macports.archive} portarchive::archive_finish
Modified: branches/images-and-archives/base/src/package1.0/portpkg.tcl
===================================================================
--- branches/images-and-archives/base/src/package1.0/portpkg.tcl 2009-05-07 23:53:13 UTC (rev 50724)
+++ branches/images-and-archives/base/src/package1.0/portpkg.tcl 2009-05-08 06:01:54 UTC (rev 50725)
@@ -36,7 +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
-target_requires ${org.macports.pkg} unarchive destroot
+target_requires ${org.macports.pkg} destroot
namespace eval portpkg {
}
Deleted: branches/images-and-archives/base/src/package1.0/portunarchive.tcl
===================================================================
--- branches/images-and-archives/base/src/package1.0/portunarchive.tcl 2009-05-07 23:53:13 UTC (rev 50724)
+++ branches/images-and-archives/base/src/package1.0/portunarchive.tcl 2009-05-08 06:01:54 UTC (rev 50725)
@@ -1,310 +0,0 @@
-# vim:ts=4 sw=4 fo=croq
-# portunarchive.tcl
-# $Id$
-#
-# Copyright (c) 2004 Robert Shaw <rshaw at opendarwin.org>
-# Copyright (c) 2002 - 2003 Apple Computer, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Computer, Inc. nor the names of its contributors
-# may be used to endorse or promote products derived from this software
-# without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-package provide portunarchive 1.0
-package require portutil 1.0
-
-set org.macports.unarchive [target_new org.macports.unarchive portunarchive::unarchive_main]
-target_runtype ${org.macports.unarchive} always
-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} portunarchive::unarchive_start
-target_postrun ${org.macports.unarchive} portunarchive::unarchive_finish
-
-namespace eval portunarchive {
-}
-
-# defaults
-default unarchive.dir {${destpath}}
-default unarchive.env {}
-default unarchive.cmd {}
-default unarchive.pre_args {}
-default unarchive.args {}
-default unarchive.post_args {}
-
-default unarchive.srcpath {${portarchivepath}}
-default unarchive.type {}
-default unarchive.file {}
-default unarchive.path {}
-
-set_ui_prefix
-
-proc portunarchive::unarchive_init {args} {
- global UI_PREFIX target_state_fd variations workpath
- global ports_force
- global portname portversion portrevision portvariants portpath
- global unarchive.srcpath unarchive.type unarchive.file unarchive.path unarchive.fullsrcpath
-
- # Define port variants if not already defined
- if { ![info exists portvariants] } {
- set portvariants ""
- set vlist [lsort -ascii [array names variations]]
- # Put together variants in the form +foo+bar for the archive name
- foreach v $vlist {
- if { ![string equal $v [option os.platform]] && ![string equal $v [option os.arch]] } {
- set portvariants "${portvariants}+${v}"
- }
- }
- }
-
- # Define archive directory, file, and path
- if {![string equal ${unarchive.srcpath} ${workpath}] && ![string equal ${unarchive.srcpath} ""]} {
- set unarchive.fullsrcpath [file join ${unarchive.srcpath} [option os.platform] [option os.arch]]
- } else {
- set unarchive.fullsrcpath ${unarchive.srcpath}
- }
-
- # Determine if unarchive should be skipped
- set skipped 0
- if {[check_statefile target org.macports.unarchive $target_state_fd]} {
- return 0
- } 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"} {
- ui_debug "Skipping unarchive ($portname) since force is set"
- set skipped 1
- } else {
- set found 0
- set unsupported 0
- foreach unarchive.type [option portarchivetype] {
- if {[catch {archiveTypeIsSupported ${unarchive.type}} errmsg] == 0} {
- set unarchive.file "${portname}-${portversion}_${portrevision}${portvariants}.[option os.arch].${unarchive.type}"
- set unarchive.path "[file join ${unarchive.fullsrcpath} ${unarchive.file}]"
- if {[file exist ${unarchive.path}]} {
- set found 1
- break
- } else {
- ui_debug "No [string toupper ${unarchive.type}] archive: ${unarchive.path}"
- }
- } else {
- ui_debug "Skipping [string toupper ${unarchive.type}] archive: $errmsg"
- set unsupported [expr $unsupported + 1]
- }
- }
- if {$found == 1} {
- ui_debug "Found [string toupper ${unarchive.type}] archive: ${unarchive.path}"
- } else {
- if {[llength [option portarchivetype]] == $unsupported} {
- ui_debug "Skipping unarchive ($portname) since specified archive types not supported"
- } else {
- ui_debug "Skipping unarchive ($portname) since no archive found"
- }
- set skipped 1
- }
- }
- # Skip unarchive target by setting state
- if {$skipped == 1} {
- write_statefile target "org.macports.unarchive" $target_state_fd
- }
-
- return 0
-}
-
-proc portunarchive::unarchive_start {args} {
- global UI_PREFIX portname portversion portrevision portvariants
- global unarchive.type
-
- ui_msg "$UI_PREFIX [format [msgcat::mc "Unpacking ${unarchive.type} archive for %s %s_%s%s"] $portname $portversion $portrevision $portvariants]"
-
- return 0
-}
-
-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
- global unarchive.pipe_cmd
- global os.platform os.version env
-
- # Define appropriate unarchive command and options
- set unarchive.env {}
- set unarchive.cmd {}
- set unarchive.pre_args {}
- set unarchive.args {}
- set unarchive.post_args {}
- set unarchive.pipe_cmd ""
- switch -regex ${unarchive.type} {
- cp(io|gz) {
- set pax "pax"
- if {[catch {set pax [binaryInPath $pax]} errmsg] == 0} {
- ui_debug "Using $pax"
- set unarchive.cmd "$pax"
- if {[info exists env(USER)] && $env(USER) == "root"} {
- set unarchive.pre_args {-r -v -p e}
- } else {
- set unarchive.pre_args {-r -v -p p}
- }
- if {[regexp {z$} ${unarchive.type}]} {
- set unarchive.args {.}
- set gzip "gzip"
- if {[catch {set gzip [binaryInPath $gzip]} errmsg] == 0} {
- ui_debug "Using $gzip"
- set unarchive.pipe_cmd "$gzip -d -c ${unarchive.path} |"
- } else {
- ui_debug $errmsg
- return -code error "No '$gzip' was found on this system!"
- }
- } else {
- set unarchive.args "-f ${unarchive.path} ."
- }
- } else {
- ui_debug $errmsg
- return -code error "No '$pax' was found on this system!"
- }
- }
- t(ar|bz|lz|gz) {
- set tar "tar"
- if {[catch {set tar [binaryInPath $tar]} errmsg] == 0} {
- ui_debug "Using $tar"
- set unarchive.cmd "$tar"
- set unarchive.pre_args {-xvpf}
- if {[regexp {z2?$} ${unarchive.type}]} {
- set unarchive.args {-}
- if {[regexp {bz2?$} ${unarchive.type}]} {
- set gzip "bzip2"
- } elseif {[regexp {lz$} ${unarchive.type}]} {
- set gzip "lzma"
- } else {
- set gzip "gzip"
- }
- if {[catch {set gzip [binaryInPath $gzip]} errmsg] == 0} {
- ui_debug "Using $gzip"
- set unarchive.pipe_cmd "$gzip -d -c ${unarchive.path} |"
- } else {
- ui_debug $errmsg
- return -code error "No '$gzip' was found on this system!"
- }
- } else {
- set unarchive.args "${unarchive.path}"
- }
- } else {
- ui_debug $errmsg
- return -code error "No '$tar' was found on this system!"
- }
- }
- xar {
- set xar "xar"
- if {[catch {set xar [binaryInPath $xar]} errmsg] == 0} {
- ui_debug "Using $xar"
- set unarchive.cmd "$xar"
- set unarchive.pre_args {-xvpf}
- set unarchive.args "${unarchive.path}"
- } else {
- ui_debug $errmsg
- return -code error "No '$xar' was found on this system!"
- }
- }
- zip {
- set unzip "unzip"
- if {[catch {set unzip [binaryInPath $unzip]} errmsg] == 0} {
- ui_debug "Using $unzip"
- set unarchive.cmd "$unzip"
- if {[info exists env(USER)] && $env(USER) == "root"} {
- set unarchive.pre_args {-oX}
- } else {
- set unarchive.pre_args {-o}
- }
- set unarchive.args "${unarchive.path} -d ."
- } else {
- ui_debug $errmsg
- return -code error "No '$unzip' was found on this system!"
- }
- }
- default {
- return -code error "Invalid port archive type '${unarchive.type}' specified!"
- }
- }
-
- return 0
-}
-
-proc portunarchive::unarchive_main {args} {
- global UI_PREFIX
- global portname portversion portrevision portvariants
- global unarchive.dir unarchive.file unarchive.pipe_cmd
-
- # Setup unarchive command
- unarchive_command_setup
-
- # Create destination directory for unpacking
- if {![file isdirectory ${unarchive.dir}]} {
- file mkdir ${unarchive.dir}
- }
-
- # Unpack the archive
- ui_info "$UI_PREFIX [format [msgcat::mc "Extracting %s"] ${unarchive.file}]"
- if {${unarchive.pipe_cmd} == ""} {
- command_exec unarchive
- } else {
- command_exec unarchive "${unarchive.pipe_cmd} (" ")"
- }
-
- return 0
-}
-
-proc portunarchive::unarchive_finish {args} {
- global UI_PREFIX target_state_fd unarchive.file portname workpath destpath
-
- # Reset state file with archive version
- set statefile [file join $workpath .macports.${portname}.state]
- file copy -force [file join $destpath "+STATE"] $statefile
- exec touch $statefile
-
-# Hack to temporarily move com.apple.* strings in statefiles extracted from old archives
-# to the org.macports.* namespace. "temporarily" because old archives will still have a
-# +STATE file with the old strings in it, as we only update them on the unpacked statefile.
- set fd_new_sf [open $statefile r]
- set fd_tmp [open ${statefile}.tmp w+]
- while {[gets $fd_new_sf line] >= 0} {
- puts $fd_tmp "[regsub com.apple $line org.macports]"
- }
- close $fd_new_sf
- close $fd_tmp
- file rename -force ${statefile}.tmp $statefile
-
- # Update the state from unpacked archive version
- set target_state_fd [open_statefile]
-
- # Cleanup all control files when finished
- set control_files [glob -nocomplain -types f [file join $destpath +*]]
- foreach file $control_files {
- ui_debug "Removing $file"
- file delete -force $file
- }
-
- ui_info "$UI_PREFIX [format [msgcat::mc "Archive %s unpacked"] ${unarchive.file}]"
- return 0
-}
-
Modified: branches/images-and-archives/base/src/port/port-help.tcl
===================================================================
--- branches/images-and-archives/base/src/port/port-help.tcl 2009-05-07 23:53:13 UTC (rev 50724)
+++ branches/images-and-archives/base/src/port/port-help.tcl 2009-05-08 06:01:54 UTC (rev 50725)
@@ -265,10 +265,6 @@
Run tests on each of the given ports
}
-set porthelp(unarchive) {
-Unarchive the given ports
-}
-
set porthelp(uninstall) {
Uninstall the given ports
}
Modified: branches/images-and-archives/base/src/port/port.tcl
===================================================================
--- branches/images-and-archives/base/src/port/port.tcl 2009-05-07 23:53:13 UTC (rev 50724)
+++ branches/images-and-archives/base/src/port/port.tcl 2009-05-08 06:01:54 UTC (rev 50725)
@@ -2971,7 +2971,6 @@
distfiles [list action_target [action_args_const ports]] \
\
archive [list action_target [action_args_const ports]] \
- unarchive [list action_target [action_args_const ports]] \
dmg [list action_target [action_args_const ports]] \
mdmg [list action_target [action_args_const ports]] \
dpkg [list action_target [action_args_const ports]] \
Modified: branches/images-and-archives/base/src/port1.0/portactivate.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portactivate.tcl 2009-05-07 23:53:13 UTC (rev 50724)
+++ branches/images-and-archives/base/src/port1.0/portactivate.tcl 2009-05-08 06:01:54 UTC (rev 50725)
@@ -40,7 +40,7 @@
target_runtype ${org.macports.activate} always
target_state ${org.macports.activate} no
target_provides ${org.macports.activate} activate
-target_requires ${org.macports.activate} main unarchive fetch extract checksum patch configure build destroot archive install
+target_requires ${org.macports.activate} main 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-05-07 23:53:13 UTC (rev 50724)
+++ branches/images-and-archives/base/src/port1.0/portinstall.tcl 2009-05-08 06:01:54 UTC (rev 50725)
@@ -36,7 +36,7 @@
set org.macports.install [target_new org.macports.install portinstall::install_main]
target_provides ${org.macports.install} install
-target_requires ${org.macports.install} main unarchive fetch extract checksum patch configure build destroot archive
+target_requires ${org.macports.install} main fetch extract checksum patch configure build destroot archive
target_prerun ${org.macports.install} portinstall::install_start
namespace eval portinstall {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090507/b8545749/attachment.html>
More information about the macports-changes
mailing list