Made a mistake in recent windows buildbot tweaks.
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 12 Mar 2013 09:19:38 +0000 (09:19 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 12 Mar 2013 09:19:38 +0000 (09:19 +0000)
Didn't count indentation correct..

build_files/buildbot/slave_compile.py

index 259b427..e6aef6a 100644 (file)
@@ -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)