diff options
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/buildbot/master.cfg | 16 | ||||
-rw-r--r-- | build_files/buildbot/slave_pack.py | 18 |
2 files changed, 17 insertions, 17 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')) diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index af8d99893b4..94640803aae 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -84,12 +84,12 @@ if builder.find('scons') != -1: sys.exit(retcode) # clean release directory if it already exists -dir = 'release' +release_dir = 'release' -if os.path.exists(dir): - for f in os.listdir(dir): - if os.path.isfile(os.path.join(dir, f)): - os.remove(os.path.join(dir, f)) +if os.path.exists(release_dir): + for f in os.listdir(release_dir): + if os.path.isfile(os.path.join(release_dir, f)): + os.remove(os.path.join(release_dir, f)) # create release package try: @@ -99,16 +99,16 @@ except Exception, ex: sys.exit(1) # find release directory, must exist this time -if not os.path.exists(dir): - sys.stderr.write("Failed to find release directory.\n") +if not os.path.exists(release_dir): + sys.stderr.write("Failed to find release directory %r.\n" % release_dir) sys.exit(1) # find release package file = None filepath = None -for f in os.listdir(dir): - rf = os.path.join(dir, f) +for f in os.listdir(release_dir): + rf = os.path.join(release_dir, f) if os.path.isfile(rf) and f.startswith('blender'): file = f filepath = rf |