[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55209] trunk/blender/build_files/buildbot /slave_compile.py: Woops, installing dlls shall happen after all the folders are created.

[Sergey Sharybin]

Revision: 55209
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55209
Author:   nazgul
Date:     2013-03-12 09:24:52 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
Woops, installing dlls shall happen after all the folders are created.

Modified Paths:
--------------
    trunk/blender/build_files/buildbot/slave_compile.py

Modified: trunk/blender/build_files/buildbot/slave_compile.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_compile.py	2013-03-12 09:19:38 UTC (rev 55208)
+++ trunk/blender/build_files/buildbot/slave_compile.py	2013-03-12 09:24:52 UTC (rev 55209)
@@ -143,14 +143,6 @@
             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 @@
             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)