[68594] branches/release_1_9/base/portmgr/dmg

[jmr at macports.org]

Revision: 68594
          http://trac.macports.org/changeset/68594
Author:   jmr at macports.org
Date:     2010-06-07 01:18:01 -0700 (Mon, 07 Jun 2010)
Log Message:
-----------
merge r68593 from trunk:
 don't allow pkg install without Xcode installed (#25156, #21685)

Revision Links:
--------------
    http://trac.macports.org/changeset/68593

Modified Paths:
--------------
    branches/release_1_9/base/portmgr/dmg/InstallationCheck
    branches/release_1_9/base/portmgr/dmg/InstallationCheck.strings

Modified: branches/release_1_9/base/portmgr/dmg/InstallationCheck
===================================================================
--- branches/release_1_9/base/portmgr/dmg/InstallationCheck	2010-06-07 08:12:51 UTC (rev 68593)
+++ branches/release_1_9/base/portmgr/dmg/InstallationCheck	2010-06-07 08:18:01 UTC (rev 68594)
@@ -12,17 +12,22 @@
     exit 112
 fi
 
+if ! [[ -x /usr/bin/xcodebuild ]]; then
+    # message 17
+    exit 113
+fi
+
 base_version=`uname -r | sed 's/\..*//'`
 if [[ ${base_version} != __DARWINVERS__ ]]; then
-   # This maps to message 17 in InstallationCheck.strings (Apple allows
+   # This maps to message 18 in InstallationCheck.strings (Apple allows
    # 16-31 for custom messages); that message should also be customized
    # like this script
-   exit 113
+   exit 114
 fi
 
 if [[ -f __PREFIX__/etc/ports/dp_version ]]; then
-   # message 18 in InstallationCheck.strings
-   exit 114
+   # message 19 in InstallationCheck.strings
+   exit 115
 fi
 
 exit 0

Modified: branches/release_1_9/base/portmgr/dmg/InstallationCheck.strings
===================================================================
--- branches/release_1_9/base/portmgr/dmg/InstallationCheck.strings	2010-06-07 08:12:51 UTC (rev 68593)
+++ branches/release_1_9/base/portmgr/dmg/InstallationCheck.strings	2010-06-07 08:18:01 UTC (rev 68594)
@@ -1,3 +1,4 @@
 "16" = "Either uname or sed could not be found in PATH. Your system appears to be incomplete or misconfigured.";
-"17" = "This package is meant to be installed on Mac OS X __XVERS__.";
-"18" = "Your existing MacPorts or DarwinPorts installation is too old to be upgraded by this installer. Please install MacPorts 1.7.1 first.";
+"17" = "Xcode is not installed, or was installed with UNIX Development (10.5+) or Command Line Support (10.4) deselected.";
+"18" = "This package is meant to be installed on Mac OS X __XVERS__.";
+"19" = "Your existing MacPorts or DarwinPorts installation is too old to be upgraded by this installer. Please install MacPorts 1.7.1 first.";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100607/3e9c2e27/attachment.html>