diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-24 23:36:12 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-24 23:36:12 +0400 |
| commit | 6e28ac2d7b241d9ee859650d58a89e2b7d441ea7 (patch) | |
| tree | 5a1aaeb5131a5ca240bd88e93b9fba0bdcaa1f30 /build_files/buildbot/master.cfg | |
| parent | ddfc518caea168ae1882e717ef28a35f91705a14 (diff) | |
pep8 edits and avoid naming conflicts with python builtins
Diffstat (limited to 'build_files/buildbot/master.cfg')
| -rw-r--r-- | build_files/buildbot/master.cfg | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index 5aa5a43abf7..23751f7dcd4 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -75,14 +75,14 @@ def svn_step(branch=''): return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/blender', mode='update', defaultBranch='trunk', workdir='blender') -def lib_svn_step(dir): - return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir, mode='update', defaultBranch='trunk', workdir='lib/' + dir) +def lib_svn_step(libdir): + return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + libdir, mode='update', defaultBranch='trunk', workdir='lib/' + libdir) # generic builder -def generic_builder(id, libdir='', branch=''): - filename = 'buildbot_upload_' + id + '.zip' +def generic_builder(idname, libdir='', branch=''): + filename = 'buildbot_upload_' + idname + '.zip' compile_script = '../blender/build_files/buildbot/slave_compile.py' test_script = '../blender/build_files/buildbot/slave_test.py' pack_script = '../blender/build_files/buildbot/slave_pack.py' @@ -93,10 +93,10 @@ def generic_builder(id, libdir='', branch=''): if libdir != '': f.addStep(lib_svn_step(libdir)) - f.addStep(Compile(command=['python', compile_script, id])) - f.addStep(Test(command=['python', test_script, id])) - f.addStep(ShellCommand(name='package', command=['python', pack_script, id, branch], description='packaging', descriptionDone='packaged')) - if id.find('cmake') != -1: + f.addStep(Compile(command=['python', compile_script, idname])) + f.addStep(Test(command=['python', test_script, idname])) + f.addStep(ShellCommand(name='package', command=['python', pack_script, idname, branch], description='packaging', descriptionDone='packaged')) + if 'cmake' in idname: f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024)) else: f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024, workdir='install')) |