Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for linux buildslaves. Now they should be able to compile branches.

Browse Source
This commit is contained in:
Sergey Sharybin
2011-06-03 21:36:39 +00:00
parent 06ca703737
commit d84c6a3cdb
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/buildbot/slave_compile.py
View File

@@ -57,7 +57,7 @@ else:
scons_cmd = ['python', 'scons/scons.py'] scons_cmd = ['python', 'scons/scons.py']
scons_options = [] scons_options = []
if builder.startswith('linux'): if builder.find('linux') != -1:
import shutil import shutil
# We're using the same rules as release builder, so tweak # We're using the same rules as release builder, so tweak

2
build_files/buildbot/slave_pack.py
View File

@@ -43,7 +43,7 @@ if builder.find('scons') != -1:
os.chdir('../blender') os.chdir('../blender')
scons_options = ['BF_QUICK=slnt', 'BUILDBOT_BRANCH=' + branch, 'buildslave'] scons_options = ['BF_QUICK=slnt', 'BUILDBOT_BRANCH=' + branch, 'buildslave']
if builder.startswith('linux'): if builder.find('linux') != -1:
buildbot_dir = os.path.dirname(os.path.realpath(__file__)) buildbot_dir = os.path.dirname(os.path.realpath(__file__))
config_dir = os.path.join(buildbot_dir, 'config') config_dir = os.path.join(buildbot_dir, 'config')
build_dir = os.path.join('..', 'build', builder) build_dir = os.path.join('..', 'build', builder)