diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-04-03 01:11:22 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-04-03 01:11:22 +0400 |
commit | 90326c4c6e6c312ac4bf97dc443c32c8c0206ec6 (patch) | |
tree | 9735decf9a27d764884efffd1228184728fb0a4a /build_files | |
parent | 2c3b4a91dcfcafb94eb964ab3f02d02f46d1a059 (diff) |
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
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/buildbot/slave_pack.py | 3 | ||||
-rw-r--r-- | build_files/scons/tools/btools.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 7b62864fa98..81402b3aca4 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -47,7 +47,8 @@ if builder.find('scons') != -1: 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 diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 2d8c9276ba1..a646b9084c2 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -530,6 +530,8 @@ def buildbot_zip(src, dest, package_name, extension): 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): |