tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Made a mistake in recent windows buildbot tweaks. 

Didn't count indentation correct..
This commit is contained in:
Sergey Sharybin 2013-03-12 09:19:38 +00:00
parent ee3d910f8f
commit ff65a6d457
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build_files/buildbot/slave_compile.py
View 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)