From 6d7ee1e08439672050c2c5bd022fbcc2e79770d4 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Mon, 11 Jan 2016 13:55:46 -0500 Subject: [PATCH] Add --built-target option to automate-git.py (issue #1804) --- tools/automate/automate-git.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tools/automate/automate-git.py b/tools/automate/automate-git.py index baa3480db..15f2a4991 100644 --- a/tools/automate/automate-git.py +++ b/tools/automate/automate-git.py @@ -381,11 +381,13 @@ parser.add_option('--no-depot-tools-update', parser.add_option('--force-build', action='store_true', dest='forcebuild', default=False, help='Force CEF debug and release builds. This builds '+\ - 'cefclient on all platforms and chrome_sandbox on '+\ - 'Linux.') + '[build-target] on all platforms and chrome_sandbox '+\ + 'on Linux.') parser.add_option('--no-build', action='store_true', dest='nobuild', default=False, help='Do not build CEF.') +parser.add_option('--build-target', dest='buildtarget', default='cefclient', + help='Target name(s) to build (defaults to "cefclient").') parser.add_option('--build-tests', action='store_true', dest='buildtests', default=False, help='Also build the cef_unittests target.') @@ -469,6 +471,13 @@ if (options.noreleasebuild and \ parser.print_help(sys.stderr) sys.exit() +if (options.clientdistrib or options.clientdistribonly) and \ + options.buildtarget.find('cefclient') == -1: + print "A client distribution cannot be generated if --build-target "+\ + "excludes cefclient." + parser.print_help(sys.stderr) + sys.exit() + # Operating system. if options.dryrun and options.dryrunplatform is not None: platform = options.dryrunplatform @@ -888,7 +897,7 @@ if not options.nobuild and (chromium_checkout_changed or \ command = 'ninja -C ' if options.verbosebuild: command = 'ninja -v -C' - target = ' cefclient' + target = ' ' + options.buildtarget if options.buildtests: target = target + ' cef_unittests' if platform == 'linux':