diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-06-21 21:17:51 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-06-21 21:17:51 +0400 |
commit | eaae38551f19a06c903c8beadbcaad9453b81b49 (patch) | |
tree | 74494e7bff6983641b0cca421732b3ab765dd205 /build_files | |
parent | d33b63c5d85db9a8632a3571048f2fcbf713740d (diff) |
pep8 compliance
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/buildbot/master.cfg | 1 | ||||
-rw-r--r-- | build_files/buildbot/master_unpack.py | 3 | ||||
-rw-r--r-- | build_files/buildbot/slave_pack.py | 2 | ||||
-rwxr-xr-x | build_files/cmake/cmake_consistency_check.py | 5 |
4 files changed, 5 insertions, 6 deletions
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index b4d69a289ee..fd712f1b832 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -74,6 +74,7 @@ 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) diff --git a/build_files/buildbot/master_unpack.py b/build_files/buildbot/master_unpack.py index 3e1dec726e5..ad7c09933c6 100644 --- a/build_files/buildbot/master_unpack.py +++ b/build_files/buildbot/master_unpack.py @@ -64,10 +64,11 @@ def get_platform(filename): return '-'.join(platform_tokens) + def get_branch(filename): tokens = filename.split("-") branch = "" - + for token in tokens: if branch == "": branch = token diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index cdc7cff3275..4c19b723fc8 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -36,7 +36,7 @@ builder = sys.argv[1] branch = '' if len(sys.argv) >= 3: - branch = sys.argv[2] + branch = sys.argv[2] # scons does own packaging if builder.find('scons') != -1: diff --git a/build_files/cmake/cmake_consistency_check.py b/build_files/cmake/cmake_consistency_check.py index 9a5e3553ea2..ebcc75ade2b 100755 --- a/build_files/cmake/cmake_consistency_check.py +++ b/build_files/cmake/cmake_consistency_check.py @@ -32,7 +32,7 @@ IGNORE = ( "/decimation/intern/future/", "/TerraplayNetwork/", "/ik_glut_test/", - + # specific source files "extern/Eigen2/Eigen/src/Cholesky/CholeskyInstantiations.cpp", "extern/Eigen2/Eigen/src/Core/CoreInstantiations.cpp", @@ -65,10 +65,7 @@ IGNORE = ( "extern/eltopo/common/meshes/meshloader.h", "extern/eltopo/eltopo3d/broadphase_blenderbvh.h" ) - - - import os from os.path import join, dirname, normpath, abspath, splitext |