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

Add a new `--force-clean-deps` flag to automate-git.py that deletes/re-downloads all third-party git repos (issue #1348). Should be used in combination with the `--force-clean` flag. 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1787 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2014-08-07 09:23:24 +00:00
parent 427cca8665
commit 34ad23fa0b
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -369,8 +369,12 @@ parser.add_option('--force-config',
help='Force creation of a new gclient config file.') help='Force creation of a new gclient config file.')
parser.add_option('--force-clean', parser.add_option('--force-clean',
action='store_true', dest='forceclean', default=False, action='store_true', dest='forceclean', default=False,
help='Force a clean CEF checkout. This will trigger a new '+\ help='Force a clean checkout of Chromium and CEF. This will'+\
'update, build and distribution.') ' trigger a new update, build and distribution.')
parser.add_option('--force-clean-deps',
action='store_true', dest='forcecleandeps', default=False,
help='Force a clean checkout of Chromium dependencies. Used'+\
' in combination with --force-clean.')
parser.add_option('--dry-run', parser.add_option('--dry-run',
action='store_true', dest='dryrun', default=False, action='store_true', dest='dryrun', default=False,
help="Output commands without executing them.") help="Output commands without executing them.")
@ -799,6 +803,11 @@ if os.path.exists(out_src_dir):
# Update the Chromium checkout. # Update the Chromium checkout.
if chromium_checkout_changed: if chromium_checkout_changed:
if not chromium_checkout_new: if not chromium_checkout_new:
if options.forceclean and options.forcecleandeps:
# Remove all local changes including third-party git checkouts managed by
# gclient.
run("%s clean -dffx" % (git_exe), chromium_src_dir, depot_tools_dir)
else:
# Revert all changes in the Chromium checkout. # Revert all changes in the Chromium checkout.
run("gclient revert --nohooks", chromium_dir, depot_tools_dir) run("gclient revert --nohooks", chromium_dir, depot_tools_dir)