[105002] trunk/base/src
afb at macports.org
afb at macports.org
Sun Apr 7 05:15:15 PDT 2013
Revision: 105002
https://trac.macports.org/changeset/105002
Author: afb at macports.org
Date: 2013-04-07 05:15:15 -0700 (Sun, 07 Apr 2013)
Log Message:
-----------
Remove support for the xml metadata and the xpkg package archives
Doesn't make much sense now it has been moved from archive to install,
and the corresponding xpkg binary package support was never implemented.
Now that the source packages are removed, lose the binary packages too.
Future attempts are more likely to used a tar-based format, than a xar.
Modified Paths:
--------------
trunk/base/src/images_to_archives.tcl
trunk/base/src/package1.0/portunarchive.tcl
trunk/base/src/port1.0/portinstall.tcl
trunk/base/src/port1.0/portutil.tcl
trunk/base/src/registry2.0/portimage.tcl
Modified: trunk/base/src/images_to_archives.tcl
===================================================================
--- trunk/base/src/images_to_archives.tcl 2013-04-07 12:13:51 UTC (rev 105001)
+++ trunk/base/src/images_to_archives.tcl 2013-04-07 12:15:15 UTC (rev 105002)
@@ -74,7 +74,7 @@
}
set found 0
foreach adir [list $oldarchivedir $olderarchivedir] {
- foreach type {tbz2 tbz tgz tar txz tlz xar xpkg zip cpgz cpio} {
+ foreach type {tbz2 tbz tgz tar txz tlz xar zip cpgz cpio} {
set oldarchivefullpath "[file join $adir $oldarchiverootname].${type}"
if {[file isfile $oldarchivefullpath]} {
set found 1
Modified: trunk/base/src/package1.0/portunarchive.tcl
===================================================================
--- trunk/base/src/package1.0/portunarchive.tcl 2013-04-07 12:13:51 UTC (rev 105001)
+++ trunk/base/src/package1.0/portunarchive.tcl 2013-04-07 12:15:15 UTC (rev 105002)
@@ -201,7 +201,7 @@
return -code error "No '$tar' was found on this system!"
}
}
- xar|xpkg {
+ xar {
set xar "xar"
if {[catch {set xar [findBinary $xar ${portutil::autoconf::xar_path}]} errmsg] == 0} {
ui_debug "Using $xar"
Modified: trunk/base/src/port1.0/portinstall.tcl
===================================================================
--- trunk/base/src/port1.0/portinstall.tcl 2013-04-07 12:13:51 UTC (rev 105001)
+++ trunk/base/src/port1.0/portinstall.tcl 2013-04-07 12:15:15 UTC (rev 105002)
@@ -94,21 +94,6 @@
return $rval
}
-proc portinstall::putel { fd el data } {
- # Quote xml data
- set quoted [string map { & & < < > > } $data]
- # Write the element
- puts $fd "<${el}>${quoted}</${el}>"
-}
-
-proc portinstall::putlist { fd listel itemel list } {
- puts $fd "<$listel>"
- foreach item $list {
- putel $fd $itemel $item
- }
- puts $fd "</$listel>"
-}
-
proc portinstall::create_archive {location archive.type} {
global workpath destpath portpath subport version revision portvariants \
epoch os.platform PortInfo installPlist \
@@ -200,22 +185,6 @@
return -code error "No '$xar' was found on this system!"
}
}
- xpkg {
- set xar "xar"
- set compression "bzip2"
- set archive.meta yes
- set archive.metaname "xpkg"
- set archive.metapath [file join $workpath "${archive.metaname}.xml"]
- if {[catch {set xar [findBinary $xar ${portutil::autoconf::xar_path}]} errmsg] == 0} {
- ui_debug "Using $xar"
- set archive.cmd "$xar"
- set archive.pre_args "-cv --exclude='\./\+.*' --compression=${compression} -n ${archive.metaname} -s ${archive.metapath} -f"
- set archive.args "${location} ."
- } else {
- ui_debug $errmsg
- return -code error "No '$xar' was found on this system!"
- }
- }
zip {
set zip "zip"
if {[catch {set zip [findBinary $zip ${portutil::autoconf::zip_path}]} errmsg] == 0} {
@@ -334,77 +303,6 @@
}
close $fd
- # the XML package metadata, for XAR package
- # (doesn't contain any file list/checksums)
- if {[tbool archive.meta]} {
- set sd [open ${archive.metapath} w]
- puts $sd "<xpkg version='0.2'>"
- # TODO: split contents into <buildinfo> (new) and <package> (current)
- # see existing <portpkg> for the matching source package layout
-
- putel $sd name ${subport}
- putel $sd epoch ${epoch}
- putel $sd version ${version}
- putel $sd revision ${revision}
- putel $sd major 0
- putel $sd minor 0
-
- putel $sd platform ${os.platform}
- if {[llength [get_canonical_archs]] > 1} {
- putlist $sd archs arch [get_canonical_archs]
- } else {
- putel $sd arch [get_canonical_archs]
- }
- putlist $sd variants variant $vlist
-
- if {[exists categories]} {
- set primary [lindex [split [option categories] " "] 0]
- putel $sd category $primary
- }
- if {[exists description]} {
- putel $sd comment "[option description]"
- }
- if {[exists long_description]} {
- putel $sd desc "[option long_description]"
- }
- if {[exists homepage]} {
- putel $sd homepage "[option homepage]"
- }
-
- # Emit dependencies provided by this package
- puts $sd "<provides>"
- puts $sd "<item>"
- putel $sd name $subport
- putel $sd major 0
- putel $sd minor 0
- puts $sd "</item>"
- puts $sd "</provides>"
-
-
- # Emit build, library, and runtime dependencies
- puts $sd "<requires>"
- foreach {key type} {
- depends_fetch "fetch"
- depends_extract "extract"
- depends_build "build"
- depends_lib "library"
- depends_run "runtime"
- } {
- if {[info exists $key]} {
- set depname [lindex [split [set $key] :] end]
- puts $sd "<item type=\"$type\">"
- putel $sd name $depname
- putel $sd major 0
- putel $sd minor 0
- puts $sd "</item>"
- }
- }
- puts $sd "</requires>"
-
- puts $sd "</xpkg>"
- close $sd
- }
-
# Now create the archive
ui_debug "Creating [file tail $location]"
command_exec archive
@@ -441,10 +339,6 @@
system "cd ${workpath} && [findBinary xar ${portutil::autoconf::xar_path}] -xf $location +CONTENTS"
set twostep 1
}
- xpkg {
- system "cd ${workpath} && [findBinary xar ${portutil::autoconf::xar_path}] -xf $location --compression=bzip2 +CONTENTS"
- set twostep 1
- }
zip {
set raw_contents [exec [findBinary unzip ${portutil::autoconf::unzip_path}] -p $location +CONTENTS]
}
Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl 2013-04-07 12:13:51 UTC (rev 105001)
+++ trunk/base/src/port1.0/portutil.tcl 2013-04-07 12:15:15 UTC (rev 105002)
@@ -2435,7 +2435,7 @@
global supported_archive_types
if {![info exists supported_archive_types]} {
set supported_archive_types {}
- foreach type {tbz2 tbz tgz tar txz tlz xar xpkg zip cpgz cpio} {
+ foreach type {tbz2 tbz tgz tar txz tlz xar zip cpgz cpio} {
if {[catch {archiveTypeIsSupported $type}] == 0} {
lappend supported_archive_types $type
}
@@ -2511,7 +2511,7 @@
}
}
}
- xar|xpkg {
+ xar {
set xar "xar"
if {[catch {set xar [findBinary $xar ${portutil::autoconf::xar_path}]} errmsg] == 0} {
return 0
Modified: trunk/base/src/registry2.0/portimage.tcl
===================================================================
--- trunk/base/src/registry2.0/portimage.tcl 2013-04-07 12:13:51 UTC (rev 105001)
+++ trunk/base/src/registry2.0/portimage.tcl 2013-04-07 12:15:15 UTC (rev 105002)
@@ -372,7 +372,7 @@
throw MACPORTS "No '$tar' was found on this system!"
}
}
- xar|xpkg {
+ xar {
set xar "xar"
if {[catch {set xar [macports::findBinary $xar ${macports::autoconf::xar_path}]} errmsg] == 0} {
ui_debug "Using $xar"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130407/fed61518/attachment-0001.html>
More information about the macports-changes
mailing list