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

Update automate_git.py to set GYP_CHROMIUM_NO_ACTION (issue #1470).

This commit is contained in:
Marshall Greenblatt 2015-04-13 17:10:22 +02:00
parent 505f11159a
commit 740ad72f90
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/automate/automate-git.py
View File

@ -563,8 +563,9 @@ else:
if os.path.exists(cef_dir): if os.path.exists(cef_dir):
cef_existing_url = get_git_url(cef_dir) cef_existing_url = get_git_url(cef_dir)
if cef_url != cef_existing_url: if cef_url != cef_existing_url:
raise Exception('Requested CEF checkout URL %s does not match existing '+\ raise Exception(
'URL %s' % (cef_url, cef_existing_url)) 'Requested CEF checkout URL %s does not match existing URL %s' %
(cef_url, cef_existing_url))
msg("CEF Branch: %s" % (cef_branch)) msg("CEF Branch: %s" % (cef_branch))
msg("CEF URL: %s" % (cef_url)) msg("CEF URL: %s" % (cef_url))
@ -760,12 +761,19 @@ if chromium_checkout_changed:
deps_path = os.path.join(chromium_src_dir, '.DEPS.git') deps_path = os.path.join(chromium_src_dir, '.DEPS.git')
remove_deps_entry(deps_path, "'src'") remove_deps_entry(deps_path, "'src'")
# Set the GYP_CHROMIUM_NO_ACTION value temporarily so that `gclient sync` does
# not run gyp.
os.environ['GYP_CHROMIUM_NO_ACTION'] = '1'
# Update third-party dependencies including branch/tag information. # Update third-party dependencies including branch/tag information.
run("gclient sync %s%s--with_branch_heads --jobs 16" % \ run("gclient sync %s%s--with_branch_heads --jobs 16" % \
(('--reset ' if options.forceclean else ''), \ (('--reset ' if options.forceclean else ''), \
('--nohooks ' if chromium_nohooks else '')), \ ('--nohooks ' if chromium_nohooks else '')), \
chromium_dir, depot_tools_dir) chromium_dir, depot_tools_dir)
# Clear the GYP_CHROMIUM_NO_ACTION value.
del os.environ['GYP_CHROMIUM_NO_ACTION']
# Delete the src/out directory created by `gclient sync`. # Delete the src/out directory created by `gclient sync`.
delete_directory(out_src_dir) delete_directory(out_src_dir)