[66930] trunk/base

[jmr at macports.org]

Revision: 66930
          http://trac.macports.org/changeset/66930
Author:   jmr at macports.org
Date:     2010-04-25 21:55:53 -0700 (Sun, 25 Apr 2010)
Log Message:
-----------
dynamic default for developer_dir

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

Modified: trunk/base/doc/macports.conf.in
===================================================================
--- trunk/base/doc/macports.conf.in	2010-04-26 04:42:44 UTC (rev 66929)
+++ trunk/base/doc/macports.conf.in	2010-04-26 04:55:53 UTC (rev 66930)
@@ -21,8 +21,8 @@
 # paths are given in the example; it need not be uncommented.  Customizing binpath is intended for advanced users only.
 #binpath		@prefix_expanded@/bin:@prefix_expanded@/sbin:/bin:/sbin:/usr/bin:/usr/sbin
 
-# Directory containing Xcode Tools
-developer_dir       @DEVELOPER_DIR@
+# Directory containing Xcode Tools (default is to ask xcode-select)
+#developer_dir       @DEVELOPER_DIR@
 
 # Directory containing Applications from ports.
 applications_dir	@MPAPPLICATIONSDIR@

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2010-04-26 04:42:44 UTC (rev 66929)
+++ trunk/base/src/macports1.0/macports.tcl	2010-04-26 04:55:53 UTC (rev 66930)
@@ -786,7 +786,10 @@
 
     # Default Xcode Tools path
     if {![info exists macports::developer_dir]} {
-        set macports::developer_dir "/Developer"
+        if {$os_platform != "darwin" || $os_major < 9 
+            || [catch {set macports::developer_dir [exec xcode-select -print-path]}]} {
+            set macports::developer_dir "/Developer"
+        }
     }
 
     # Default mp universal options
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100425/d60afccf/attachment.html>