[Bf-blender-cvs] [31d2ac1] master: Switch linux buildbot to custom built python2.7

[Sergey Sharybin]

Commit: 31d2ac14ae074bdcbb91916e4475c0ec592f7ed7
Author: Sergey Sharybin
Date:   Fri Aug 8 13:41:28 2014 +0600
Branches: master
https://developer.blender.org/rB31d2ac14ae074bdcbb91916e4475c0ec592f7ed7

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.

===================================================================

M	build_files/buildbot/slave_compile.py
M	build_files/buildbot/slave_pack.py

===================================================================

diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index 67fae89..d448742 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 8f4bae9..c989cd8 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