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: Fix copying of libcef.so in make_distrib.py (issue #1403)

Browse Source
This commit is contained in:
Marshall Greenblatt 2016-08-25 06:12:45 -07:00
parent 5288dc5414
commit c006dc7f0f
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/make_distrib.py
View File

@ -680,14 +680,12 @@ elif platform == 'macosx':
options.quiet) options.quiet)
elif platform == 'linux': elif platform == 'linux':
lib_dir_name = 'lib'
valid_build_dir = None valid_build_dir = None
if mode == 'standard': if mode == 'standard':
# transfer Debug files # transfer Debug files
build_dir = build_dir_debug build_dir = build_dir_debug
libcef_path = os.path.join(build_dir, lib_dir_name, 'libcef.so') libcef_path = os.path.join(build_dir, 'libcef.so')
if not options.allowpartial or path_exists(libcef_path): 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')
@ -701,19 +699,15 @@ elif platform == 'linux':
# transfer Release files # transfer Release files
build_dir = build_dir_release build_dir = build_dir_release
libcef_path = os.path.join(build_dir, lib_dir_name, 'libcef.so') libcef_path = os.path.join(build_dir, 'libcef.so')
if not options.allowpartial or path_exists(libcef_path): 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)
if mode == 'client': if mode == 'client':
lib_dst_dir = os.path.join(dst_dir, lib_dir_name)
make_dir(lib_dst_dir, options.quiet)
copy_file(libcef_path, lib_dst_dir, options.quiet)
copy_file(os.path.join(build_dir, 'cefsimple'), dst_dir, options.quiet) copy_file(os.path.join(build_dir, 'cefsimple'), dst_dir, options.quiet)
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)
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)