[90016] branches/release_2_0/base/src/port1.0/portmain.tcl

[jmr at macports.org]

Revision: 90016
          http://trac.macports.org/changeset/90016
Author:   jmr at macports.org
Date:     2012-02-19 11:06:41 -0800 (Sun, 19 Feb 2012)
Log Message:
-----------
2.0 branch: update default developer_dir for xcode 4.3

Modified Paths:
--------------
    branches/release_2_0/base/src/port1.0/portmain.tcl

Modified: branches/release_2_0/base/src/port1.0/portmain.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portmain.tcl	2012-02-19 18:52:44 UTC (rev 90015)
+++ branches/release_2_0/base/src/port1.0/portmain.tcl	2012-02-19 19:06:41 UTC (rev 90016)
@@ -145,10 +145,17 @@
 default compiler.library_path {${prefix}/lib}
 
 proc portmain::get_developer_dir {} {
-    if {![catch {binaryInPath xcode-select}]} {
-        return [exec xcode-select -print-path 2> /dev/null]
+    if {![catch {binaryInPath xcode-select}]
+        && ![catch {exec xcode-select -print-path 2> /dev/null} result]
+        && [file isdirectory $result]} {
+            return $result
     }
-    return "/Developer"
+    global xcodeversion
+    if {[vercmp $xcodeversion 4.3] >= 0} {
+        return "/Applications/Xcode.app/Contents/Developer"
+    } else {
+        return "/Developer"
+    }
 }
 
 # start gsoc08-privileges
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120219/f2bca200/attachment.html>