From 0255e4c741dc104407cff8cbf458448cbace1537 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Fri, 30 Jan 2015 20:22:46 +0000 Subject: [PATCH] cefclient: Rename the res/ folder to resources/ (issue #1500). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@2011 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- cef.gyp | 6 ++-- cef_paths2.gypi | 26 +++++++++--------- tests/cefclient/CMakeLists.txt.in | 4 +-- tests/cefclient/cefclient.rc | 26 +++++++++--------- .../cefclient/{res => resources}/binding.html | 0 .../{res => resources}/cefclient.ico | Bin .../cefclient/{res => resources}/dialogs.html | 0 .../{res => resources}/localstorage.html | 0 tests/cefclient/{res => resources}/logo.png | Bin .../{res => resources}/osr_test.html | 0 .../{res => resources}/other_tests.html | 0 .../{res => resources}/performance.html | 0 .../{res => resources}/performance2.html | 0 tests/cefclient/{res => resources}/small.ico | Bin .../{res => resources}/transparency.html | 0 .../cefclient/{res => resources}/window.html | 0 .../{res => resources}/xmlhttprequest.html | 0 17 files changed, 31 insertions(+), 31 deletions(-) rename tests/cefclient/{res => resources}/binding.html (100%) rename tests/cefclient/{res => resources}/cefclient.ico (100%) rename tests/cefclient/{res => resources}/dialogs.html (100%) rename tests/cefclient/{res => resources}/localstorage.html (100%) rename tests/cefclient/{res => resources}/logo.png (100%) rename tests/cefclient/{res => resources}/osr_test.html (100%) rename tests/cefclient/{res => resources}/other_tests.html (100%) rename tests/cefclient/{res => resources}/performance.html (100%) rename tests/cefclient/{res => resources}/performance2.html (100%) rename tests/cefclient/{res => resources}/small.ico (100%) rename tests/cefclient/{res => resources}/transparency.html (100%) rename tests/cefclient/{res => resources}/window.html (100%) rename tests/cefclient/{res => resources}/xmlhttprequest.html (100%) diff --git a/cef.gyp b/cef.gyp index 6c450d3a8..5c7825753 100644 --- a/cef.gyp +++ b/cef.gyp @@ -402,7 +402,7 @@ 'tests/cefclient/client_switches.cc', 'tests/cefclient/client_switches.h', 'tests/cefclient/resource_util.h', - 'tests/cefclient/res/osr_test.html', + 'tests/cefclient/resources/osr_test.html', 'tests/unittests/browser_info_map_unittest.cc', 'tests/unittests/command_line_unittest.cc', 'tests/unittests/cookie_unittest.cc', @@ -447,7 +447,7 @@ 'tests/unittests/zip_reader_unittest.cc', ], 'mac_bundle_resources': [ - 'tests/cefclient/res/osr_test.html', + 'tests/cefclient/resources/osr_test.html', 'tests/unittests/mac/unittests.icns', 'tests/unittests/mac/English.lproj/InfoPlist.strings', 'tests/unittests/mac/English.lproj/MainMenu.xib', @@ -586,7 +586,7 @@ { 'destination': '<(PRODUCT_DIR)/files', 'files': [ - 'tests/cefclient/res/osr_test.html', + 'tests/cefclient/resources/osr_test.html', ], }, ], diff --git a/cef_paths2.gypi b/cef_paths2.gypi index 7f34a6c7a..cb94bfb83 100644 --- a/cef_paths2.gypi +++ b/cef_paths2.gypi @@ -134,17 +134,17 @@ '<@(autogen_client_side)', ], 'cefclient_bundle_resources_common': [ - 'tests/cefclient/res/binding.html', - 'tests/cefclient/res/dialogs.html', - 'tests/cefclient/res/localstorage.html', - 'tests/cefclient/res/logo.png', - 'tests/cefclient/res/osr_test.html', - 'tests/cefclient/res/other_tests.html', - 'tests/cefclient/res/performance.html', - 'tests/cefclient/res/performance2.html', - 'tests/cefclient/res/transparency.html', - 'tests/cefclient/res/window.html', - 'tests/cefclient/res/xmlhttprequest.html', + 'tests/cefclient/resources/binding.html', + 'tests/cefclient/resources/dialogs.html', + 'tests/cefclient/resources/localstorage.html', + 'tests/cefclient/resources/logo.png', + 'tests/cefclient/resources/osr_test.html', + 'tests/cefclient/resources/other_tests.html', + 'tests/cefclient/resources/performance.html', + 'tests/cefclient/resources/performance2.html', + 'tests/cefclient/resources/transparency.html', + 'tests/cefclient/resources/window.html', + 'tests/cefclient/resources/xmlhttprequest.html', ], 'cefclient_sources_common': [ 'tests/cefclient/binding_test.cc', @@ -215,8 +215,8 @@ 'tests/cefclient/osr_window_win.cc', 'tests/cefclient/osr_window_win.h', 'tests/cefclient/resource.h', - 'tests/cefclient/res/cefclient.ico', - 'tests/cefclient/res/small.ico', + 'tests/cefclient/resources/cefclient.ico', + 'tests/cefclient/resources/small.ico', 'tests/cefclient/resource_util_win.cc', 'tests/cefclient/root_window_win.cc', 'tests/cefclient/root_window_win.h', diff --git a/tests/cefclient/CMakeLists.txt.in b/tests/cefclient/CMakeLists.txt.in index 382164db3..2ee65b54e 100644 --- a/tests/cefclient/CMakeLists.txt.in +++ b/tests/cefclient/CMakeLists.txt.in @@ -80,7 +80,7 @@ if(OS_LINUX) # Copy cefclient resource files to the target output directory. COPY_FILES("${CEF_TARGET}" "${CEFCLIENT_RESOURCES_SRCS}" "${CMAKE_CURRENT_SOURCE_DIR}" "${CEF_TARGET_OUT_DIR}") # Rename the "res" directory to "files". - RENAME_DIRECTORY("${CEF_TARGET}" "${CEF_TARGET_OUT_DIR}/res" "${CEF_TARGET_OUT_DIR}/files") + RENAME_DIRECTORY("${CEF_TARGET}" "${CEF_TARGET_OUT_DIR}/resources" "${CEF_TARGET_OUT_DIR}/files") # Set SUID permissions on the chrome-sandbox target. SET_LINUX_SUID_PERMISSIONS("${CEF_TARGET}" "${CEF_TARGET_OUT_DIR}/chrome-sandbox") @@ -143,7 +143,7 @@ if(OS_MACOSX) if(NOT ${CMAKE_GENERATOR} STREQUAL "Xcode") # Manually process and copy over resource files. # The Xcode generator handles this via the set_target_properties RESOURCE directive. - set(PREFIXES "mac/" "res/") # Remove these prefixes from input file paths. + set(PREFIXES "mac/" "resources/") # Remove these prefixes from input file paths. COPY_MACOSX_RESOURCES("${CEFCLIENT_RESOURCES_SRCS}" "${PREFIXES}" "${CEF_TARGET}" "${CMAKE_CURRENT_SOURCE_DIR}" "${CEF_APP}") endif() endif() diff --git a/tests/cefclient/cefclient.rc b/tests/cefclient/cefclient.rc index 6dc96f3d3..b21dc59fe 100644 --- a/tests/cefclient/cefclient.rc +++ b/tests/cefclient/cefclient.rc @@ -28,17 +28,17 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Binary // -IDS_BINDING BINARY "res\\binding.html" -IDS_DIALOGS BINARY "res\\dialogs.html" -IDS_LOCALSTORAGE BINARY "res\\localstorage.html" -IDS_LOGO BINARY "res\\logo.png" -IDS_OSRTEST BINARY "res\\osr_test.html" -IDS_OTHER_TESTS BINARY "res\\other_tests.html" -IDS_PERFORMANCE BINARY "res\\performance.html" -IDS_PERFORMANCE2 BINARY "res\\performance2.html" -IDS_TRANSPARENCY BINARY "res\\transparency.html" -IDS_WINDOW BINARY "res\\window.html" -IDS_XMLHTTPREQUEST BINARY "res\\xmlhttprequest.html" +IDS_BINDING BINARY "resources\\binding.html" +IDS_DIALOGS BINARY "resources\\dialogs.html" +IDS_LOCALSTORAGE BINARY "resources\\localstorage.html" +IDS_LOGO BINARY "resources\\logo.png" +IDS_OSRTEST BINARY "resources\\osr_test.html" +IDS_OTHER_TESTS BINARY "resources\\other_tests.html" +IDS_PERFORMANCE BINARY "resources\\performance.html" +IDS_PERFORMANCE2 BINARY "resources\\performance2.html" +IDS_TRANSPARENCY BINARY "resources\\transparency.html" +IDS_WINDOW BINARY "resources\\window.html" +IDS_XMLHTTPREQUEST BINARY "resources\\xmlhttprequest.html" ///////////////////////////////////////////////////////////////////////////// // @@ -47,8 +47,8 @@ IDS_XMLHTTPREQUEST BINARY "res\\xmlhttprequest.html" // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_CEFCLIENT ICON "res\cefclient.ico" -IDI_SMALL ICON "res\small.ico" +IDI_CEFCLIENT ICON "resources\cefclient.ico" +IDI_SMALL ICON "resources\small.ico" ///////////////////////////////////////////////////////////////////////////// // diff --git a/tests/cefclient/res/binding.html b/tests/cefclient/resources/binding.html similarity index 100% rename from tests/cefclient/res/binding.html rename to tests/cefclient/resources/binding.html diff --git a/tests/cefclient/res/cefclient.ico b/tests/cefclient/resources/cefclient.ico similarity index 100% rename from tests/cefclient/res/cefclient.ico rename to tests/cefclient/resources/cefclient.ico diff --git a/tests/cefclient/res/dialogs.html b/tests/cefclient/resources/dialogs.html similarity index 100% rename from tests/cefclient/res/dialogs.html rename to tests/cefclient/resources/dialogs.html diff --git a/tests/cefclient/res/localstorage.html b/tests/cefclient/resources/localstorage.html similarity index 100% rename from tests/cefclient/res/localstorage.html rename to tests/cefclient/resources/localstorage.html diff --git a/tests/cefclient/res/logo.png b/tests/cefclient/resources/logo.png similarity index 100% rename from tests/cefclient/res/logo.png rename to tests/cefclient/resources/logo.png diff --git a/tests/cefclient/res/osr_test.html b/tests/cefclient/resources/osr_test.html similarity index 100% rename from tests/cefclient/res/osr_test.html rename to tests/cefclient/resources/osr_test.html diff --git a/tests/cefclient/res/other_tests.html b/tests/cefclient/resources/other_tests.html similarity index 100% rename from tests/cefclient/res/other_tests.html rename to tests/cefclient/resources/other_tests.html diff --git a/tests/cefclient/res/performance.html b/tests/cefclient/resources/performance.html similarity index 100% rename from tests/cefclient/res/performance.html rename to tests/cefclient/resources/performance.html diff --git a/tests/cefclient/res/performance2.html b/tests/cefclient/resources/performance2.html similarity index 100% rename from tests/cefclient/res/performance2.html rename to tests/cefclient/resources/performance2.html diff --git a/tests/cefclient/res/small.ico b/tests/cefclient/resources/small.ico similarity index 100% rename from tests/cefclient/res/small.ico rename to tests/cefclient/resources/small.ico diff --git a/tests/cefclient/res/transparency.html b/tests/cefclient/resources/transparency.html similarity index 100% rename from tests/cefclient/res/transparency.html rename to tests/cefclient/resources/transparency.html diff --git a/tests/cefclient/res/window.html b/tests/cefclient/resources/window.html similarity index 100% rename from tests/cefclient/res/window.html rename to tests/cefclient/resources/window.html diff --git a/tests/cefclient/res/xmlhttprequest.html b/tests/cefclient/resources/xmlhttprequest.html similarity index 100% rename from tests/cefclient/res/xmlhttprequest.html rename to tests/cefclient/resources/xmlhttprequest.html