[101148] trunk/base/src/package1.0
jmr at macports.org
jmr at macports.org
Sat Jan 5 03:05:07 PST 2013
Revision: 101148
https://trac.macports.org/changeset/101148
Author: jmr at macports.org
Date: 2013-01-05 03:05:07 -0800 (Sat, 05 Jan 2013)
Log Message:
-----------
when building pkgs, omit epoch and revision in user-facing places when they are 0
Modified Paths:
--------------
trunk/base/src/package1.0/portmpkg.tcl
trunk/base/src/package1.0/portpkg.tcl
Modified: trunk/base/src/package1.0/portmpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portmpkg.tcl 2013-01-05 10:59:04 UTC (rev 101147)
+++ trunk/base/src/package1.0/portmpkg.tcl 2013-01-05 11:05:07 UTC (rev 101148)
@@ -123,14 +123,22 @@
proc portmpkg::package_mpkg {portname portepoch portversion portrevision} {
global portdbpath os.major destpath workpath prefix porturl description package.destpath package.flat long_description homepage depends_run depends_lib
- set mpkgpath ${package.destpath}/${portname}-${portepoch}_${portversion}_${portrevision}.mpkg
+ set portepoch_namestr ""
+ if {${portepoch} != "0"} {
+ set portepoch_namestr "${portepoch}_"
+ }
+ set portrevision_namestr ""
+ if {${portrevision} != "0"} {
+ set portrevision_namestr "_${portrevision}"
+ }
+ set mpkgpath ${package.destpath}/${portname}-${portepoch_namestr}${portversion}${portrevision_namestr}.mpkg
if {${package.flat} && ${os.major} >= 10} {
- set pkgpath ${package.destpath}/${portname}-${portepoch}_${portversion}_${portrevision}-component.pkg
+ set pkgpath ${package.destpath}/${portname}-${portepoch_namestr}${portversion}${portrevision_namestr}-component.pkg
set packages_path ${workpath}/mpkg_packages
set resources_path ${workpath}/mpkg_resources
} else {
- set pkgpath ${package.destpath}/${portname}-${portepoch}_${portversion}_${portrevision}.pkg
+ set pkgpath ${package.destpath}/${portname}-${portepoch_namestr}${portversion}${portrevision_namestr}.pkg
set packages_path ${mpkgpath}/Contents/Packages
set resources_path ${mpkgpath}/Contents/Resources
}
@@ -144,23 +152,31 @@
foreach dep $deps {
set name [lindex $dep 0]
set epoch [lindex $dep 1]
+ set epoch_namestr ""
+ if {$epoch != "0"} {
+ set epoch_namestr "${epoch}_"
+ }
set vers [lindex $dep 2]
set rev [lindex $dep 3]
+ set rev_namestr ""
+ if {$rev != "0"} {
+ set rev_namestr "_${rev}"
+ }
set mport [lindex $dep 4]
# don't re-package ourself
if {$name != $portname} {
make_one_package $name $mport
if {${package.flat} && ${os.major} >= 10} {
- lappend dependencies org.macports.${name} ${name}-${epoch}_${vers}_${rev}-component.pkg
+ lappend dependencies org.macports.${name} ${name}-${epoch_namestr}${vers}${rev_namestr}-component.pkg
} else {
- lappend dependencies ${name}-${epoch}_${vers}_${rev}.pkg
+ lappend dependencies ${name}-${epoch_namestr}${vers}${rev_namestr}.pkg
}
}
}
if {${package.flat} && ${os.major} >= 10} {
- lappend dependencies org.macports.${portname} ${portname}-${portepoch}_${portversion}_${portrevision}-component.pkg
+ lappend dependencies org.macports.${portname} ${portname}-${portepoch_namestr}${portversion}${portrevision_namestr}-component.pkg
} else {
- lappend dependencies ${portname}-${portepoch}_${portversion}_${portrevision}.pkg
+ lappend dependencies ${portname}-${portepoch_namestr}${portversion}${portrevision_namestr}.pkg
}
# copy our own pkg into the mpkg
Modified: trunk/base/src/package1.0/portpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portpkg.tcl 2013-01-05 10:59:04 UTC (rev 101147)
+++ trunk/base/src/package1.0/portpkg.tcl 2013-01-05 11:05:07 UTC (rev 101148)
@@ -113,7 +113,16 @@
package.flat package.destpath portpath os.version os.major \
package.resources package.scripts portpkg::packagemaker portpkg::language
- set pkgpath "${package.destpath}/${portname}-${portepoch}_${portversion}_${portrevision}.pkg"
+ set portepoch_namestr ""
+ if {${portepoch} != "0"} {
+ set portepoch_namestr "${portepoch}_"
+ }
+ set portrevision_namestr ""
+ if {${portrevision} != "0"} {
+ set portrevision_namestr "_${portrevision}"
+ }
+
+ set pkgpath "${package.destpath}/${portname}-${portepoch_namestr}${portversion}${portrevision_namestr}.pkg"
if {[file readable $pkgpath] && ([file mtime ${pkgpath}] >= [file mtime ${portpath}/Portfile])} {
ui_msg "$UI_PREFIX [format [msgcat::mc "Package for %s-%s_%s_%s is up-to-date"] ${portname} ${portepoch} ${portversion} ${portrevision}]"
return 0
@@ -299,9 +308,21 @@
}
set portname [xml_escape $portname]
- set portepoch [xml_escape $portepoch]
+ if {$portepoch != "0"} {
+ set portepoch [xml_escape $portepoch]
+ set portepoch_str "${portepoch}_"
+ } else {
+ set portepoch ""
+ set portepoch_str ""
+ }
set portversion [xml_escape $portversion]
- set portrevision [xml_escape $portrevision]
+ if {$portrevision != "0"} {
+ set portrevision [xml_escape $portrevision]
+ set portrevision_str "_${portrevision}"
+ } else {
+ set portrevision ""
+ set portrevision_str ""
+ }
set long_description [xml_escape $long_description]
set description [xml_escape $description]
set homepage [xml_escape $homepage]
@@ -322,7 +343,7 @@
puts $fd "<font face=\"Helvetica\"><a href=\"${homepage}\">${homepage}</a></font><p>"
}
- puts $fd "<font face=\"Helvetica\">This installer guides you through the steps necessary to install ${portname} ${portepoch}_${portversion}_${portrevision} for Mac OS X. To get started, click Continue.</font>
+ puts $fd "<font face=\"Helvetica\">This installer guides you through the steps necessary to install ${portname} ${portepoch_str}${portversion}${portrevision_str} for Mac OS X. To get started, click Continue.</font>
</body>
</html>"
@@ -367,7 +388,21 @@
proc portpkg::write_distribution {dfile portname portepoch portversion portrevision} {
global macosx_deployment_target
set portname [xml_escape $portname]
+ if {$portepoch != "0"} {
+ set portepoch [xml_escape $portepoch]
+ set portepoch_str "${portepoch}_"
+ } else {
+ set portepoch ""
+ set portepoch_str ""
+ }
set portversion [xml_escape $portversion]
+ if {$portrevision != "0"} {
+ set portrevision [xml_escape $portrevision]
+ set portrevision_str "_${portrevision}"
+ } else {
+ set portrevision ""
+ set portrevision_str ""
+ }
set dfd [open $dfile w+]
puts $dfd "<?xml version=\"1.0\" encoding=\"utf-8\"?>
<installer-gui-script minSpecVersion=\"1\">
@@ -385,7 +420,7 @@
<choice id=\"org.macports.${portname}\" visible=\"false\">
<pkg-ref id=\"org.macports.${portname}\"/>
</choice>
- <pkg-ref id=\"org.macports.${portname}\">${portname}-${portepoch}_${portversion}_${portrevision}-component.pkg</pkg-ref>
+ <pkg-ref id=\"org.macports.${portname}\">${portname}-${portepoch_str}${portversion}${portrevision_str}-component.pkg</pkg-ref>
</installer-gui-script>
"
close $dfd
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130105/191431b6/attachment-0001.html>
More information about the macports-changes
mailing list