[91331] trunk/base

[jmr at macports.org]

Revision: 91331
          https://trac.macports.org/changeset/91331
Author:   jmr at macports.org
Date:     2012-03-29 17:43:08 -0700 (Thu, 29 Mar 2012)
Log Message:
-----------
distribution packages should work now

Modified Paths:
--------------
    trunk/base/src/package1.0/portpkg.tcl

Added Paths:
-----------
    trunk/base/portmgr/dmg/Distribution

Added: trunk/base/portmgr/dmg/Distribution
===================================================================
--- trunk/base/portmgr/dmg/Distribution	                        (rev 0)
+++ trunk/base/portmgr/dmg/Distribution	2012-03-30 00:43:08 UTC (rev 91331)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<installer-gui-script minSpecVersion="1">
+    <title>MacPorts</title>
+    <options customize="never"/>
+    <allowed-os-versions><os-version min="__XVERS__" before="__NEXT_XVERS__"/></allowed-os-versions>
+    <installation-check script="InstallationCheck();"/>
+    <script><![CDATA[
+function InstallationCheck () {
+    if (system.files.fileExistsAtPath('__PREFIX__/etc/ports/dp_version')) {
+        my.result.message = "Your existing MacPorts or DarwinPorts installation is too old to be upgraded by this installer. Please install MacPorts 1.7.1 first.";
+        my.result.type = 'Fatal';
+        return false;
+    }
+    if (!system.files.fileExistsAtPath('/usr/bin/xcodebuild')) {
+        my.result.message = "Xcode is not installed, or was installed without __XCODECLITOOLS__.";
+        my.result.type = 'Warn';
+        return false;
+    }
+    return true;
+}
+    ]]>
+    </script>
+    <background file="background.tiff" mime-type="image/tiff" alignment="bottomleft" scaling="none"/>
+    <license mime-type="text/html" file="License.html"/>
+    <readme mime-type="text/rtf" file="ReadMe.rtf"/>
+    <welcome mime-type="text/html" file="Welcome.html"/>
+    <choices-outline>
+        <line choice="default">
+            <line choice="org.macports.MacPorts"/>
+        </line>
+    </choices-outline>
+    <choice id="default"/>
+    <choice id="org.macports.MacPorts" visible="false">
+        <pkg-ref id="org.macports.MacPorts"/>
+    </choice>
+    <pkg-ref id="org.macports.MacPorts">MacPorts-__VERSION__.pkg</pkg-ref>
+</installer-gui-script>

Modified: trunk/base/src/package1.0/portpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portpkg.tcl	2012-03-30 00:39:07 UTC (rev 91330)
+++ trunk/base/src/package1.0/portpkg.tcl	2012-03-30 00:43:08 UTC (rev 91331)
@@ -143,11 +143,11 @@
                 write_package_info $infofile
             } else {
                 set pkgtarget "10.3"
-                set pkgresources " --resources ${package.resources}"
+                set pkgresources " --resources ${package.resources} --title \"$portname-$portversion\""
                 set infofile "${workpath}/Info.plist"
                 write_info_plist $infofile $portname $portversion $portrevision
             }
-            set cmdline "PMResourceLocale=${language} $packagemaker -AppleLanguages \"(${language})\" --root ${destpath} --out ${pkgpath} ${pkgresources} --title \"$portname-$portversion\" --info $infofile --target $pkgtarget --domain system --id org.macports.$portname"
+            set cmdline "PMResourceLocale=${language} $packagemaker -AppleLanguages \"(${language})\" --root ${destpath} --out ${pkgpath} ${pkgresources} --info $infofile --target $pkgtarget --domain system --id org.macports.$portname"
             if {${os.major} >= 10} {
                 append cmdline " --no-relocate"
             }
@@ -367,10 +367,21 @@
     set dfd [open $dfile w+]
     puts $dfd "<?xml version=\"1.0\" encoding=\"utf-8\"?>
 <installer-gui-script minSpecVersion=\"1\">
+    <title>${portname}</title>
+    <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\"/>
-    <pkg-ref id=\"${portname}-${portversion}.pkg\">${portname}-${portversion}.pkg</pkg-ref>
+    <choices-outline>
+        <line choice=\"default\">
+            <line choice=\"org.macports.${portname}\"/>
+        </line>
+    </choices-outline>
+    <choice id=\"default\"/>
+    <choice id=\"org.macports.${portname}\" visible=\"false\">
+        <pkg-ref id=\"org.macports.${portname}\"/>
+    </choice>
+    <pkg-ref id=\"org.macports.${portname}\">${portname}-${portversion}.pkg</pkg-ref>
 </installer-gui-script>
 "
     close $dfd
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120329/17e945ef/attachment.html>