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

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

This commit is contained in:
Marshall Greenblatt 2016-06-06 18:23:15 -04:00
parent 754638846e
commit 76a40cafe3
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/distrib/README.client.txt
View File

@ -1,7 +1,7 @@
CONTENTS CONTENTS
-------- --------
Release Contains a release build of the cefclient sample application. Release Contains a release build of the sample application.
USAGE USAGE

11
tools/make_distrib.py
View File

@ -133,7 +133,11 @@ def create_readme():
'the LICENSING section of this document for licensing terms and conditions.' 'the LICENSING section of this document for licensing terms and conditions.'
elif mode == 'client': elif mode == 'client':
distrib_type = 'Client' distrib_type = 'Client'
distrib_desc = 'This distribution contains a release build of the cefclient sample application\n' \ if platform == 'linux':
client_app = 'cefsimple'
else:
client_app = 'cefclient'
distrib_desc = 'This distribution contains a release build of the ' + client_app + ' sample application\n' \
'for the ' + platform_str + ' platform. Please see the LICENSING section of this document for\n' \ 'for the ' + platform_str + ' platform. Please see the LICENSING section of this document for\n' \
'licensing terms and conditions.' 'licensing terms and conditions.'
@ -263,7 +267,7 @@ parser.add_option('--minimal',
help='include only release build binary files') help='include only release build binary files')
parser.add_option('--client', parser.add_option('--client',
action='store_true', dest='client', default=False, action='store_true', dest='client', default=False,
help='include only the cefclient application') help='include only the sample application')
parser.add_option('-q', '--quiet', parser.add_option('-q', '--quiet',
action='store_true', dest='quiet', default=False, action='store_true', dest='quiet', default=False,
help='do not output detailed status information') help='do not output detailed status information')
@ -702,7 +706,7 @@ elif platform == 'linux':
lib_dst_dir = os.path.join(dst_dir, lib_dir_name) lib_dst_dir = os.path.join(dst_dir, lib_dir_name)
make_dir(lib_dst_dir, options.quiet) make_dir(lib_dst_dir, options.quiet)
copy_file(libcef_path, lib_dst_dir, options.quiet) copy_file(libcef_path, lib_dst_dir, options.quiet)
copy_file(os.path.join(build_dir, 'cefclient'), dst_dir, options.quiet) copy_file(os.path.join(build_dir, 'cefsimple'), dst_dir, options.quiet)
else: else:
copy_file(libcef_path, dst_dir, options.quiet) copy_file(libcef_path, dst_dir, options.quiet)
copy_file(os.path.join(build_dir, 'chrome_sandbox'), os.path.join(dst_dir, 'chrome-sandbox'), options.quiet) copy_file(os.path.join(build_dir, 'chrome_sandbox'), os.path.join(dst_dir, 'chrome-sandbox'), options.quiet)
@ -716,7 +720,6 @@ elif platform == 'linux':
build_dir = valid_build_dir build_dir = valid_build_dir
if mode == 'client': if mode == 'client':
dst_dir = os.path.join(output_dir, 'Release') dst_dir = os.path.join(output_dir, 'Release')
copy_dir(os.path.join(build_dir, 'files'), os.path.join(dst_dir, 'files'), options.quiet)
else: else:
dst_dir = os.path.join(output_dir, 'Resources') dst_dir = os.path.join(output_dir, 'Resources')
make_dir(dst_dir, options.quiet) make_dir(dst_dir, options.quiet)