Windows buildbot tweaks
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 11 Mar 2013 10:49:51 +0000 (10:49 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 11 Mar 2013 10:49:51 +0000 (10:49 +0000)
Make it so install directory is being nicely
cleaned before next build, which makes it
automatically removing all old files from
previous installations.

build_files/buildbot/slave_compile.py
build_files/buildbot/slave_pack.py

index 38b621a..26966c8 100644 (file)
@@ -136,6 +136,8 @@ else:
             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 @@ else:
             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)
index 569b996..3c2569e 100644 (file)
@@ -92,6 +92,8 @@ if builder.find('scons') != -1:
             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')