diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-12-20 13:44:53 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-12-20 13:44:53 +0300 |
commit | 008e7701c5f0625f88b6cbc290b15fc2c9dfadbf (patch) | |
tree | 19f2842eec66dd8686a5e91206b415193b8abc43 /build_files/buildbot/slave_pack.py | |
parent | db6da8af85f4614990243a600b207a56d55b572b (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_pack.py')
-rw-r--r-- | build_files/buildbot/slave_pack.py | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 5355c7090a9..c0785ad0bc5 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -81,27 +81,7 @@ def create_tar_bz2(src, dest, package_name): package.close() -# scons does own packaging -if builder.find('scons') != -1: - python_bin = 'python' - - os.chdir('../blender.git') - scons_options = ['BF_QUICK=slnt', 'BUILDBOT_BRANCH=' + branch, 'buildslave', 'BF_FANCY=False'] - - 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) -else: +if builder.find('cmake') != -1: # CMake if 'win' in builder or 'mac' in builder: os.chdir(build_dir) @@ -203,6 +183,9 @@ else: print("Creating .tar.bz2 archive") upload_filepath = install_dir + '.tar.bz2' create_tar_bz2(install_dir, upload_filepath, package_name) +else: + print("Unknown building system") + sys.exit(1) if upload_filepath is None: |