From 36887c0ed017f4f4c62d0f4c704449ff5abe6173 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 12 Mar 2013 09:24:52 +0000 Subject: Woops, installing dlls shall happen after all the folders are created. --- build_files/buildbot/slave_compile.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index e6aef6aaa31..caa4acc4ecd 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -143,14 +143,6 @@ else: scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe') if builder.find('mingw') != -1: scons_options.append('BF_TOOLSET=mingw') - - 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\\x86' - else: - dlls_path = 'C:\\b\\redist\\amd64' - for dll in dlls: - shutil.copyfile(os.path.join(dlls_path, dll), os.path.join(install_dir, dll)) elif builder.find('mac') != -1: if builder.find('x86_64') != -1: config = 'user-config-mac-x86_64.py' @@ -160,4 +152,14 @@ else: scons_options.append('BF_CONFIG=' + os.path.join(config_dir, config)) retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options) + + if builder.find('win') != -1: + dlls = ('msvcm90.dll', 'msvcp90.dll', 'msvcr90.dll', 'vcomp90.dll', 'Microsoft.VC90.CRT.manifest', 'Microsoft.VC90.OpenMP.manifest') + if builder.find('win64') == -1: + dlls_path = 'C:\\b\\redist\\x86' + else: + dlls_path = 'C:\\b\\redist\\amd64' + for dll in dlls: + shutil.copyfile(os.path.join(dlls_path, dll), os.path.join(install_dir, dll)) + sys.exit(retcode) -- cgit v1.2.3