[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55188] trunk/blender/build_files/buildbot : Windows buildbot tweaks

[Sergey Sharybin]

Revision: 55188
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55188
Author:   nazgul
Date:     2013-03-11 10:49:51 +0000 (Mon, 11 Mar 2013)
Log Message:
-----------
Windows buildbot tweaks

Make it so install directory is being nicely
cleaned before next build, which makes it
automatically removing all old files from
previous installations.

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

Modified: trunk/blender/build_files/buildbot/slave_compile.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_compile.py	2013-03-11 09:11:46 UTC (rev 55187)
+++ trunk/blender/build_files/buildbot/slave_compile.py	2013-03-11 10:49:51 UTC (rev 55188)
@@ -136,6 +136,8 @@
             if builder.find('win64') != -1:
                 bitness = '64'
 
+            scons_options.append('BF_INSTALLDIR=' + install_dir)
+            scons_options.append('BF_BUILDDIR=' + build_dir)
             scons_options.append('BF_BITNESS=' + bitness)
             scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=True')
             scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')
@@ -151,4 +153,12 @@
             scons_options.append('BF_CONFIG=' + os.path.join(config_dir, config))
 
         retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
+        if retcode == 0:
+            dlls = ('msvcm90.dll', 'msvcp90.dll', 'msvcr90.dll', 'vcomp90.dll', 'Microsoft.VC90.CRT.manifest', 'Microsoft.VC90.OpenMP.manifest')
+            if bitness == '32':
+               dlls_path = 'C:\\b\\redist\\amd64'
+            else:
+               dlls_path = 'C:\\b\\redist\\x86'
+            for dll in dlls:
+                shutil.copyfile(os.path.join(dlls_path, dll), os.path.join(install_dir, dll))
         sys.exit(retcode)

Modified: trunk/blender/build_files/buildbot/slave_pack.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_pack.py	2013-03-11 09:11:46 UTC (rev 55187)
+++ trunk/blender/build_files/buildbot/slave_pack.py	2013-03-11 10:49:51 UTC (rev 55188)
@@ -92,6 +92,8 @@
             if builder.find('win64') != -1:
                 bitness = '64'
 
+            scons_options.append('BF_INSTALLDIR=' + install_dir)
+            scons_options.append('BF_BUILDDIR=' + build_dir)
             scons_options.append('BF_BITNESS=' + bitness)
             scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=True')
             scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')