[101107] branches/new-help-system/base
raimue at macports.org
raimue at macports.org
Fri Jan 4 06:07:53 PST 2013
Revision: 101107
https://trac.macports.org/changeset/101107
Author: raimue at macports.org
Date: 2013-01-04 06:07:53 -0800 (Fri, 04 Jan 2013)
Log Message:
-----------
Merge from trunk
Modified Paths:
--------------
branches/new-help-system/base/src/macports1.0/macports.tcl
branches/new-help-system/base/src/package1.0/portmpkg.tcl
branches/new-help-system/base/src/package1.0/portpkg.tcl
branches/new-help-system/base/src/port1.0/portutil.tcl
Property Changed:
----------------
branches/new-help-system/base/
Property changes on: branches/new-help-system/base
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:49341-100551
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
+ /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:49341-101106
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
Modified: branches/new-help-system/base/src/macports1.0/macports.tcl
===================================================================
--- branches/new-help-system/base/src/macports1.0/macports.tcl 2013-01-04 12:23:54 UTC (rev 101106)
+++ branches/new-help-system/base/src/macports1.0/macports.tcl 2013-01-04 14:07:53 UTC (rev 101107)
@@ -4385,7 +4385,7 @@
}
incr broken_port_counts($portname)
if {$broken_port_counts($portname) > 3} {
- ui_error "Port $portname is still broken after rebuiling it more than 3 times."
+ ui_error "Port $portname is still broken after rebuilding it more than 3 times."
if {$fancy_output} {
ui_error "Please run port -d -y rev-upgrade and use the output to report a bug."
}
Modified: branches/new-help-system/base/src/package1.0/portmpkg.tcl
===================================================================
--- branches/new-help-system/base/src/package1.0/portmpkg.tcl 2013-01-04 12:23:54 UTC (rev 101106)
+++ branches/new-help-system/base/src/package1.0/portmpkg.tcl 2013-01-04 14:07:53 UTC (rev 101107)
@@ -59,7 +59,7 @@
}
proc portmpkg::make_dependency_list {portname destination} {
- global variations prefix package.destpath package.flat
+ global requested_variations prefix package.destpath package.flat
set result {}
if {[catch {set res [mport_lookup $portname]} error]} {
global errorInfo
@@ -73,7 +73,7 @@
set deprivileged 1
}
- set mport [mport_open $portinfo(porturl) [list prefix $prefix package.destpath ${destination} package.flat ${package.flat} subport $portinfo(name)] [array get variations]]
+ set mport [mport_open $portinfo(porturl) [list prefix $prefix package.destpath ${destination} package.flat ${package.flat} subport $portinfo(name)] [array get requested_variations]]
if {[info exists deprivileged]} {
global macportsuser
@@ -96,11 +96,11 @@
}
}
- lappend result [list $portinfo(name) $portinfo(version) $mport]
+ lappend result [list $portinfo(name) $portinfo(version) $portinfo(revision) $mport]
return $result
}
-proc portmpkg::make_one_package {portname portversion mport} {
+proc portmpkg::make_one_package {portname mport} {
if {[getuid] == 0 && [geteuid] != 0} {
setegid 0; seteuid 0
set deprivileged 1
@@ -123,14 +123,14 @@
proc portmpkg::package_mpkg {portname 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}-${portversion}.mpkg
+ set mpkgpath ${package.destpath}/${portname}-${portversion}_${portrevision}.mpkg
if {${package.flat} && ${os.major} >= 10} {
- set pkgpath ${package.destpath}/${portname}-${portversion}-component.pkg
+ set pkgpath ${package.destpath}/${portname}-${portversion}_${portrevision}-component.pkg
set packages_path ${workpath}/mpkg_packages
set resources_path ${workpath}/mpkg_resources
} else {
- set pkgpath ${package.destpath}/${portname}-${portversion}.pkg
+ set pkgpath ${package.destpath}/${portname}-${portversion}_${portrevision}.pkg
set packages_path ${mpkgpath}/Contents/Packages
set resources_path ${mpkgpath}/Contents/Resources
}
@@ -144,21 +144,22 @@
foreach dep $deps {
set name [lindex $dep 0]
set vers [lindex $dep 1]
- set mport [lindex $dep 2]
+ set rev [lindex $dep 2]
+ set mport [lindex $dep 3]
# don't re-package ourself
if {$name != $portname} {
- make_one_package $name $vers $mport
+ make_one_package $name $mport
if {${package.flat} && ${os.major} >= 10} {
- lappend dependencies org.macports.${name} ${name}-${vers}-component.pkg
+ lappend dependencies org.macports.${name} ${name}-${vers}_${rev}-component.pkg
} else {
- lappend dependencies ${name}-${vers}.pkg
+ lappend dependencies ${name}-${vers}_${rev}.pkg
}
}
}
if {${package.flat} && ${os.major} >= 10} {
- lappend dependencies org.macports.${portname} ${portname}-${portversion}-component.pkg
+ lappend dependencies org.macports.${portname} ${portname}-${portversion}_${portrevision}-component.pkg
} else {
- lappend dependencies ${portname}-${portversion}.pkg
+ lappend dependencies ${portname}-${portversion}_${portrevision}.pkg
}
# copy our own pkg into the mpkg
@@ -178,13 +179,13 @@
set pkg_$variable [set $variable]
}
}
- portpkg::write_welcome_html ${resources_path}/Welcome.html $portname $portversion $pkg_long_description $pkg_description $pkg_homepage
+ portpkg::write_welcome_html ${resources_path}/Welcome.html $portname $portversion $portrevision $pkg_long_description $pkg_description $pkg_homepage
file copy -force -- [getportresourcepath $porturl "port1.0/package/background.tiff"] ${resources_path}/background.tiff
if {${package.flat} && ${os.major} >= 10} {
write_distribution ${workpath}/Distribution $portname $dependencies
set productbuild [findBinary productbuild]
- set cmdline "$productbuild --resources ${resources_path} --identifier org.macports.mpkg.${portname} --distribution ${workpath}/Distribution --package-path ${packages_path} ${mpkgpath}"
+ set cmdline "$productbuild --resources ${resources_path} --identifier org.macports.mpkg.${portname} --distribution ${workpath}/Distribution --package-path ${packages_path} --version ${portversion}.${portrevision} ${mpkgpath}"
ui_debug "Running command line: $cmdline"
system $cmdline
}
Modified: branches/new-help-system/base/src/package1.0/portpkg.tcl
===================================================================
--- branches/new-help-system/base/src/package1.0/portpkg.tcl 2013-01-04 12:23:54 UTC (rev 101106)
+++ branches/new-help-system/base/src/package1.0/portpkg.tcl 2013-01-04 14:07:53 UTC (rev 101107)
@@ -59,7 +59,8 @@
global packagemaker_path portpkg::packagemaker \
portpkg::language xcodeversion portpath porturl \
package.resources package.scripts package.flat \
- subport version description long_description homepage workpath os.major
+ subport version revision description long_description \
+ homepage workpath os.major
if {![info exists packagemaker_path]} {
if {[vercmp $xcodeversion 4.3] >= 0} {
@@ -87,18 +88,18 @@
set pkg_$variable [set $variable]
}
}
- write_welcome_html ${package.resources}/${language}.lproj/Welcome.html $subport $version $pkg_long_description $pkg_description $pkg_homepage
+ write_welcome_html ${package.resources}/${language}.lproj/Welcome.html $subport $version $revision $pkg_long_description $pkg_description $pkg_homepage
file copy -force -- [getportresourcepath $porturl "port1.0/package/background.tiff"] ${package.resources}/${language}.lproj/background.tiff
if {${package.flat} && ${os.major} >= 9} {
- write_distribution "${workpath}/Distribution" $subport $version
+ write_distribution "${workpath}/Distribution" $subport $version $revision
}
}
proc portpkg::pkg_main {args} {
global subport version revision UI_PREFIX
- ui_msg "$UI_PREFIX [format [msgcat::mc "Creating pkg for %s-%s"] ${subport} ${version}]"
+ ui_msg "$UI_PREFIX [format [msgcat::mc "Creating pkg for %s-%s_%s"] ${subport} ${version} ${revision}]"
if {[getuid] == 0 && [geteuid] != 0} {
elevateToRoot "pkg"
@@ -112,9 +113,9 @@
package.flat package.destpath portpath os.version os.major \
package.resources package.scripts portpkg::packagemaker portpkg::language
- set pkgpath "${package.destpath}/${portname}-${portversion}.pkg"
+ set pkgpath "${package.destpath}/${portname}-${portversion}_${portrevision}.pkg"
if {[file readable $pkgpath] && ([file mtime ${pkgpath}] >= [file mtime ${portpath}/Portfile])} {
- ui_msg "$UI_PREFIX [format [msgcat::mc "Package for %s-%s is up-to-date"] ${portname} ${portversion}]"
+ ui_msg "$UI_PREFIX [format [msgcat::mc "Package for %s-%s_%s is up-to-date"] ${portname} ${portversion} ${portrevision}]"
return 0
}
@@ -144,6 +145,7 @@
}
set cmdline "PMResourceLocale=${language} $packagemaker --root ${destpath} --out ${pkgpath} ${pkgresources} --info $infofile --target $pkgtarget --domain system --id org.macports.$portname"
if {${os.major} >= 10} {
+ append cmdline " --version ${portversion}.${portrevision}"
append cmdline " --no-relocate"
} else {
# 10.5 Leopard does not use current language, manually specify
@@ -189,7 +191,7 @@
system "cd ${destpath} && [findBinary pax $portutil::autoconf::pax_path] -x cpio -w -z . > ${pkgpath}/Contents/Archive.pax.gz"
write_description_plist ${pkgpath}/Contents/Resources/Description.plist $portname $portversion $description
- write_sizes_file ${pkgpath}/Contents/Resources/Archive.sizes ${portname} ${portversion} ${pkgpath} ${destpath}
+ write_sizes_file ${pkgpath}/Contents/Resources/Archive.sizes ${pkgpath} ${destpath}
}
@@ -289,7 +291,7 @@
close $infofd
}
-proc portpkg::write_welcome_html {filename portname portversion long_description description homepage} {
+proc portpkg::write_welcome_html {filename portname portversion portrevision long_description description homepage} {
set fd [open ${filename} w+]
if {$long_description == ""} {
set long_description $description
@@ -297,6 +299,7 @@
set portname [xml_escape $portname]
set portversion [xml_escape $portversion]
+ set portrevision [xml_escape $portrevision]
set long_description [xml_escape $long_description]
set description [xml_escape $description]
set homepage [xml_escape $homepage]
@@ -317,14 +320,14 @@
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} ${portversion} 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} ${portversion}_${portrevision} for Mac OS X. To get started, click Continue.</font>
</body>
</html>"
close $fd
}
-proc portpkg::write_sizes_file {sizesfile portname portversion pkgpath destpath} {
+proc portpkg::write_sizes_file {sizesfile pkgpath destpath} {
if {[catch {set numFiles [llength [split [exec [findBinary lsbom $portutil::autoconf::lsbom_path] -s ${pkgpath}/Contents/Archive.bom] "\n"]]} result]} {
return -code error [format [msgcat::mc "Reading package bom failed: %s"] $result]
@@ -359,7 +362,7 @@
close $infofd
}
-proc portpkg::write_distribution {dfile portname portversion} {
+proc portpkg::write_distribution {dfile portname portversion portrevision} {
global macosx_deployment_target
set portname [xml_escape $portname]
set portversion [xml_escape $portversion]
@@ -380,7 +383,7 @@
<choice id=\"org.macports.${portname}\" visible=\"false\">
<pkg-ref id=\"org.macports.${portname}\"/>
</choice>
- <pkg-ref id=\"org.macports.${portname}\">${portname}-${portversion}-component.pkg</pkg-ref>
+ <pkg-ref id=\"org.macports.${portname}\">${portname}-${portversion}_${portrevision}-component.pkg</pkg-ref>
</installer-gui-script>
"
close $dfd
Modified: branches/new-help-system/base/src/port1.0/portutil.tcl
===================================================================
--- branches/new-help-system/base/src/port1.0/portutil.tcl 2013-01-04 12:23:54 UTC (rev 101106)
+++ branches/new-help-system/base/src/port1.0/portutil.tcl 2013-01-04 14:07:53 UTC (rev 101107)
@@ -1939,7 +1939,7 @@
}
proc eval_variants {variations} {
- global all_variants ports_force PortInfo portvariants negated_variants
+ global all_variants ports_force PortInfo requested_variations portvariants negated_variants
set dlist $all_variants
upvar $variations upvariations
set chosen [choose_variants $dlist upvariations]
@@ -1950,6 +1950,8 @@
# Check to make sure the requested variations are available with this
# port, if one is not, warn the user and remove the variant from the
# array.
+ # Save the originally requested set in requested_variations.
+ array set requested_variations [array get upvariations]
foreach key [array names upvariations *] {
if {![info exists PortInfo(variants)] ||
[lsearch $PortInfo(variants) $key] == -1} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130104/901b68d6/attachment-0001.html>
More information about the macports-changes
mailing list