Revision: 36195 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36195 Author: nazgul Date: 2011-04-17 06:17:37 +0000 (Sun, 17 Apr 2011) Log Message: ----------- buildbot:
Use BF_NUMJOBS from user cinfigs rather than passing it as command line argument. Modified Paths: -------------- trunk/blender/build_files/buildbot/config/user-config-i686.py trunk/blender/build_files/buildbot/config/user-config-player-i686.py trunk/blender/build_files/buildbot/config/user-config-player-x86_64.py trunk/blender/build_files/buildbot/config/user-config-x86_64.py trunk/blender/build_files/buildbot/slave_compile.py Modified: trunk/blender/build_files/buildbot/config/user-config-i686.py =================================================================== --- trunk/blender/build_files/buildbot/config/user-config-i686.py 2011-04-17 05:08:03 UTC (rev 36194) +++ trunk/blender/build_files/buildbot/config/user-config-i686.py 2011-04-17 06:17:37 UTC (rev 36195) @@ -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' Modified: trunk/blender/build_files/buildbot/config/user-config-player-i686.py =================================================================== --- trunk/blender/build_files/buildbot/config/user-config-player-i686.py 2011-04-17 05:08:03 UTC (rev 36194) +++ trunk/blender/build_files/buildbot/config/user-config-player-i686.py 2011-04-17 06:17:37 UTC (rev 36195) @@ -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' Modified: trunk/blender/build_files/buildbot/config/user-config-player-x86_64.py =================================================================== --- trunk/blender/build_files/buildbot/config/user-config-player-x86_64.py 2011-04-17 05:08:03 UTC (rev 36194) +++ trunk/blender/build_files/buildbot/config/user-config-player-x86_64.py 2011-04-17 06:17:37 UTC (rev 36195) @@ -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' Modified: trunk/blender/build_files/buildbot/config/user-config-x86_64.py =================================================================== --- trunk/blender/build_files/buildbot/config/user-config-x86_64.py 2011-04-17 05:08:03 UTC (rev 36194) +++ trunk/blender/build_files/buildbot/config/user-config-x86_64.py 2011-04-17 06:17:37 UTC (rev 36195) @@ -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' Modified: trunk/blender/build_files/buildbot/slave_compile.py =================================================================== --- trunk/blender/build_files/buildbot/slave_compile.py 2011-04-17 05:08:03 UTC (rev 36194) +++ trunk/blender/build_files/buildbot/slave_compile.py 2011-04-17 06:17:37 UTC (rev 36195) @@ -60,23 +60,12 @@ 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): _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs