bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-16 20:20:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Include cefsimple instead of cefclient in client distribution (issue #1916)

Browse Source
This commit is contained in:
Marshall Greenblatt 2016-06-07 11:27:40 -04:00
parent 76a40cafe3
commit fe9c24e307
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -463,13 +463,6 @@ 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
@ -492,6 +485,17 @@ if platform == 'windows':
else: else:
script_ext = '.sh' script_ext = '.sh'
if options.clientdistrib or options.clientdistribonly:
if platform == 'linux':
client_app = 'cefsimple'
else:
client_app = 'cefclient'
if options.buildtarget.find(client_app) == -1:
print 'A client distribution cannot be generated if --build-target '+\
'excludes %s.' % client_app
parser.print_help(sys.stderr)
sys.exit()
if options.x64build and platform != 'windows' and platform != 'macosx': if options.x64build and platform != 'windows' and platform != 'macosx':
print 'The x64 build option is only used on Windows and Mac OS X.' print 'The x64 build option is only used on Windows and Mac OS X.'
sys.exit() sys.exit()