diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-02-26 14:47:50 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-02-26 14:47:50 +0400 |
| commit | ed21afa2eb84bd944667b0f89cdc325ccd9d58f5 (patch) | |
| tree | f877f2ab3ca3fa042d1c9591a7104c4aa603f388 /build_files | |
| parent | b6582ff8fab438741938fd99607ec91b221fde11 (diff) | |
Disable fancy scons output for buildbot. Should make reading build logs a bit more easier.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 4 | ||||
| -rw-r--r-- | build_files/buildbot/slave_pack.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 6a695d3af5d..209253296be 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -55,7 +55,7 @@ else: # scons os.chdir(blender_dir) scons_cmd = ['python', 'scons/scons.py'] - scons_options = [] + scons_options = ['BF_FANCY=False'] if builder.find('linux') != -1: import shutil @@ -65,7 +65,7 @@ else: build_dir = os.path.join('..', 'build', 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 if os.path.isdir(install_dir): diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 91444fe080a..cb02e619c1d 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -41,7 +41,7 @@ if len(sys.argv) >= 3: # scons does own packaging if builder.find('scons') != -1: 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: buildbot_dir = os.path.dirname(os.path.realpath(__file__)) |