diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2013-06-20 18:19:46 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2013-06-20 18:19:46 +0400 |
| commit | 2749875945856b2aab0b888f1730b9c191112193 (patch) | |
| tree | cffc13a57a448f6994f5e9d755c6639a22698356 /build_files | |
| parent | e85a39b7473b3f08aa5517f761da4c0901301796 (diff) | |
Move DLL copying to before actual build process.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 33879ccff17..f9aa45a4023 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -155,9 +155,9 @@ else: 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 @@ else: 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) |