[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55208] trunk/blender/build_files/buildbot /slave_compile.py: Made a mistake in recent windows buildbot tweaks.
Sergey Sharybin
sergey.vfx at gmail.com
Tue Mar 12 10:19:38 CET 2013
Revision: 55208
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55208
Author: nazgul
Date: 2013-03-12 09:19:38 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
Made a mistake in recent windows buildbot tweaks.
Didn't count indentation correct..
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 08:50:02 UTC (rev 55207)
+++ trunk/blender/build_files/buildbot/slave_compile.py 2013-03-12 09:19:38 UTC (rev 55208)
@@ -144,6 +144,13 @@
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 @@
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)
More information about the Bf-blender-cvs
mailing list