Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

buildbot:

Browse Source 
Use BF_NUMJOBS from user cinfigs rather than passing it as
command line argument.
This commit is contained in:
Sergey Sharybin
2011-04-17 06:17:37 +00:00
parent bf591017b3
commit 11caf24c55
5 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build_files/buildbot/config/user-config-i686.py
View File

@@ -1,5 +1,6 @@
BF_BUILDDIR = '../blender-build/linux-glibc27-i686' BF_BUILDDIR = '../blender-build/linux-glibc27-i686'
BF_INSTALLDIR = '../blender-install/linux-glibc27-i686' BF_INSTALLDIR = '../blender-install/linux-glibc27-i686'
BF_NUMJOBS = 2
# Python configuration # Python configuration
BF_PYTHON_VERSION = '3.2' BF_PYTHON_VERSION = '3.2'

1
build_files/buildbot/config/user-config-player-i686.py
View File

@@ -1,5 +1,6 @@
BF_BUILDDIR = '../blender-build/linux-glibc27-i686' BF_BUILDDIR = '../blender-build/linux-glibc27-i686'
BF_INSTALLDIR = '../blender-install/linux-glibc27-i686' BF_INSTALLDIR = '../blender-install/linux-glibc27-i686'
BF_NUMJOBS = 2
# Python configuration # Python configuration
BF_PYTHON_VERSION = '3.2' BF_PYTHON_VERSION = '3.2'

1
build_files/buildbot/config/user-config-player-x86_64.py
View File

@@ -1,5 +1,6 @@
BF_BUILDDIR = '../blender-build/linux-glibc27-x86_64' BF_BUILDDIR = '../blender-build/linux-glibc27-x86_64'
BF_INSTALLDIR = '../blender-install/linux-glibc27-x86_64' BF_INSTALLDIR = '../blender-install/linux-glibc27-x86_64'
BF_NUMJOBS = 2
# Python configuration # Python configuration
BF_PYTHON_VERSION = '3.2' BF_PYTHON_VERSION = '3.2'

1
build_files/buildbot/config/user-config-x86_64.py
View File

@@ -1,5 +1,6 @@
BF_BUILDDIR = '../blender-build/linux-glibc27-x86_64' BF_BUILDDIR = '../blender-build/linux-glibc27-x86_64'
BF_INSTALLDIR = '../blender-install/linux-glibc27-x86_64' BF_INSTALLDIR = '../blender-install/linux-glibc27-x86_64'
BF_NUMJOBS = 2
# Python configuration # Python configuration
BF_PYTHON_VERSION = '3.2' BF_PYTHON_VERSION = '3.2'

13
build_files/buildbot/slave_compile.py
View File

@@ -60,23 +60,12 @@ else:
if builder.startswith('linux'): if builder.startswith('linux'):
import shutil 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 # We're using the same rules as release builder, so tweak
# build and install dirs # build and install dirs
build_dir = os.path.join('..', 'build', builder) build_dir = os.path.join('..', 'build', builder)
install_dir = os.path.join('..', 'install', builder) install_dir = os.path.join('..', 'install', builder)
common_options = ['BF_NUMJOBS=' + str(cores + 1), common_options = ['BF_INSTALLDIR=' + install_dir]
'BF_INSTALLDIR=' + install_dir]
# Clean install directory so we'll be sure there's no # Clean install directory so we'll be sure there's no
if os.path.isdir(install_dir): if os.path.isdir(install_dir):