[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57611] trunk/blender/build_files/buildbot /slave_compile.py: Move DLL copying to before actual build process.
Nathan Letwory
nathan at letworyinteractive.com
Thu Jun 20 16:19:46 CEST 2013
Revision: 57611
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57611
Author: jesterking
Date: 2013-06-20 14:19:46 +0000 (Thu, 20 Jun 2013)
Log Message:
-----------
Move DLL copying to before actual build process.
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-06-20 13:52:58 UTC (rev 57610)
+++ trunk/blender/build_files/buildbot/slave_compile.py 2013-06-20 14:19:46 UTC (rev 57611)
@@ -155,9 +155,9 @@
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:
+ if not os.path.exists(install_dir):
+ os.makedirs(install_dir)
if builder.endswith('vc2012'):
dlls = ('msvcp110.dll', 'msvcr110.dll', 'vcomp110.dll')
else:
@@ -169,4 +169,6 @@
for dll in dlls:
shutil.copyfile(os.path.join(dlls_path, dll), os.path.join(install_dir, dll))
+ retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
+
sys.exit(retcode)
More information about the Bf-blender-cvs
mailing list