diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 67fae89a22a..d448742d1d9 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -53,9 +53,13 @@ if builder.find('cmake') != -1: retcode = subprocess.call(['make', '-s', '-j4', 'install']) sys.exit(retcode) else: + python_bin = 'python' + if builder.find('linux') != -1: + python_bin = '/opt/lib/python-2.7/bin/python2.7' + # scons os.chdir(blender_dir) - scons_cmd = ['python', 'scons/scons.py'] + scons_cmd = [python_bin, 'scons/scons.py'] scons_options = ['BF_FANCY=False'] # We're using the same rules as release builder, so tweak @@ -173,6 +177,6 @@ else: for dll in dlls: shutil.copyfile(os.path.join(dlls_path, dll), os.path.join(install_dir, dll)) - retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options) + retcode = subprocess.call([python_bin, 'scons/scons.py'] + scons_options) sys.exit(retcode) diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 8f4bae9a380..c989cd8e31a 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -38,6 +38,10 @@ branch = sys.argv[2] if (len(sys.argv) >= 3 and sys.argv[2] != 'master') else '' # scons does own packaging if builder.find('scons') != -1: + python_bin = 'python' + if builder.find('linux') != -1: + python_bin = '/opt/lib/python-2.7/bin/python2.7' + os.chdir('../blender.git') scons_options = ['BF_QUICK=slnt', 'BUILDBOT_BRANCH=' + branch, 'buildslave', 'BF_FANCY=False'] @@ -80,7 +84,7 @@ if builder.find('scons') != -1: os.system('cp %s %s' % (software_gl, install_dir)) os.system('chmod 755 %s' % (os.path.join(install_dir, 'blender-softwaregl'))) - retcode = subprocess.call(['schroot', '-c', chroot_name, '--', 'python', 'scons/scons.py'] + scons_options) + retcode = subprocess.call(['schroot', '-c', chroot_name, '--', python_bin, 'scons/scons.py'] + scons_options) sys.exit(retcode) else: @@ -109,7 +113,7 @@ if builder.find('scons') != -1: scons_options.append('BF_CONFIG=' + os.path.join(config_dir, config)) - retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options) + retcode = subprocess.call([python_bin, 'scons/scons.py'] + scons_options) sys.exit(retcode) # clean release directory if it already exists