[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52311] trunk/blender/build_files/scons/ tools/btools.py: Buildbot: show OS X target version in buildbot zip filename.

Brecht Van Lommel brechtvanlommel at pandora.be
Sun Nov 18 00:00:09 CET 2012


Revision: 52311
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52311
Author:   blendix
Date:     2012-11-17 23:00:04 +0000 (Sat, 17 Nov 2012)
Log Message:
-----------
Buildbot: show OS X target version in buildbot zip filename.

Modified Paths:
--------------
    trunk/blender/build_files/scons/tools/btools.py

Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py	2012-11-17 17:58:15 UTC (rev 52310)
+++ trunk/blender/build_files/scons/tools/btools.py	2012-11-17 23:00:04 UTC (rev 52311)
@@ -180,7 +180,7 @@
             'BF_DEBUG_CFLAGS', 'BF_DEBUG_CCFLAGS', 'BF_DEBUG_CXXFLAGS',
             'C_WARN', 'CC_WARN', 'CXX_WARN',
             'LLIBS', 'PLATFORM_LINKFLAGS','MACOSX_ARCHITECTURE', 'MACOSX_SDK_CHECK', 'XCODE_CUR_VER',
-            'BF_CYCLES_CUDA_BINARIES_ARCH', 'BF_PROGRAM_LINKFLAGS'
+            'BF_CYCLES_CUDA_BINARIES_ARCH', 'BF_PROGRAM_LINKFLAGS', 'MACOSX_DEPLOYMENT_TARGET'
     ]
     
     
@@ -502,8 +502,9 @@
         ('LLIBS', 'Platform libs', []),
         ('PLATFORM_LINKFLAGS', 'Platform linkflags', []),
         ('MACOSX_ARCHITECTURE', 'python_arch.zip select', ''),
-        ('MACOSX_SDK_CHECK', 'detect available OSX sdk`s', ''),
-        ('XCODE_CUR_VER', 'detect XCode version', ''),
+        ('MACOSX_SDK_CHECK', 'Detect available OS X SDK`s', ''),
+        ('XCODE_CUR_VER', 'Detect XCode version', ''),
+        ('MACOSX_DEPLOYMENT_TARGET', 'Detect OS X target version', ''),
 
         (BoolVariable('BF_PROFILE', 'Add profiling information if true', False)),
         ('BF_PROFILE_CFLAGS', 'C only profiling flags', []),
@@ -686,7 +687,7 @@
         elif bitness == '32bit':
             platform = 'linux-' + glibc + '-i686'
     if platform == 'darwin':
-        platform = 'OSX-' + env['MACOSX_ARCHITECTURE']
+        platform = 'OSX-' + env['MACOSX_DEPLOYMENT_TARGET'] + '-' + env['MACOSX_ARCHITECTURE']
 
     branch = env['BUILDBOT_BRANCH']
 




More information about the Bf-blender-cvs mailing list