Buildbot master tweaks: use generic builder for scons win32, unpack fixes.

build_files/buildbot/master.cfg

@@ -70,18 +70,7 @@ def svn_step():
 def lib_svn_step(dir):
     return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir, mode='update', defaultBranch='trunk', workdir='lib/' + dir)
 
-def scons_compile_step():
-    return Compile(command=['python', 'scons/scons.py'], workdir='blender')
-
-def scons_file_upload(f, id):
-    filename = 'buildbot_upload_' + id + '.zip'
-    unpack_script = 'master_unpack.py'
-
-    f.addStep(Compile(name='package', command=['python', 'scons/scons.py', 'BF_QUICK=slnt', 'buildslave'], description='packaging', descriptionDone='packaged', workdir='blender'))
-    f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100*1024*1024, workdir='install'))
-    f.addStep(MasterShellCommand(name='unpack', command=['python', unpack_script, filename], description='unpacking', descriptionDone='unpacked'))
-
-# generic
+# generic builder
 
 def generic_builder(id, libdir=''):
     filename = 'buildbot_upload_' + id + '.zip'
@@ -98,28 +87,21 @@ def generic_builder(id, libdir=''):
     f.addStep(Compile(command=['python', compile_script, id]))
     f.addStep(Test(command=['python', test_script, id]))
     f.addStep(ShellCommand(name='package', command=['python', pack_script, id], description='packaging', descriptionDone='packaged'))
+    if id.find('cmake') != -1:
         f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100*1024*1024))
+    else:
+        f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100*1024*1024, workdir='install'))
     f.addStep(MasterShellCommand(name='unpack', command=['python', unpack_script, filename], description='unpacking', descriptionDone='unpacked'))
     return f
 
+# builders
+
 add_builder(c, 'mac_x86_64_cmake', 'darwin-9.x.universal', generic_builder)
 add_builder(c, 'mac_i386_cmake', 'darwin-9.x.universal', generic_builder)
 add_builder(c, 'mac_ppc_cmake', 'darwin-9.x.universal', generic_builder)
 add_builder(c, 'linux_x86_64_cmake', '', generic_builder)
 add_builder(c, 'linux_x86_64_scons', '', generic_builder)
-
-# win32 scons
-
-# TODO: add scons test target
-def win32_scons(id, libdir):
-    f = BuildFactory()
-    f.addStep(svn_step())
-    f.addStep(lib_svn_step(libdir))
-    f.addStep(scons_compile_step())
-    scons_file_upload(f, id)
-    return f
-
-add_builder(c, 'win32_scons', 'windows', win32_scons)
+add_builder(c, 'win32_scons', 'windows', generic_builder)
 
 # SCHEDULERS
 #

build_files/buildbot/master_unpack.py

@@ -101,6 +101,8 @@ try:
 
     zf.close()
     z.close()
+    
+    os.remove(filename)
 except Exception, ex:
     sys.stderr.write('Failed to unzip package: ' + str(ex) + '\n')
     sys.exit(1)

build_files/buildbot/slave_compile.py

@@ -52,7 +52,8 @@ if builder.find('cmake') != -1:
 else:
     # scons
     os.chdir(blender_dir)
+    scons_options = []
 
-    retcode = subprocess.call(['python', 'scons/scons.py'])
+    retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
     sys.exit(retcode)