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

Linux: Fix copying of libcef.so in make_distrib.py (issue #1403)

This commit is contained in:
Marshall Greenblatt 2016-08-25 16:20:47 +03:00
parent 1dac96f3e2
commit 67bb846748
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/make_distrib.py
View File

@ -717,7 +717,10 @@ elif platform == 'linux':
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') if use_gn:
libcef_path = os.path.join(build_dir, 'libcef.so')
else:
libcef_path = os.path.join(build_dir, lib_dir_name, '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')
@ -731,15 +734,21 @@ 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') if use_gn:
libcef_path = os.path.join(build_dir, 'libcef.so')
else:
libcef_path = os.path.join(build_dir, lib_dir_name, '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) if use_gn:
make_dir(lib_dst_dir, options.quiet) lib_dst_dir = dst_dir
else:
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(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: else: