Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2011-04-02 01:38:04 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2011-04-02 01:38:04 +0400
commit6d4f57bc3a7029479b28e97d9466bff0cc6b87a5 (patch)
tree79de10a97503d81d2200178bf038ec17fa26a7f5 /build_files
parentc729c1a9970b981611015bc07e3b77cd21601c44 (diff)
Oops, i've forgot that archive is preparing by scons, so stripping should
happpen before calling scons (hope, binaries wouldn't be overwritten by it)
Diffstat (limited to 'build_files')
-rw-r--r--build_files/buildbot/slave_pack.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py
index 28225b62b35..7b62864fa98 100644
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -60,13 +60,11 @@ if builder.find('scons') != -1:
config_fpath = os.path.join(config_dir, config)
scons_options.append('BF_CONFIG=' + config_fpath)
- retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
- if retcode == 0:
- blender = os.path.join(install_dir, 'blender')
- blenderplayer = os.path.join(install_dir, 'blenderplayer')
-
- subprocess.call(['strip', '--strip-all', blender, blenderplayer])
+ blender = os.path.join(install_dir, 'blender')
+ blenderplayer = os.path.join(install_dir, 'blenderplayer')
+ subprocess.call(['strip', '--strip-all', blender, blenderplayer])
+ retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
sys.exit(retcode)
else:
retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)