diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-03-11 14:49:51 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-03-11 14:49:51 +0400 |
| commit | 1a0789dc72553ef6ab133c1d60212448e4f329d9 (patch) | |
| tree | 5e1e8f20394d1988366d629c7e87ce0a166651a1 /build_files | |
| parent | ed1c22db00630b427154f0608e1028660ce51be1 (diff) | |
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.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 10 | ||||
| -rw-r--r-- | build_files/buildbot/slave_pack.py | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 38b621a9055..26966c8abe1 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -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) diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 569b996d7a0..3c2569e4a69 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -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') |