diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-03-12 13:19:38 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-03-12 13:19:38 +0400 |
commit | ff65a6d457cbbb79a77269a039ce37980f503383 (patch) | |
tree | 7db192c34c22cddcd4adc63f2b4420a0f937f233 /build_files/buildbot/slave_compile.py | |
parent | ee3d910f8f80b68c4090338c017e40175d14029d (diff) |
Made a mistake in recent windows buildbot tweaks.
Didn't count indentation correct..
Diffstat (limited to 'build_files/buildbot/slave_compile.py')
-rw-r--r-- | build_files/buildbot/slave_compile.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 259b42760f8..e6aef6aaa31 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -144,6 +144,13 @@ else: 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' @@ -153,12 +160,4 @@ 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\\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) |