From 769ab3eed81e8b14dff46af7ca28e2b70a7aac41 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 15 Jan 2013 23:17:45 +0000 Subject: code cleanup: - cycles ui used 'cscene' for scene.cycles and scene.cycles_curves - style cleanup --- build_files/buildbot/master.cfg | 12 +++++++----- build_files/buildbot/slave_rsync.py | 2 -- build_files/cmake/cmake_static_check_clang_array.py | 2 +- build_files/cmake/cmake_static_check_cppcheck.py | 2 +- build_files/cmake/cmake_static_check_smatch.py | 3 ++- build_files/cmake/cmake_static_check_sparse.py | 2 +- build_files/cmake/cmake_static_check_splint.py | 2 +- build_files/cmake/project_info.py | 1 - build_files/cmake/project_source_info.py | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) (limited to 'build_files') diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index 9d0839bd0d7..3cfea2a3abd 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -28,8 +28,8 @@ c['slavePortnum'] = 9989 from buildbot.changes.svnpoller import SVNPoller c['change_source'] = SVNPoller( - 'https://svn.blender.org/svnroot/bf-blender/trunk/', - pollinterval=1200) + 'https://svn.blender.org/svnroot/bf-blender/trunk/', + pollinterval=1200) # BUILDERS # @@ -74,9 +74,11 @@ def svn_step(branch=''): else: 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 rsync_step(id, branch, rsync_script): return ShellCommand(name='rsync', command=['python', rsync_script, id, branch], description='uploading', descriptionDone='uploaded', workdir='install') @@ -155,9 +157,9 @@ for i in range(0, schedule_cycle): print(names) c['schedulers'].append(timed.Nightly(name='nightly' + str(i), - builderNames=names, - hour=3+i, - minute=0)) + builderNames=names, + hour=3 + i, + minute=0)) # STATUS TARGETS # diff --git a/build_files/buildbot/slave_rsync.py b/build_files/buildbot/slave_rsync.py index aea1b65e333..6936232a495 100644 --- a/build_files/buildbot/slave_rsync.py +++ b/build_files/buildbot/slave_rsync.py @@ -41,5 +41,3 @@ print(command) ret = os.system(command) sys.exit(ret) - - diff --git a/build_files/cmake/cmake_static_check_clang_array.py b/build_files/cmake/cmake_static_check_clang_array.py index 7f45cc6aadc..448454c2177 100644 --- a/build_files/cmake/cmake_static_check_clang_array.py +++ b/build_files/cmake/cmake_static_check_clang_array.py @@ -50,7 +50,7 @@ def main(): check_commands = [] for c, inc_dirs, defs in source_info: cmd = ([CHECKER_BIN] + - CHECKER_ARGS + + CHECKER_ARGS + [c] + [("-I%s" % i) for i in inc_dirs] + [("-D%s" % d) for d in defs] diff --git a/build_files/cmake/cmake_static_check_cppcheck.py b/build_files/cmake/cmake_static_check_cppcheck.py index d79145f8586..2f7ffa5c240 100644 --- a/build_files/cmake/cmake_static_check_cppcheck.py +++ b/build_files/cmake/cmake_static_check_cppcheck.py @@ -56,7 +56,7 @@ def main(): check_commands = [] for c, inc_dirs, defs in source_info: cmd = ([CHECKER_BIN] + - CHECKER_ARGS + + CHECKER_ARGS + [c] + [("-I%s" % i) for i in inc_dirs] + [("-D%s" % d) for d in defs] diff --git a/build_files/cmake/cmake_static_check_smatch.py b/build_files/cmake/cmake_static_check_smatch.py index 7535f1cc55a..2cf07b093fb 100644 --- a/build_files/cmake/cmake_static_check_smatch.py +++ b/build_files/cmake/cmake_static_check_smatch.py @@ -41,6 +41,7 @@ import os USE_QUIET = (os.environ.get("QUIET", None) is not None) + def main(): source_info = project_source_info.build_info(use_cxx=False, ignore_prefix_list=CHECKER_IGNORE_PREFIX) @@ -48,7 +49,7 @@ def main(): for c, inc_dirs, defs in source_info: cmd = ([CHECKER_BIN] + - CHECKER_ARGS + + CHECKER_ARGS + [c] + [("-I%s" % i) for i in inc_dirs] + [("-D%s" % d) for d in defs] diff --git a/build_files/cmake/cmake_static_check_sparse.py b/build_files/cmake/cmake_static_check_sparse.py index 06bef1a1327..8a3fb477239 100644 --- a/build_files/cmake/cmake_static_check_sparse.py +++ b/build_files/cmake/cmake_static_check_sparse.py @@ -47,7 +47,7 @@ def main(): for c, inc_dirs, defs in source_info: cmd = ([CHECKER_BIN] + - CHECKER_ARGS + + CHECKER_ARGS + [c] + [("-I%s" % i) for i in inc_dirs] + [("-D%s" % d) for d in defs] diff --git a/build_files/cmake/cmake_static_check_splint.py b/build_files/cmake/cmake_static_check_splint.py index 5b1207543f5..6ad03f2bdca 100644 --- a/build_files/cmake/cmake_static_check_splint.py +++ b/build_files/cmake/cmake_static_check_splint.py @@ -79,7 +79,7 @@ def main(): check_commands = [] for c, inc_dirs, defs in source_info: cmd = ([CHECKER_BIN] + - CHECKER_ARGS + + CHECKER_ARGS + [c] + [("-I%s" % i) for i in inc_dirs] + [("-D%s" % d) for d in defs] diff --git a/build_files/cmake/project_info.py b/build_files/cmake/project_info.py index e73b94a7051..99c6ad09ce5 100755 --- a/build_files/cmake/project_info.py +++ b/build_files/cmake/project_info.py @@ -150,7 +150,6 @@ def cmake_advanced_info(): os.system(cmd) return join(CMAKE_DIR, ".cproject") - includes = [] defines = [] diff --git a/build_files/cmake/project_source_info.py b/build_files/cmake/project_source_info.py index 69d09b05ac7..1adc4689eae 100644 --- a/build_files/cmake/project_source_info.py +++ b/build_files/cmake/project_source_info.py @@ -89,12 +89,12 @@ def makefile_log(): if make_exe_basename.startswith("make"): print("running 'make' with --dry-run ...") process = subprocess.Popen([make_exe, "--always-make", "--dry-run", "--keep-going", "VERBOSE=1"], - stdout=subprocess.PIPE, + stdout=subprocess.PIPE, ) elif make_exe_basename.startswith("ninja"): print("running 'ninja' with -t commands ...") process = subprocess.Popen([make_exe, "-t", "commands"], - stdout=subprocess.PIPE, + stdout=subprocess.PIPE, ) while process.poll(): -- cgit v1.2.3