From 84fe790035ff8ec2ceb280174b2e5751c9b3401e Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 31 Mar 2016 15:30:19 +0200 Subject: [PATCH] make_distrib.py: Look for libcef instead of cefclient when running with --allow-partial (issue #1804) --- tools/make_distrib.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/make_distrib.py b/tools/make_distrib.py index ce5deed3f..486ded505 100644 --- a/tools/make_distrib.py +++ b/tools/make_distrib.py @@ -456,7 +456,7 @@ if platform == 'windows': if mode == 'standard': # transfer Debug files 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 dst_dir = os.path.join(output_dir, 'Debug') make_dir(dst_dir, options.quiet) @@ -477,7 +477,7 @@ if platform == 'windows': # transfer Release files 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 dst_dir = os.path.join(output_dir, 'Release') make_dir(dst_dir, options.quiet) @@ -626,12 +626,13 @@ elif platform == 'linux': if mode == 'standard': # transfer Debug files 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 dst_dir = os.path.join(output_dir, 'Debug') 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, 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, 'snapshot_blob.bin'), dst_dir, options.quiet) else: @@ -639,7 +640,8 @@ elif platform == 'linux': # transfer Release files 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 dst_dir = os.path.join(output_dir, 'Release') make_dir(dst_dir, options.quiet) @@ -647,10 +649,10 @@ elif platform == 'linux': if mode == 'client': lib_dst_dir = os.path.join(dst_dir, lib_dir_name) 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) 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, 'natives_blob.bin'), dst_dir, options.quiet) copy_file(os.path.join(build_dir, 'snapshot_blob.bin'), dst_dir, options.quiet)