buildbot:
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 17 Apr 2011 06:17:37 +0000 (06:17 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 17 Apr 2011 06:17:37 +0000 (06:17 +0000)
Use BF_NUMJOBS from user cinfigs rather than passing it as
command line argument.

build_files/buildbot/config/user-config-i686.py
build_files/buildbot/config/user-config-player-i686.py
build_files/buildbot/config/user-config-player-x86_64.py
build_files/buildbot/config/user-config-x86_64.py
build_files/buildbot/slave_compile.py

index 3fdce4ff9de99969ff05ae58beb4a14296917c4f..6f0fca18dd4ea69c0b0ceda71c16cf82c80e438b 100644 (file)
@@ -1,5 +1,6 @@
 BF_BUILDDIR = '../blender-build/linux-glibc27-i686'
 BF_INSTALLDIR = '../blender-install/linux-glibc27-i686'
+BF_NUMJOBS = 2
 
 # Python configuration
 BF_PYTHON_VERSION = '3.2'
index 3e68646335810897c6f89db01d2b5620f94fafb3..202c7df6f980d19b0591ad8fe7710eec6ba8dc8b 100644 (file)
@@ -1,5 +1,6 @@
 BF_BUILDDIR = '../blender-build/linux-glibc27-i686'
 BF_INSTALLDIR = '../blender-install/linux-glibc27-i686'
+BF_NUMJOBS = 2
 
 # Python configuration
 BF_PYTHON_VERSION = '3.2'
index e439523706e69f12f5a8a0086e1173f7d6824a4a..da5b6c1feba1dd653cccf9484395db46d7429b11 100644 (file)
@@ -1,5 +1,6 @@
 BF_BUILDDIR = '../blender-build/linux-glibc27-x86_64'
 BF_INSTALLDIR = '../blender-install/linux-glibc27-x86_64'
+BF_NUMJOBS = 2
 
 # Python configuration
 BF_PYTHON_VERSION = '3.2'
index fccc31f9c7382bf2a5bb43b3d3267438483c053a..c44a387c1d61383019a0f000840ff4fc8e30230c 100644 (file)
@@ -1,5 +1,6 @@
 BF_BUILDDIR = '../blender-build/linux-glibc27-x86_64'
 BF_INSTALLDIR = '../blender-install/linux-glibc27-x86_64'
+BF_NUMJOBS = 2
 
 # Python configuration
 BF_PYTHON_VERSION = '3.2'
index 1fa5f215023ada0d75981a3edfd53350f32362cf..2a1af0578a97abaf2953c1570cb05ddc0fb38bb5 100644 (file)
@@ -60,23 +60,12 @@ else:
     if builder.startswith('linux'):
         import shutil
 
-        cores = 1
-        if hasattr(os, 'sysconf'):
-            if 'SC_NPROCESSORS_ONLN' in os.sysconf_names:
-                cores = os.sysconf('SC_NPROCESSORS_ONLN')
-
-            if cores > 1:
-                # there're two chroot environments in one machine,
-                # so use only a half of power for better performance
-                cores = cores / 2
-
         # We're using the same rules as release builder, so tweak
         # build and install dirs
         build_dir = os.path.join('..', 'build', builder)
         install_dir = os.path.join('..', 'install', builder)
 
-        common_options = ['BF_NUMJOBS=' + str(cores + 1),
-            'BF_INSTALLDIR=' + install_dir]
+        common_options = ['BF_INSTALLDIR=' + install_dir]
 
         # Clean install directory so we'll be sure there's no
         if os.path.isdir(install_dir):