Revision
90110
Author
dports@macports.org
Date
2012-02-21 23:54:27 -0800 (Tue, 21 Feb 2012)

Log Message

release_2_0 branch: add a warning if Xcode 4.3 is installed but
we still need to run xcode-select.

(release_2_0 only; trunk already has a warning for this as part of
calculating developer_dir)

Modified Paths

Property Changed

Diff

Property changes: branches/release_2_0

Modified: svn:mergeinfo

+ /trunk:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81119,81146,81234,81361,81371,81414-81415,81454,81464,81467,81522,81557-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,84351,84908-84909,84931,84937,88045,89988,89993-89994,90000,90002,90004,90010,90020,90054,90056,90058,90075,90082-90084,90088,90107

Modified: branches/release_2_0/base/src/port1.0/portutil.tcl (90109 => 90110)


--- branches/release_2_0/base/src/port1.0/portutil.tcl	2012-02-22 07:26:15 UTC (rev 90109)
+++ branches/release_2_0/base/src/port1.0/portutil.tcl	2012-02-22 07:54:27 UTC (rev 90110)
@@ -2732,9 +2732,14 @@
             }
         }
         if {$xcodeversion == "none"} {
-            ui_warn "Xcode does not appear to be installed; most ports will likely fail to build."
-            if {[file exists "/Applications/Install XCode.app"]} {
-                ui_warn "You downloaded Xcode from the Mac App Store but didn't install it. Run \"Install Xcode\" in the /Applications folder."
+            if {[file exists "/Applications/Xcode.app"]} {
+                ui_warn "Xcode appears to be installed but xcodebuild is unusable; some ports will likely fail to build."
+                ui_warn "You may need to run `sudo xcode-select -switch /Applications/Xcode.app`"
+            } else {
+                ui_warn "Xcode does not appear to be installed; most ports will likely fail to build."
+                if {[file exists "/Applications/Install XCode.app"]} {
+                    ui_warn "You downloaded Xcode from the Mac App Store but didn't install it. Run \"Install Xcode\" in the /Applications folder."
+                }
             }
         } elseif {[rpm-vercomp $xcodeversion $min] < 0} {
             ui_error "The installed version of Xcode (${xcodeversion}) is too old to use on the installed OS version. Version $rec or later is recommended on Mac OS X ${macosx_version}."
@@ -2745,7 +2750,8 @@
 
         # Xcode 4.3 requires the command-line utilities package to be
         # installed. 
-        if {[vercmp $xcodeversion 4.3] >= 0} {
+        if {[vercmp $xcodeversion 4.3] >= 0 ||
+            ($xcodeversion == "none" && [file exists "/Applications/Xcode.app"])} {
             if {![file exists "/usr/bin/make"]} {
                 ui_warn "The Command Line Tools for Xcode don't appear to be installed; most ports will likely fail to build."
                 ui_warn "See http://guide.macports.org/chunked/installing.xcode.html for more information."