[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35948] trunk/blender/build_files/buildbot /slave_pack.py: Oops, i've forgot that archive is preparing by scons, so stripping should

Sergey Sharybin g.ulairi at gmail.com
Fri Apr 1 23:38:05 CEST 2011


Revision: 35948
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35948
Author:   nazgul
Date:     2011-04-01 21:38:04 +0000 (Fri, 01 Apr 2011)
Log Message:
-----------
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)

Modified Paths:
--------------
    trunk/blender/build_files/buildbot/slave_pack.py

Modified: trunk/blender/build_files/buildbot/slave_pack.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_pack.py	2011-04-01 21:37:40 UTC (rev 35947)
+++ trunk/blender/build_files/buildbot/slave_pack.py	2011-04-01 21:38:04 UTC (rev 35948)
@@ -60,13 +60,11 @@
             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')
+        blender = os.path.join(install_dir, 'blender')
+        blenderplayer = os.path.join(install_dir, 'blenderplayer')
+        subprocess.call(['strip', '--strip-all', blender, 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)




More information about the Bf-blender-cvs mailing list