[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35965] trunk/blender/build_files: buildbot:

[Sergey Sharybin]

Revision: 35965
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35965
Author:   nazgul
Date:     2011-04-02 21:11:22 +0000 (Sat, 02 Apr 2011)
Log Message:
-----------
buildbot:
- Remove packed to buildbot_archive.zip archive file to keep scons install
  directory as clean as possible (if i understood correct, this file isn't
  actually needed in the future, so we could remove it just after packing rather
  than cleaning install directory before packing as it's done for cmake)
- No need in scripts installation for linux slaves when preparing archive

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

Modified: trunk/blender/build_files/buildbot/slave_pack.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_pack.py	2011-04-02 16:45:17 UTC (rev 35964)
+++ trunk/blender/build_files/buildbot/slave_pack.py	2011-04-02 21:11:22 UTC (rev 35965)
@@ -47,7 +47,8 @@
 
         scons_options += ['WITH_BF_NOBLENDER=True', 'WITH_BF_PLAYER=False',
             'BF_BUILDDIR=' + build_dir,
-            'BF_INSTALLDIR=' + install_dir]
+            'BF_INSTALLDIR=' + install_dir,
+            'WITHOUT_BF_INSTALL=True']
 
         config = None
 

Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py	2011-04-02 16:45:17 UTC (rev 35964)
+++ trunk/blender/build_files/scons/tools/btools.py	2011-04-02 21:11:22 UTC (rev 35965)
@@ -530,6 +530,8 @@
     print("writing %s to %s" % (dest, bb_zip_name))
     bb_zip.write(dest, os.path.split(dest)[1])
     bb_zip.close()
+    print("removing unneeded packed file %s (to keep install directory clean)" % (dest))
+    os.remove(dest)
     print("done.")
 
 def buildslave_print(target, source, env):