diff options
Diffstat (limited to 'build_files/buildbot/slave_pack.py')
| -rw-r--r-- | build_files/buildbot/slave_pack.py | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 3d4f423be9c..3c2569e4a69 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -43,12 +43,12 @@ if builder.find('scons') != -1: os.chdir('../blender') scons_options = ['BF_QUICK=slnt', 'BUILDBOT_BRANCH=' + branch, 'buildslave', 'BF_FANCY=False'] - if builder.find('linux') != -1: - buildbot_dir = os.path.dirname(os.path.realpath(__file__)) - config_dir = os.path.join(buildbot_dir, 'config') - build_dir = os.path.join('..', 'build', builder) - install_dir = os.path.join('..', 'install', builder) + buildbot_dir = os.path.dirname(os.path.realpath(__file__)) + config_dir = os.path.join(buildbot_dir, 'config') + build_dir = os.path.join('..', 'build', builder) + install_dir = os.path.join('..', 'install', builder) + if builder.find('linux') != -1: scons_options += ['WITH_BF_NOBLENDER=True', 'WITH_BF_PLAYER=False', 'BF_BUILDDIR=' + build_dir, 'BF_INSTALLDIR=' + install_dir, @@ -92,12 +92,22 @@ if builder.find('scons') != -1: if builder.find('win64') != -1: bitness = '64' + scons_options.append('BF_INSTALLDIR=' + install_dir) + scons_options.append('BF_BUILDDIR=' + build_dir) scons_options.append('BF_BITNESS=' + bitness) scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=True') scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe') if builder.find('mingw') != -1: scons_options.append('BF_TOOLSET=mingw') + elif builder.find('mac') != -1: + if builder.find('x86_64') != -1: + config = 'user-config-mac-x86_64.py' + else: + config = 'user-config-mac-i386.py' + + scons_options.append('BF_CONFIG=' + os.path.join(config_dir, config)) + retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options) sys.exit(retcode) |