[90024] trunk/base/src/macports1.0/macports.tcl

[jberry at macports.org]

Revision: 90024
          http://trac.macports.org/changeset/90024
Author:   jberry at macports.org
Date:     2012-02-19 13:57:48 -0800 (Sun, 19 Feb 2012)
Log Message:
-----------
When looking for xcode versions, look for bundle indentifier for older 3.x version as well as for 4.x versions

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2012-02-19 21:25:33 UTC (rev 90023)
+++ trunk/base/src/macports1.0/macports.tcl	2012-02-19 21:57:48 UTC (rev 90024)
@@ -437,10 +437,14 @@
         }
 
         # The directory from xcode-select isn't correct.
-        # Ask mdfind where Xcode is and make some suggestions for the user
+        # Ask mdfind where Xcode is and make some suggestions for the user,
+        # searching by bundle identifier for various Xcode versions (3.x and 4.x)
         set installed_xcodes {}
         if {![catch {findBinary mdfind /usr/bin/mdfind} mdfind]} {
-            set installed_xcodes [exec $mdfind "kMDItemCFBundleIdentifier == 'com.apple.dt.Xcode'"]
+            set installed_xcodes [concat \
+                [exec $mdfind "kMDItemCFBundleIdentifier == 'com.apple.Xcode'"] \
+                [exec $mdfind "kMDItemCFBundleIdentifier == 'com.apple.dt.Xcode'"] \
+                ]
         }
         if {[llength $installed_xcodes] > 0 && ![catch {findBinary mdls /usr/bin/mdls} mdls]} {
             # One, or more than one, Xcode installations found
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120219/544986a1/attachment.html>