diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2013-11-06 16:52:09 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-11-06 16:52:09 +0400 |
| commit | 5f084aced0a92c25e1326967b4a33030858825fb (patch) | |
| tree | da58e320ac3e451e062759ff93e6d5cc1d4d0462 /build_files | |
| parent | b8f22a0565c7b4a1b0b1eb2e8fbdaa3ebbd1a99e (diff) | |
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
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/config/user-config-mac-i386.py | 15 | ||||
| -rw-r--r-- | build_files/buildbot/config/user-config-mac-x86_64.py | 15 | ||||
| -rw-r--r-- | build_files/scons/config/darwin-config.py | 15 |
3 files changed, 6 insertions, 39 deletions
diff --git a/build_files/buildbot/config/user-config-mac-i386.py b/build_files/buildbot/config/user-config-mac-i386.py index 7242289e109..e0074785a01 100644 --- a/build_files/buildbot/config/user-config-mac-i386.py +++ b/build_files/buildbot/config/user-config-mac-i386.py @@ -19,19 +19,8 @@ MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64 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 diff --git a/build_files/buildbot/config/user-config-mac-x86_64.py b/build_files/buildbot/config/user-config-mac-x86_64.py index 4324ecbe2b4..0fbd30e4aa1 100644 --- a/build_files/buildbot/config/user-config-mac-x86_64.py +++ b/build_files/buildbot/config/user-config-mac-x86_64.py @@ -19,19 +19,8 @@ MACOSX_ARCHITECTURE = 'x86_64' # valid archs: ppc, i386, ppc64, x86_64 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 diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index 142b1ad04a1..75e37a59723 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -19,19 +19,8 @@ MACOSX_ARCHITECTURE = 'x86_64' # valid archs: ppc, i386, ppc64, x86_64 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 |