kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

pep8 fixes for buildbot

Browse Source
This commit is contained in:
Sergey Sharybin 2011-04-02 05:53:42 +00:00
parent f1b42a129f
commit 7690086d20
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build_files/buildbot/master_unpack.py
View File

@ -45,7 +45,9 @@ def get_platform(filename):
filename = strip_extension(filename) filename = strip_extension(filename)
tokens = filename.split("-") tokens = filename.split("-")
platforms = 'osx', 'mac', 'bsd', 'win', 'linux', 'source', 'irix', 'solaris' platforms = ('osx', 'mac', 'bsd',
'win', 'linux', 'source',
'irix', 'solaris')
platform_tokens = [] platform_tokens = []
found = False found = False
@ -90,7 +92,8 @@ packagename = os.path.basename(package)
platform = get_platform(packagename) platform = get_platform(packagename)
if platform == '': if platform == '':
sys.stderr.write('Failed to detect platform from package: %r\n' % packagename) sys.stderr.write('Failed to detect platform ' +
'from package: %r\n' % packagename)
sys.exit(1) sys.exit(1)
# extract # extract

5
build_files/buildbot/slave_compile.py
View File

@ -54,6 +54,7 @@ if builder.find('cmake') != -1:
else: else:
# scons # scons
os.chdir(blender_dir) os.chdir(blender_dir)
scons_cmd = ['python', 'scons/scons.py']
scons_options = [] scons_options = []
if builder.startswith('linux'): if builder.startswith('linux'):
@ -79,7 +80,7 @@ else:
'BF_INSTALLDIR=' + install_dir] 'BF_INSTALLDIR=' + install_dir]
# Clean all directories first # Clean all directories first
retcode = subprocess.call(['python', 'scons/scons.py'] + common_options + ['clean']) retcode = subprocess.call(scons_cmd + common_options + ['clean'])
if retcode != 0: if retcode != 0:
print('Error cleaning build directory') print('Error cleaning build directory')
sys.exit(retcode) sys.exit(retcode)
@ -111,7 +112,7 @@ else:
scons_options.append('BF_CONFIG=' + config_fpath) scons_options.append('BF_CONFIG=' + config_fpath)
retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options) retcode = subprocess.call(scons_cmd + scons_options)
if retcode != 0: if retcode != 0:
print('Error building rules wuth config ' + config) print('Error building rules wuth config ' + config)
sys.exit(retcode) sys.exit(retcode)