diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-06-04 00:44:23 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-06-04 00:44:23 +0400 |
| commit | 06ca70373768826da6c98f5eb5631f817164e11d (patch) | |
| tree | 036051690d7b4406a879f988ba3b38ffd54c07e0 /build_files/buildbot/slave_pack.py | |
| parent | ed072f2fef757cd46113b1216b46c40fbaa532f8 (diff) | |
BuildBot: various changes to support building branches.
Diffstat (limited to 'build_files/buildbot/slave_pack.py')
| -rw-r--r-- | build_files/buildbot/slave_pack.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 81402b3aca4..13578cbaaef 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -33,11 +33,15 @@ if len(sys.argv) < 2: sys.exit(1) builder = sys.argv[1] +branch = '' + +if len(sys.argv) >= 3: + branch = sys.argv[2] # scons does own packaging if builder.find('scons') != -1: os.chdir('../blender') - scons_options = ['BF_QUICK=slnt', 'buildslave'] + scons_options = ['BF_QUICK=slnt', 'BUILDBOT_BRANCH=' + branch, 'buildslave'] if builder.startswith('linux'): buildbot_dir = os.path.dirname(os.path.realpath(__file__)) @@ -52,9 +56,9 @@ if builder.find('scons') != -1: config = None - if builder == 'linux_x86_64_scons': + if builder.endswith('linux_x86_64_scons'): config = 'user-config-x86_64.py' - elif builder == 'linux_i386_scons': + elif builder.endswith('linux_i386_scons'): config = 'user-config-x86_64.py' if config is not None: |