forked from bartvdbraak/blender
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
This commit is contained in:
parent
99aec11acf
commit
bf591017b3
@ -75,16 +75,10 @@ else:
|
|||||||
build_dir = os.path.join('..', 'build', builder)
|
build_dir = os.path.join('..', 'build', builder)
|
||||||
install_dir = os.path.join('..', 'install', builder)
|
install_dir = os.path.join('..', 'install', builder)
|
||||||
|
|
||||||
common_options = ['BF_NUMJOBS=' + str(cores),
|
common_options = ['BF_NUMJOBS=' + str(cores + 1),
|
||||||
'BF_BUILDDIR=' + build_dir,
|
|
||||||
'BF_INSTALLDIR=' + install_dir]
|
'BF_INSTALLDIR=' + install_dir]
|
||||||
|
|
||||||
# Clean all directories first
|
# Clean install directory so we'll be sure there's no
|
||||||
retcode = subprocess.call(scons_cmd + common_options + ['clean'])
|
|
||||||
if retcode != 0:
|
|
||||||
print('Error cleaning build directory')
|
|
||||||
sys.exit(retcode)
|
|
||||||
|
|
||||||
if os.path.isdir(install_dir):
|
if os.path.isdir(install_dir):
|
||||||
shutil.rmtree(install_dir)
|
shutil.rmtree(install_dir)
|
||||||
|
|
||||||
@ -103,6 +97,12 @@ else:
|
|||||||
config_fpath = os.path.join(config_dir, config)
|
config_fpath = os.path.join(config_dir, config)
|
||||||
|
|
||||||
scons_options = []
|
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
|
scons_options += common_options
|
||||||
|
|
||||||
if config.find('player') == -1:
|
if config.find('player') == -1:
|
||||||
|
Loading…
Reference in New Issue
Block a user