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>2015-12-20 13:44:53 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-12-20 13:44:53 +0300
commit008e7701c5f0625f88b6cbc290b15fc2c9dfadbf (patch)
tree19f2842eec66dd8686a5e91206b415193b8abc43 /build_files/buildbot/slave_compile.py
parentdb6da8af85f4614990243a600b207a56d55b572b (diff)
Buildbot: Cleanup unused code
- Remove deprecated/unused builders - Remove unused SCons OSX slave configuration - Remove SCons slave logic, it is not giving error about unknown building system used for the slave.
Diffstat (limited to 'build_files/buildbot/slave_compile.py')
-rw-r--r--build_files/buildbot/slave_compile.py33
1 files changed, 2 insertions, 31 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index cad0608d44f..93fad72373b 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -157,34 +157,5 @@ if 'cmake' in builder:
if retcode != 0:
sys.exit(retcode)
else:
- python_bin = 'python'
-
- # scons
- os.chdir(blender_dir)
- scons_cmd = [python_bin, 'scons/scons.py']
- scons_options = ['BF_FANCY=False']
-
- # We're using the same rules as release builder, so tweak
- # build and install dirs
- build_dir = os.path.join('..', 'build', builder)
- install_dir = os.path.join('..', 'install', builder)
-
- # Clean install directory so we'll be sure there's no
- # residual libs and files remained from the previous install.
- if os.path.isdir(install_dir):
- shutil.rmtree(install_dir)
-
- buildbot_dir = os.path.dirname(os.path.realpath(__file__))
- config_dir = os.path.join(buildbot_dir, 'config')
-
- if 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_bin, 'scons/scons.py'] + scons_options)
-
- sys.exit(retcode)
+ print("Unknown building system")
+ sys.exit(1)