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

make_distrib.py: Look for libcef instead of cefclient when running with --allow-partial (issue #1804)

This commit is contained in:
Marshall Greenblatt 2016-03-31 15:30:19 +02:00 committed by Marshall Greenblatt
parent 243a9c26d7
commit 84fe790035
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/make_distrib.py
View File

@ -456,7 +456,7 @@ if platform == 'windows':
if mode == 'standard': if mode == 'standard':
# transfer Debug files # transfer Debug files
build_dir = os.path.join(out_dir, 'Debug' + build_dir_suffix); build_dir = os.path.join(out_dir, 'Debug' + build_dir_suffix);
if not options.allowpartial or path_exists(os.path.join(build_dir, 'cefclient.exe')): if not options.allowpartial or path_exists(os.path.join(build_dir, 'libcef.dll')):
valid_build_dir = build_dir valid_build_dir = build_dir
dst_dir = os.path.join(output_dir, 'Debug') dst_dir = os.path.join(output_dir, 'Debug')
make_dir(dst_dir, options.quiet) make_dir(dst_dir, options.quiet)
@ -477,7 +477,7 @@ if platform == 'windows':
# transfer Release files # transfer Release files
build_dir = os.path.join(out_dir, 'Release' + build_dir_suffix); build_dir = os.path.join(out_dir, 'Release' + build_dir_suffix);
if not options.allowpartial or path_exists(os.path.join(build_dir, 'cefclient.exe')): if not options.allowpartial or path_exists(os.path.join(build_dir, 'libcef.dll')):
valid_build_dir = build_dir valid_build_dir = build_dir
dst_dir = os.path.join(output_dir, 'Release') dst_dir = os.path.join(output_dir, 'Release')
make_dir(dst_dir, options.quiet) make_dir(dst_dir, options.quiet)
@ -626,12 +626,13 @@ elif platform == 'linux':
if mode == 'standard': if mode == 'standard':
# transfer Debug files # transfer Debug files
build_dir = os.path.join(out_dir, 'Debug'); build_dir = os.path.join(out_dir, 'Debug');
if not options.allowpartial or path_exists(os.path.join(build_dir, 'cefclient')): libcef_path = os.path.join(build_dir, lib_dir_name, 'libcef.so')
if not options.allowpartial or path_exists(libcef_path):
valid_build_dir = build_dir valid_build_dir = build_dir
dst_dir = os.path.join(output_dir, 'Debug') dst_dir = os.path.join(output_dir, 'Debug')
make_dir(dst_dir, options.quiet) make_dir(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)
copy_file(os.path.join(build_dir, lib_dir_name, 'libcef.so'), dst_dir, options.quiet) copy_file(libcef_path, dst_dir, options.quiet)
copy_file(os.path.join(build_dir, 'natives_blob.bin'), dst_dir, options.quiet) copy_file(os.path.join(build_dir, 'natives_blob.bin'), dst_dir, options.quiet)
copy_file(os.path.join(build_dir, 'snapshot_blob.bin'), dst_dir, options.quiet) copy_file(os.path.join(build_dir, 'snapshot_blob.bin'), dst_dir, options.quiet)
else: else:
@ -639,7 +640,8 @@ elif platform == 'linux':
# transfer Release files # transfer Release files
build_dir = os.path.join(out_dir, 'Release'); build_dir = os.path.join(out_dir, 'Release');
if not options.allowpartial or path_exists(os.path.join(build_dir, 'cefclient')): libcef_path = os.path.join(build_dir, lib_dir_name, 'libcef.so')
if not options.allowpartial or path_exists(libcef_path):
valid_build_dir = build_dir valid_build_dir = build_dir
dst_dir = os.path.join(output_dir, 'Release') dst_dir = os.path.join(output_dir, 'Release')
make_dir(dst_dir, options.quiet) make_dir(dst_dir, options.quiet)
@ -647,10 +649,10 @@ elif platform == 'linux':
if mode == 'client': if mode == 'client':
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(os.path.join(build_dir, lib_dir_name, 'libcef.so'), 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, 'cefclient'), dst_dir, options.quiet)
else: else:
copy_file(os.path.join(build_dir, lib_dir_name, 'libcef.so'), 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)
copy_file(os.path.join(build_dir, 'natives_blob.bin'), dst_dir, options.quiet) copy_file(os.path.join(build_dir, 'natives_blob.bin'), dst_dir, options.quiet)
copy_file(os.path.join(build_dir, 'snapshot_blob.bin'), dst_dir, options.quiet) copy_file(os.path.join(build_dir, 'snapshot_blob.bin'), dst_dir, options.quiet)