Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2012-02-07 23:57:00 +00:00
parent 017ddee0cb
commit 1ffe914a26
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
build/tools/build-wxwidgets.py
View File

@@ -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): def exitIfError(code, msg):
if code != 0: if code != 0:
print msg print msg
@@ -260,13 +266,14 @@ def main(scriptName, args):
# developer. TODO: there should be a command line option to set # developer. TODO: there should be a command line option to set
# the SDK... # the SDK...
if sys.platform.startswith("darwin"): if sys.platform.startswith("darwin"):
xcodePath = getXcodePath()
sdks = [ sdks = [
"/Developer/SDKs/MacOSX10.5.sdk", xcodePath+"/SDKs/MacOSX10.5.sdk",
"/Developer/SDKs/MacOSX10.6.sdk", xcodePath+"/SDKs/MacOSX10.6.sdk",
"/Developer/SDKs/MacOSX10.7.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 # use the lowest available sdk
for sdk in sdks: for sdk in sdks:
@@ -592,7 +599,7 @@ def main(scriptName, args):
os.makedirs(packagedir) os.makedirs(packagedir)
basename = os.path.basename(prefixDir.split(".")[0]) basename = os.path.basename(prefixDir.split(".")[0])
packageName = basename + "-" + getWxRelease() packageName = basename + "-" + getWxRelease()
packageMakerPath = "/Developer/usr/bin/packagemaker " packageMakerPath = getXcodePath()+"/usr/bin/packagemaker "
args = [] args = []
args.append("--root %s" % options.installdir) args.append("--root %s" % options.installdir)
args.append("--id org.wxwidgets.%s" % basename.lower()) args.append("--id org.wxwidgets.%s" % basename.lower())