Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-08-08 11:41:28 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-08-08 11:41:28 +0400
commit31d2ac14ae074bdcbb91916e4475c0ec592f7ed7 (patch)
tree08668c6460a9b14ab210f693ab5756c55c2791d1 /build_files/buildbot/slave_pack.py
parent9fb157df50dd35c83c0867ffc9ba2e221a7c8632 (diff)
Switch linux buildbot to custom built python2.7
New scons discontinued support of python2.6, so we needed to build just another python in the release and buildbot environment. Hope latest scons upgrade a least bring new msvs support and not only lead to just-another-frustration. There might be some more upcoming commits, because you never can be sure there's no typos in the buidbot script for until you actually fire the builder up.
Diffstat (limited to 'build_files/buildbot/slave_pack.py')
-rw-r--r--build_files/buildbot/slave_pack.py8
1 files changed, 6 insertions, 2 deletions
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