bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes to automate.py (issue #1067): 

- 'update_depot_tools' command fails on Linux without depot_tools in the PATH.
- Always generates build log files without looking at --build-log-file.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1449 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2013-09-19 15:32:11 +00:00
parent 43a5dccec1
commit 40892d9067
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/automate/automate.py
View File

@ -296,9 +296,9 @@ if not os.path.exists(depot_tools_dir):
if not options.noupdate and options.depottools == '': if not options.noupdate and options.depottools == '':
# Update depot_tools. It will download required scripts (svn, python, ...) # Update depot_tools. It will download required scripts (svn, python, ...)
if sys.platform == 'win32': if sys.platform == 'win32':
run('update_depot_tools.bat', depot_tools_dir); run('update_depot_tools.bat', depot_tools_dir, depot_tools_dir);
else: else:
run('update_depot_tools', depot_tools_dir); run('update_depot_tools', depot_tools_dir, depot_tools_dir);
if sys.platform == 'win32': if sys.platform == 'win32':
# Force use of the SVN version bundled with depot_tools. # Force use of the SVN version bundled with depot_tools.
@ -564,25 +564,25 @@ if any_changed or options.forcebuild:
# make CEF Debug build # make CEF Debug build
run(command + os.path.join('out', 'Debug' + build_dir_suffix) + target, \ run(command + os.path.join('out', 'Debug' + build_dir_suffix) + target, \
chromium_src_dir, depot_tools_dir, chromium_src_dir, depot_tools_dir,
os.path.join(chromium_src_dir, 'ninja-build-debug.log')) os.path.join(chromium_src_dir, 'ninja-build-debug.log') if options.buildlogfile else None)
if not options.noreleasebuild: if not options.noreleasebuild:
# make CEF Release build # make CEF Release build
run(command + os.path.join('out', 'Release' + build_dir_suffix) + target, \ run(command + os.path.join('out', 'Release' + build_dir_suffix) + target, \
chromium_src_dir, depot_tools_dir, chromium_src_dir, depot_tools_dir,
os.path.join(chromium_src_dir, 'ninja-build-release.log')) os.path.join(chromium_src_dir, 'ninja-build-release.log') if options.buildlogfile else None)
else: else:
path = os.path.join(cef_tools_dir, 'build_projects'+script_ext) path = os.path.join(cef_tools_dir, 'build_projects'+script_ext)
if not options.nodebugbuild: if not options.nodebugbuild:
# make CEF Debug build # make CEF Debug build
run(path+' Debug', cef_tools_dir, depot_tools_dir, run(path+' Debug', cef_tools_dir, depot_tools_dir,
os.path.join(chromium_src_dir, 'build-debug.log')) os.path.join(chromium_src_dir, 'build-debug.log') if options.buildlogfile else None)
if not options.noreleasebuild: if not options.noreleasebuild:
# make CEF Release build # make CEF Release build
run(path+' Release', cef_tools_dir, depot_tools_dir, run(path+' Release', cef_tools_dir, depot_tools_dir,
os.path.join(chromium_src_dir, 'build-release.log')) os.path.join(chromium_src_dir, 'build-release.log') if options.buildlogfile else None)
if (any_changed or options.forcedistrib) and not options.nodistrib: if (any_changed or options.forcedistrib) and not options.nodistrib:
if not options.forceclean and options.cleanartifacts: if not options.forceclean and options.cleanartifacts: