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

Add --built-target option to automate-git.py (issue #1804)

This commit is contained in:
Marshall Greenblatt 2016-01-11 13:55:46 -05:00
parent d829e80f5e
commit 6d7ee1e084
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -381,11 +381,13 @@ parser.add_option('--no-depot-tools-update',
parser.add_option('--force-build', parser.add_option('--force-build',
action='store_true', dest='forcebuild', default=False, action='store_true', dest='forcebuild', default=False,
help='Force CEF debug and release builds. This builds '+\ help='Force CEF debug and release builds. This builds '+\
'cefclient on all platforms and chrome_sandbox on '+\ '[build-target] on all platforms and chrome_sandbox '+\
'Linux.') 'on Linux.')
parser.add_option('--no-build', parser.add_option('--no-build',
action='store_true', dest='nobuild', default=False, action='store_true', dest='nobuild', default=False,
help='Do not build CEF.') 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', parser.add_option('--build-tests',
action='store_true', dest='buildtests', default=False, action='store_true', dest='buildtests', default=False,
help='Also build the cef_unittests target.') help='Also build the cef_unittests target.')
@ -469,6 +471,13 @@ if (options.noreleasebuild and \
parser.print_help(sys.stderr) parser.print_help(sys.stderr)
sys.exit() 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. # Operating system.
if options.dryrun and options.dryrunplatform is not None: if options.dryrun and options.dryrunplatform is not None:
platform = options.dryrunplatform platform = options.dryrunplatform
@ -888,7 +897,7 @@ if not options.nobuild and (chromium_checkout_changed or \
command = 'ninja -C ' command = 'ninja -C '
if options.verbosebuild: if options.verbosebuild:
command = 'ninja -v -C' command = 'ninja -v -C'
target = ' cefclient' target = ' ' + options.buildtarget
if options.buildtests: if options.buildtests:
target = target + ' cef_unittests' target = target + ' cef_unittests'
if platform == 'linux': if platform == 'linux':