OSX: scons: fix own mistake, truncate output of xcode-build -version to major.minor...
authorJens Verwiebe <info@jensverwiebe.de>
Sat, 25 Feb 2012 11:21:20 +0000 (11:21 +0000)
committerJens Verwiebe <info@jensverwiebe.de>
Sat, 25 Feb 2012 11:21:20 +0000 (11:21 +0000)
SConstruct
build_files/scons/config/darwin-config.py

index 75cb8eec3380a2671ab7f24d0253bcf65b265902..9a1f9234d0687c6d44b35c73e796aafcb6401c2a 100644 (file)
@@ -274,7 +274,7 @@ if 'blenderlite' in B.targets:
 
 # Extended OSX_SDK and 3D_CONNEXION_CLIENT_LIBRARY and JAckOSX detection for OSX
 if env['OURPLATFORM']=='darwin':
-    print B.bc.OKGREEN + "Detected Xcode version: -- " + B.bc.ENDC + env['XCODE_CUR_VER'][6:][:3] + " --"
+    print B.bc.OKGREEN + "Detected Xcode version: -- " + B.bc.ENDC + env['XCODE_CUR_VER'] + " --"
     print "Available " + env['MACOSX_SDK_CHECK']
     if not 'Mac OS X 10.5' in env['MACOSX_SDK_CHECK']:
         print  B.bc.OKGREEN + "MacOSX10.5.sdk not available:" + B.bc.ENDC + " using MacOSX10.6.sdk"
index 78a19a1e81dab0e08d07869249a5f39c9c884b09..e9c7fb2aca8f277e64fb8ab01726bd5b0266911f 100644 (file)
@@ -34,7 +34,7 @@ elif cmd_res[:2]=='11':
     MAC_CUR_VER='10.7'
 cmd = 'xcodebuild -version'
 cmd_xcode=commands.getoutput(cmd)
-XCODE_CUR_VER=cmd_xcode
+XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version
 cmd = 'xcodebuild -showsdks'
 cmd_sdk=commands.getoutput(cmd)
 MACOSX_SDK_CHECK=cmd_sdk