Disable fancy scons output for buildbot. Should make reading build logs a bit more...
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 26 Feb 2012 10:47:50 +0000 (10:47 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 26 Feb 2012 10:47:50 +0000 (10:47 +0000)
build_files/buildbot/slave_compile.py
build_files/buildbot/slave_pack.py

index 6a695d3af5dfdce252d3f31a98315774269a5c79..209253296be04903d4106b7902ea5803ccedfcaa 100644 (file)
@@ -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):
index 91444fe080ae910ad9ed0a5cb90f991f88388e26..cb02e619c1dc03710b895be280ff897d9cd6281e 100644 (file)
@@ -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__))