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

Disable fancy scons output for buildbot. Should make reading build logs a bit more easier.

Browse Source
This commit is contained in:
Sergey Sharybin
2012-02-26 10:47:50 +00:00
parent b6582ff8fa
commit ed21afa2eb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build_files/buildbot/slave_compile.py
View File

@@ -55,7 +55,7 @@ else:
# scons # scons
os.chdir(blender_dir) os.chdir(blender_dir)
scons_cmd = ['python', 'scons/scons.py'] scons_cmd = ['python', 'scons/scons.py']
scons_options = [] scons_options = ['BF_FANCY=False']
if builder.find('linux') != -1: if builder.find('linux') != -1:
import shutil import shutil
@@ -65,7 +65,7 @@ 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_INSTALLDIR=' + install_dir] common_options = ['BF_INSTALLDIR=' + install_dir] + scons_options
# Clean install directory so we'll be sure there's no # Clean install directory so we'll be sure there's no
if os.path.isdir(install_dir): if os.path.isdir(install_dir):

2
build_files/buildbot/slave_pack.py
View File

@@ -41,7 +41,7 @@ if len(sys.argv) >= 3:
# scons does own packaging # scons does own packaging
if builder.find('scons') != -1: 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', 'BF_FANCY=False']
if builder.find('linux') != -1: if builder.find('linux') != -1:
buildbot_dir = os.path.dirname(os.path.realpath(__file__)) buildbot_dir = os.path.dirname(os.path.realpath(__file__))