From bf591017b3f957dd8a7eb379d0a09e6e36c6229e Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sat, 16 Apr 2011 21:23:05 +0000 Subject: buildbot: - use cores+1 threads - do not clean build directories - separate build directories for blender and blenderplayer This should make compilation much faster and buildbot rebuild tag could happen more often --- build_files/buildbot/slave_compile.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'build_files/buildbot/slave_compile.py') diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index e6dd4840bd6..1fa5f215023 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -75,16 +75,10 @@ else: build_dir = os.path.join('..', 'build', builder) install_dir = os.path.join('..', 'install', builder) - common_options = ['BF_NUMJOBS=' + str(cores), - 'BF_BUILDDIR=' + build_dir, + common_options = ['BF_NUMJOBS=' + str(cores + 1), 'BF_INSTALLDIR=' + install_dir] - # Clean all directories first - retcode = subprocess.call(scons_cmd + common_options + ['clean']) - if retcode != 0: - print('Error cleaning build directory') - sys.exit(retcode) - + # Clean install directory so we'll be sure there's no if os.path.isdir(install_dir): shutil.rmtree(install_dir) @@ -103,6 +97,12 @@ else: config_fpath = os.path.join(config_dir, config) scons_options = [] + + if config.find('player') != -1: + scons_options.append('BF_BUILDDIR=%s_player' % (build_dir)) + else: + scons_options.append('BF_BUILDDIR=%s' % (build_dir)) + scons_options += common_options if config.find('player') == -1: -- cgit v1.2.3