diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-04-17 10:17:37 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-04-17 10:17:37 +0400 |
| commit | 11caf24c558f21bccc3b43dd55d101f3a4d3b687 (patch) | |
| tree | 9a44595ed9bedc3c6461d9a327ed39efd9e19592 /build_files/buildbot | |
| parent | bf591017b3f957dd8a7eb379d0a09e6e36c6229e (diff) | |
buildbot:
Use BF_NUMJOBS from user cinfigs rather than passing it as
command line argument.
Diffstat (limited to 'build_files/buildbot')
5 files changed, 5 insertions, 12 deletions
diff --git a/build_files/buildbot/config/user-config-i686.py b/build_files/buildbot/config/user-config-i686.py index 3fdce4ff9de..6f0fca18dd4 100644 --- a/build_files/buildbot/config/user-config-i686.py +++ b/build_files/buildbot/config/user-config-i686.py @@ -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' diff --git a/build_files/buildbot/config/user-config-player-i686.py b/build_files/buildbot/config/user-config-player-i686.py index 3e686463358..202c7df6f98 100644 --- a/build_files/buildbot/config/user-config-player-i686.py +++ b/build_files/buildbot/config/user-config-player-i686.py @@ -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' diff --git a/build_files/buildbot/config/user-config-player-x86_64.py b/build_files/buildbot/config/user-config-player-x86_64.py index e439523706e..da5b6c1feba 100644 --- a/build_files/buildbot/config/user-config-player-x86_64.py +++ b/build_files/buildbot/config/user-config-player-x86_64.py @@ -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' diff --git a/build_files/buildbot/config/user-config-x86_64.py b/build_files/buildbot/config/user-config-x86_64.py index fccc31f9c73..c44a387c1d6 100644 --- a/build_files/buildbot/config/user-config-x86_64.py +++ b/build_files/buildbot/config/user-config-x86_64.py @@ -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' diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 1fa5f215023..2a1af0578a9 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -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): |