Don't assume that XCode is in /Developer. Use "xcode-select -print-path" instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/tools/build-wxwidgets.py b/build/tools/build-wxwidgets.py
index 68f8351252ed1a429b211165611f0762b13ec9f3..a0866e4b2cc02f4547cb546c64a5be4c7ad13caa 100755 (executable)
--- a/build/tools/build-wxwidgets.py
+++ b/build/tools/build-wxwidgets.py
@@ -55,6 +55,12 @@ def numCPUs():
     return 1 # Default
 
 
     return 1 # Default
 
 

+def getXcodePath():
+    p = subprocess.Popen("xcode-select -print-path", shell=True, stdout=subprocess.PIPE)
+    output = p.stdout.read()
+    return output.strip()
+
+

 def exitIfError(code, msg):
     if code != 0:
         print msg
 def exitIfError(code, msg):
     if code != 0:
         print msg


@@ -260,13 +266,14 @@ def main(scriptName, args):
         # developer.  TODO: there should be a command line option to set
         # the SDK...
         if sys.platform.startswith("darwin"):
         # developer.  TODO: there should be a command line option to set
         # the SDK...
         if sys.platform.startswith("darwin"):

+            xcodePath = getXcodePath()

             sdks = [
             sdks = [

-                "/Developer/SDKs/MacOSX10.5.sdk",
-                "/Developer/SDKs/MacOSX10.6.sdk",
-                "/Developer/SDKs/MacOSX10.7.sdk",
+                xcodePath+"/SDKs/MacOSX10.5.sdk",
+                xcodePath+"/SDKs/MacOSX10.6.sdk",
+                xcodePath+"/SDKs/MacOSX10.7.sdk",

             ]
             if not options.osx_cocoa:
             ]
             if not options.osx_cocoa:

-                sdks.insert(0, "/Developer/SDKs/MacOSX10.4u.sdk")
+                sdks.insert(0, xcodePath+"/SDKs/MacOSX10.4u.sdk")

             
             # use the lowest available sdk
             for sdk in sdks:
             
             # use the lowest available sdk
             for sdk in sdks:


@@ -592,7 +599,7 @@ def main(scriptName, args):
         os.makedirs(packagedir)
         basename = os.path.basename(prefixDir.split(".")[0])
         packageName = basename + "-" + getWxRelease()
         os.makedirs(packagedir)
         basename = os.path.basename(prefixDir.split(".")[0])
         packageName = basename + "-" + getWxRelease()

-        packageMakerPath = "/Developer/usr/bin/packagemaker "
+        packageMakerPath = getXcodePath()+"/usr/bin/packagemaker "

         args = []
         args.append("--root %s" % options.installdir)
         args.append("--id org.wxwidgets.%s" % basename.lower())
         args = []
         args.append("--root %s" % options.installdir)
         args.append("--id org.wxwidgets.%s" % basename.lower())