[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61163] trunk/blender/build_files: OSX/ scons: simplification for getting the system version ( major, minor ), use sw_vers -productVersion instead of uname -r, we must not redine it then from darwin version -> osx version

jens verwiebe info at jensverwiebe.de
Wed Nov 6 13:52:09 CET 2013


Revision: 61163
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61163
Author:   jensverwiebe
Date:     2013-11-06 12:52:09 +0000 (Wed, 06 Nov 2013)
Log Message:
-----------
OSX/scons: simplification for getting the system version ( major, minor ), use sw_vers -productVersion instead of uname -r, we must not redine it then from darwin version -> osx version

Modified Paths:
--------------
    trunk/blender/build_files/buildbot/config/user-config-mac-i386.py
    trunk/blender/build_files/buildbot/config/user-config-mac-x86_64.py
    trunk/blender/build_files/scons/config/darwin-config.py

Modified: trunk/blender/build_files/buildbot/config/user-config-mac-i386.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-mac-i386.py	2013-11-06 12:44:54 UTC (rev 61162)
+++ trunk/blender/build_files/buildbot/config/user-config-mac-i386.py	2013-11-06 12:52:09 UTC (rev 61163)
@@ -19,19 +19,8 @@
 
 cmd = 'uname -p'
 MAC_PROC=commands.getoutput(cmd)
-cmd = 'uname -r'
-cmd_res=commands.getoutput(cmd)
-
-if cmd_res[:1]=='9':
-    MAC_CUR_VER='10.5'
-elif cmd_res[:2]=='10':
-    MAC_CUR_VER='10.6'
-elif cmd_res[:2]=='11':
-    MAC_CUR_VER='10.7'
-elif cmd_res[:2]=='12':
-    MAC_CUR_VER='10.8'
-elif cmd_res[:2]=='13':
-    MAC_CUR_VER='10.9'
+cmd = 'sw_vers -productVersion'
+MAC_CUR_VER=cmd_res=commands.getoutput(cmd)
 cmd = 'xcodebuild -version'
 cmd_xcode=commands.getoutput(cmd)
 XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version

Modified: trunk/blender/build_files/buildbot/config/user-config-mac-x86_64.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-mac-x86_64.py	2013-11-06 12:44:54 UTC (rev 61162)
+++ trunk/blender/build_files/buildbot/config/user-config-mac-x86_64.py	2013-11-06 12:52:09 UTC (rev 61163)
@@ -19,19 +19,8 @@
 
 cmd = 'uname -p'
 MAC_PROC=commands.getoutput(cmd)
-cmd = 'uname -r'
-cmd_res=commands.getoutput(cmd)
-
-if cmd_res[:1]=='9':
-    MAC_CUR_VER='10.5'
-elif cmd_res[:2]=='10':
-    MAC_CUR_VER='10.6'
-elif cmd_res[:2]=='11':
-    MAC_CUR_VER='10.7'
-elif cmd_res[:2]=='12':
-    MAC_CUR_VER='10.8'
-elif cmd_res[:2]=='13':
-    MAC_CUR_VER='10.9'
+cmd = 'sw_vers -productVersion'
+MAC_CUR_VER=cmd_res=commands.getoutput(cmd)
 cmd = 'xcodebuild -version'
 cmd_xcode=commands.getoutput(cmd)
 XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version

Modified: trunk/blender/build_files/scons/config/darwin-config.py
===================================================================
--- trunk/blender/build_files/scons/config/darwin-config.py	2013-11-06 12:44:54 UTC (rev 61162)
+++ trunk/blender/build_files/scons/config/darwin-config.py	2013-11-06 12:52:09 UTC (rev 61163)
@@ -19,19 +19,8 @@
 
 cmd = 'uname -p'
 MAC_PROC=commands.getoutput(cmd)
-cmd = 'uname -r'
-cmd_res=commands.getoutput(cmd)
-
-if cmd_res[:1]=='9':
-    MAC_CUR_VER='10.5'
-elif cmd_res[:2]=='10':
-    MAC_CUR_VER='10.6'
-elif cmd_res[:2]=='11':
-    MAC_CUR_VER='10.7'
-elif cmd_res[:2]=='12':
-    MAC_CUR_VER='10.8'
-elif cmd_res[:2]=='13':
-    MAC_CUR_VER='10.9'
+cmd = 'sw_vers -productVersion'
+MAC_CUR_VER=cmd_res=commands.getoutput(cmd)
 cmd = 'xcodebuild -version'
 cmd_xcode=commands.getoutput(cmd)
 XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version




More information about the Bf-blender-cvs mailing list