[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36190] trunk/blender/build_files/buildbot /slave_compile.py: buildbot:

[Sergey Sharybin]

Revision: 36190
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36190
Author:   nazgul
Date:     2011-04-16 21:23:05 +0000 (Sat, 16 Apr 2011)
Log Message:
-----------
buildbot:
- use cores+1 threads
- do not clean build directories
- separate build directories for blender and blenderplayer

This should make compilation much faster and buildbot rebuild tag could
happen more often

Modified Paths:
--------------
    trunk/blender/build_files/buildbot/slave_compile.py

Modified: trunk/blender/build_files/buildbot/slave_compile.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_compile.py	2011-04-16 13:00:41 UTC (rev 36189)
+++ trunk/blender/build_files/buildbot/slave_compile.py	2011-04-16 21:23:05 UTC (rev 36190)
@@ -75,16 +75,10 @@
         build_dir = os.path.join('..', 'build', builder)
         install_dir = os.path.join('..', 'install', builder)
 
-        common_options = ['BF_NUMJOBS=' + str(cores),
-            'BF_BUILDDIR=' + build_dir,
+        common_options = ['BF_NUMJOBS=' + str(cores + 1),
             'BF_INSTALLDIR=' + install_dir]
 
-        # Clean all directories first
-        retcode = subprocess.call(scons_cmd + common_options + ['clean'])
-        if retcode != 0:
-            print('Error cleaning build directory')
-            sys.exit(retcode)
-
+        # Clean install directory so we'll be sure there's no
         if os.path.isdir(install_dir):
             shutil.rmtree(install_dir)
 
@@ -103,6 +97,12 @@
             config_fpath = os.path.join(config_dir, config)
 
             scons_options = []
+
+            if config.find('player') != -1:
+                scons_options.append('BF_BUILDDIR=%s_player' % (build_dir))
+            else:
+                scons_options.append('BF_BUILDDIR=%s' % (build_dir))
+
             scons_options += common_options
 
             if config.find('player') == -1: