From 52c24ed0613365aba15288ac7bb96049b010b46e Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 1 Oct 2019 12:17:34 +0300 Subject: [PATCH] Windows: Restore missing resources to binary distribution (fixes issue #2771) --- cef_paths2.gypi | 15 +++++++++++++++ tools/make_distrib.py | 6 ++++++ 2 files changed, 21 insertions(+) diff --git a/cef_paths2.gypi b/cef_paths2.gypi index f9c1b5081..e8016cb82 100644 --- a/cef_paths2.gypi +++ b/cef_paths2.gypi @@ -354,6 +354,11 @@ 'tests/cefclient/cefclient_win.cc', 'tests/cefclient/resources/win/cefclient.rc', ], + 'cefclient_sources_resources_win': [ + 'tests/cefclient/resources/win/cefclient.exe.manifest', + 'tests/cefclient/resources/win/cefclient.ico', + 'tests/cefclient/resources/win/small.ico', + ], 'cefclient_sources_mac': [ 'tests/cefclient/browser/browser_window_osr_mac.h', 'tests/cefclient/browser/browser_window_osr_mac.mm', @@ -426,6 +431,11 @@ 'tests/cefsimple/simple_handler_win.cc', 'tests/cefsimple/resource.h', ], + 'cefsimple_sources_resources_win': [ + 'tests/cefsimple/cefsimple.exe.manifest', + 'tests/cefsimple/res/cefsimple.ico', + 'tests/cefsimple/res/small.ico', + ], 'cefsimple_sources_mac': [ 'tests/cefsimple/cefsimple_mac.mm', 'tests/cefsimple/simple_handler_mac.mm', @@ -526,6 +536,11 @@ 'tests/ceftests/resource_util_win_idmap.cc', 'tests/ceftests/resources/win/ceftests.rc', ], + 'ceftests_sources_resources_win': [ + 'tests/ceftests/resources/win/ceftests.exe.manifest', + 'tests/ceftests/resources/win/ceftests.ico', + 'tests/ceftests/resources/win/small.ico', + ], 'ceftests_sources_mac': [ 'tests/ceftests/os_rendering_unittest_mac.h', 'tests/ceftests/os_rendering_unittest_mac.mm', diff --git a/tools/make_distrib.py b/tools/make_distrib.py index f4154dbc9..265832ebd 100644 --- a/tools/make_distrib.py +++ b/tools/make_distrib.py @@ -941,14 +941,20 @@ if platform == 'windows': # transfer cefclient files transfer_gypi_files(cef_dir, cef_paths2['cefclient_sources_win'], \ 'tests/cefclient/', cefclient_dir, options.quiet) + transfer_gypi_files(cef_dir, cef_paths2['cefclient_sources_resources_win'], \ + 'tests/cefclient/', cefclient_dir, options.quiet) # transfer cefsimple files transfer_gypi_files(cef_dir, cef_paths2['cefsimple_sources_win'], \ 'tests/cefsimple/', cefsimple_dir, options.quiet) + transfer_gypi_files(cef_dir, cef_paths2['cefsimple_sources_resources_win'], \ + 'tests/cefsimple/', cefsimple_dir, options.quiet) # transfer ceftests files transfer_gypi_files(cef_dir, cef_paths2['ceftests_sources_win'], \ 'tests/ceftests/', ceftests_dir, options.quiet) + transfer_gypi_files(cef_dir, cef_paths2['ceftests_sources_resources_win'], \ + 'tests/ceftests/', ceftests_dir, options.quiet) transfer_gypi_files(cef_dir, cef_paths2['ceftests_sources_views'], \ 'tests/ceftests/', ceftests_dir, options.quiet)