[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44427] trunk/blender: OSX: scons: fix own mistake, truncate output of xcode-build -version to major. minor version in config to change the var not only the print

[jens verwiebe]

Revision: 44427
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44427
Author:   jensverwiebe
Date:     2012-02-25 11:21:20 +0000 (Sat, 25 Feb 2012)
Log Message:
-----------
OSX: scons: fix own mistake, truncate output of xcode-build -version to major.minor version in config to change the var not only the print

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/build_files/scons/config/darwin-config.py

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2012-02-25 11:08:16 UTC (rev 44426)
+++ trunk/blender/SConstruct	2012-02-25 11:21:20 UTC (rev 44427)
@@ -274,7 +274,7 @@
 
 # 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"

Modified: trunk/blender/build_files/scons/config/darwin-config.py
===================================================================
--- trunk/blender/build_files/scons/config/darwin-config.py	2012-02-25 11:08:16 UTC (rev 44426)
+++ trunk/blender/build_files/scons/config/darwin-config.py	2012-02-25 11:21:20 UTC (rev 44427)
@@ -34,7 +34,7 @@
     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