<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/e0c7f1cbd75b597ab13d03a9a483cbcc365da36d">https://github.com/macports/macports-base/commit/e0c7f1cbd75b597ab13d03a9a483cbcc365da36d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e0c7f1c Finish harmonising package1.0 filenames
</span>e0c7f1c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e0c7f1cbd75b597ab13d03a9a483cbcc365da36d
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Jan 18 09:00:26 2017 +1100
<span style='display:block; white-space:pre;color:#404040;'> Finish harmonising package1.0 filenames
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> 62d7125 missed a few spots.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/53340
</span>---
src/package1.0/portmpkg.tcl | 23 ++++++-------------
src/package1.0/portpkg.tcl | 46 ++++++++++----------------------------
src/package1.0/tests/portmpkg.test | 13 +++++------
3 files changed, 25 insertions(+), 57 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/package1.0/portmpkg.tcl b/src/package1.0/portmpkg.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 9bc0a52..717223c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/package1.0/portmpkg.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/package1.0/portmpkg.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,7 +94,7 @@ proc portmpkg::make_dependency_list {portname destination} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend result [list $portinfo(name) $portinfo(epoch) $portinfo(version) $portinfo(revision) $mport]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend result [list $portinfo(name) $portinfo(version) $portinfo(revision) $mport]
</span> return $result
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,25 +146,16 @@ proc portmpkg::package_mpkg {portname portepoch portversion portrevision} {
</span> set deps [lsort -unique $deps]
foreach dep $deps {
set name [lindex $dep 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set epoch [lindex $dep 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set epoch_namestr ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$epoch != 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set epoch_namestr "${epoch}_"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set vers [lindex $dep 2]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set rev [lindex $dep 3]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set rev_namestr ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$rev != 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set rev_namestr "_${rev}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mport [lindex $dep 4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set vers [lindex $dep 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rev [lindex $dep 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mport [lindex $dep 3]
</span> # don't re-package ourself
if {$name ne $portname} {
make_one_package $name $mport
if {${package.flat} && ${os.major} >= 10} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend dependencies org.macports.${name} ${name}-${epoch_namestr}${vers}${rev_namestr}-component.pkg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend dependencies org.macports.${name} [portpkg::image_name ${name} ${vers} ${rev}]-component.pkg
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend dependencies ${name}-${epoch_namestr}${vers}${rev_namestr}.pkg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend dependencies [portpkg::image_name ${name} ${vers} ${rev}].pkg
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,7 +182,7 @@ proc portmpkg::package_mpkg {portname portepoch portversion portrevision} {
</span> set pkg_$variable [set $variable]
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- portpkg::write_welcome_html ${resources_path}/Welcome.html $portname $portepoch $portversion $portrevision $pkg_long_description $pkg_description $pkg_homepage
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ portpkg::write_welcome_html ${resources_path}/Welcome.html $portname $portversion $portrevision $pkg_long_description $pkg_description $pkg_homepage
</span> file copy -force -- [getportresourcepath $porturl "port1.0/package/background.tiff"] ${resources_path}/background.tiff
if {${package.flat} && ${os.major} >= 10} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/package1.0/portpkg.tcl b/src/package1.0/portpkg.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index b5bcbc2..c8b8c1f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/package1.0/portpkg.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/package1.0/portpkg.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +60,7 @@ proc portpkg::pkg_start {args} {
</span> global packagemaker_path portpkg::packagemaker portpkg::pkgbuild \
portpkg::language xcodeversion portpath porturl \
package.resources package.scripts package.flat \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- subport epoch version revision description long_description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport version revision description long_description \
</span> homepage workpath os.major
if {[catch {findBinary pkgbuild /usr/bin/pkgbuild} pkgbuild]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,11 +95,11 @@ proc portpkg::pkg_start {args} {
</span> set pkg_$variable [set $variable]
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- write_welcome_html ${package.resources}/${language}.lproj/Welcome.html $subport $epoch $version $revision $pkg_long_description $pkg_description $pkg_homepage
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ write_welcome_html ${package.resources}/${language}.lproj/Welcome.html $subport $version $revision $pkg_long_description $pkg_description $pkg_homepage
</span> file copy -force -- [getportresourcepath $porturl "port1.0/package/background.tiff"] ${package.resources}/${language}.lproj/background.tiff
if {${package.flat} && ${os.major} >= 9} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- write_distribution "${workpath}/Distribution" $subport $epoch $version $revision
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ write_distribution "${workpath}/Distribution" $subport $version $revision
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -325,20 +325,13 @@ proc portpkg::write_description_plist {infofile portname portversion description
</span> close $infofd
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc portpkg::write_welcome_html {filename portname portepoch portversion portrevision long_description description homepage} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc portpkg::write_welcome_html {filename portname portversion portrevision long_description description homepage} {
</span> set fd [open ${filename} w+]
if {$long_description eq ""} {
set long_description $description
}
set portname [xml_escape $portname]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$portepoch != 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set portepoch [xml_escape $portepoch]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set portepoch_str "${portepoch}_"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set portepoch ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set portepoch_str ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> set portversion [xml_escape $portversion]
if {$portrevision != 0} {
set portrevision [xml_escape $portrevision]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -367,7 +360,7 @@ proc portpkg::write_welcome_html {filename portname portepoch portversion portre
</span> puts $fd "<font face=\"Helvetica\"><a href=\"${homepage}\">${homepage}</a></font><p>"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 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>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $fd "<font face=\"Helvetica\">This installer guides you through the steps necessary to install ${portname} ${portversion}${portrevision_str} for Mac OS X. To get started, click Continue.</font>
</span> </body>
</html>"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -409,42 +402,27 @@ proc portpkg::write_package_info {infofile} {
</span> close $infofd
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc portpkg::write_distribution {dfile portname portepoch portversion portrevision} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc portpkg::write_distribution {dfile portname portversion portrevision} {
</span> global macosx_deployment_target
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set portname [xml_escape $portname]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$portepoch != 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set portepoch [xml_escape $portepoch]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set portepoch_str "${portepoch}_"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set portepoch ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set portepoch_str ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set portversion [xml_escape $portversion]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$portrevision != 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set portrevision [xml_escape $portrevision]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set portrevision_str "_${portrevision}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set portrevision ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set portrevision_str ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set portname_e [xml_escape $portname]
</span> set dfd [open $dfile w+]
puts $dfd "<?xml version=\"1.0\" encoding=\"utf-8\"?>
<installer-gui-script minSpecVersion=\"1\">
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <title>${portname}</title>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <title>${portname_e}</title>
</span> <options customize=\"never\"/>
<allowed-os-versions><os-version min=\"${macosx_deployment_target}\"/></allowed-os-versions>
<background file=\"background.tiff\" mime-type=\"image/tiff\" alignment=\"bottomleft\" scaling=\"none\"/>
<welcome mime-type=\"text/html\" file=\"Welcome.html\"/>
<choices-outline>
<line choice=\"default\">
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <line choice=\"org.macports.${portname}\"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <line choice=\"org.macports.${portname_e}\"/>
</span> </line>
</choices-outline>
<choice id=\"default\"/>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <choice id=\"org.macports.${portname}\" visible=\"false\">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <pkg-ref id=\"org.macports.${portname}\"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <choice id=\"org.macports.${portname_e}\" visible=\"false\">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <pkg-ref id=\"org.macports.${portname_e}\"/>
</span> </choice>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <pkg-ref id=\"org.macports.${portname}\">${portname}-${portepoch_str}${portversion}${portrevision_str}-component.pkg</pkg-ref>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <pkg-ref id=\"org.macports.${portname_e}\">[xml_escape [image_name ${portname} ${portversion} ${portrevision}]]-component.pkg</pkg-ref>
</span> </installer-gui-script>
"
close $dfd
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/package1.0/tests/portmpkg.test b/src/package1.0/tests/portmpkg.test
</span><span style='display:block; white-space:pre;color:#808080;'>index 8c199a8..e3f9abc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/package1.0/tests/portmpkg.test
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/package1.0/tests/portmpkg.test
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,15 +72,14 @@ test make_dependency_list {
</span> }
# indices:
# 0 name
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # 1 epoch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 2 version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 3 revision
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 1 version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 2 revision
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 3 mport
</span> set res [lindex $res 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[llength $res] != 5 ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[llength $res] != 4 ||
</span> [lindex $res 0] != $subport ||
<span style='display:block; white-space:pre;background:#ffe0e0;'>- [lindex $res 1] != 0 ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [lindex $res 2] != 060102 ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [lindex $res 3] != 1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [lindex $res 1] != 060102 ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [lindex $res 2] != 1} {
</span> return "FAIL: incorrect dependency list entry: $res"
}
return "Dependency list successful."
</pre><pre style='margin:0'>
</pre>