From a8c7a1a8ca3a2ec6468f4966f8dcc38f143cafa2 Mon Sep 17 00:00:00 2001 From: "grt@chromium.org" Date: Tue, 13 Nov 2012 14:34:48 +0000 Subject: Proper version resources for delegate_execute.exe and metro_driver.dll. BUG=160332 Review URL: https://chromiumcodereview.appspot.com/11275261 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167383 0039d316-1c4b-4281-b951-d872f2087c98 --- win8/delegate_execute/delegate_execute.gyp | 28 ++++++++++++++++ win8/delegate_execute/delegate_execute.rc | 46 -------------------------- win8/delegate_execute/delegate_execute_exe.ver | 2 ++ win8/metro_driver/metro_driver.gyp | 28 ++++++++++++++++ win8/metro_driver/metro_driver_dll.ver | 2 ++ 5 files changed, 60 insertions(+), 46 deletions(-) create mode 100644 win8/delegate_execute/delegate_execute_exe.ver create mode 100644 win8/metro_driver/metro_driver_dll.ver (limited to 'win8') diff --git a/win8/delegate_execute/delegate_execute.gyp b/win8/delegate_execute/delegate_execute.gyp index 4a03a64..eead4b6 100644 --- a/win8/delegate_execute/delegate_execute.gyp +++ b/win8/delegate_execute/delegate_execute.gyp @@ -7,9 +7,35 @@ }, 'includes': [ '../../build/win_precompile.gypi', + '../../chrome/version.gypi', ], 'targets': [ { + 'target_name': 'delegate_execute_version_resources', + 'type': 'none', + 'conditions': [ + ['branding == "Chrome"', { + 'variables': { + 'branding_path': '../../chrome/app/theme/google_chrome/BRANDING', + }, + }, { # else branding!="Chrome" + 'variables': { + 'branding_path': '../../chrome/app/theme/chromium/BRANDING', + }, + }], + ], + 'variables': { + 'output_dir': 'delegate_execute', + 'template_input_path': '../../chrome/app/chrome_version.rc.version', + }, + 'sources': [ + 'delegate_execute_exe.ver', + ], + 'includes': [ + '../../chrome/version_resource_rules.gypi', + ], + }, + { 'target_name': 'delegate_execute', 'type': 'executable', 'dependencies': [ @@ -18,6 +44,7 @@ '../../google_update/google_update.gyp:google_update', '../../ui/ui.gyp:ui', '../../win8/win8.gyp:check_sdk_patch', + 'delegate_execute_version_resources', ], 'sources': [ 'chrome_util.cc', @@ -33,6 +60,7 @@ 'delegate_execute_util.cc', 'delegate_execute_util.h', 'resource.h', + '<(SHARED_INTERMEDIATE_DIR)/delegate_execute/delegate_execute_exe_version.rc', ], 'msvs_settings': { 'VCLinkerTool': { diff --git a/win8/delegate_execute/delegate_execute.rc b/win8/delegate_execute/delegate_execute.rc index 0bf1343..78e8b19 100644 --- a/win8/delegate_execute/delegate_execute.rc +++ b/win8/delegate_execute/delegate_execute.rc @@ -37,54 +37,8 @@ BEGIN "\0" END -3 TEXTINCLUDE -BEGIN - "1 TYPELIB ""delegate_execute.tlb""\r\n" - "\0" -END - #endif // APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904B0" - BEGIN - VALUE "CompanyName", "TODO: " - VALUE "FileDescription", "TODO: " - VALUE "FileVersion", "1.0.0.1" - VALUE "LegalCopyright", "TODO: (c) . All rights reserved." - VALUE "InternalName", "DelegateExecute.exe" - VALUE "OriginalFilename", "DelegateExecute.exe" - VALUE "ProductName", "TODO: " - VALUE "ProductVersion", "1.0.0.1" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - - ///////////////////////////////////////////////////////////////////////////// // // REGISTRY diff --git a/win8/delegate_execute/delegate_execute_exe.ver b/win8/delegate_execute/delegate_execute_exe.ver new file mode 100644 index 0000000..fb7fb12 --- /dev/null +++ b/win8/delegate_execute/delegate_execute_exe.ver @@ -0,0 +1,2 @@ +INTERNAL_NAME=delegate_execute_exe +ORIGINAL_FILENAME=delegate_execute.exe diff --git a/win8/metro_driver/metro_driver.gyp b/win8/metro_driver/metro_driver.gyp index 3379f07..191c8d2 100644 --- a/win8/metro_driver/metro_driver.gyp +++ b/win8/metro_driver/metro_driver.gyp @@ -9,6 +9,7 @@ }, 'includes': [ '../../build/win_precompile.gypi', + '../../chrome/version.gypi', ], 'target_defaults': { 'msvs_settings': { @@ -22,6 +23,31 @@ }, 'targets': [ { + 'target_name': 'metro_driver_version_resources', + 'type': 'none', + 'conditions': [ + ['branding == "Chrome"', { + 'variables': { + 'branding_path': '../../chrome/app/theme/google_chrome/BRANDING', + }, + }, { # else branding!="Chrome" + 'variables': { + 'branding_path': '../../chrome/app/theme/chromium/BRANDING', + }, + }], + ], + 'variables': { + 'output_dir': 'metro_driver', + 'template_input_path': '../../chrome/app/chrome_version.rc.version', + }, + 'sources': [ + 'metro_driver_dll.ver', + ], + 'includes': [ + '../../chrome/version_resource_rules.gypi', + ], + }, + { 'target_name': 'metro_driver', 'type': 'shared_library', 'dependencies': [ @@ -33,6 +59,7 @@ '../../sandbox/sandbox.gyp:sandbox', '../../ui/metro_viewer/metro_viewer.gyp:metro_viewer', '../win8.gyp:check_sdk_patch', + 'metro_driver_version_resources', ], 'sources': [ 'metro_driver.cc', @@ -40,6 +67,7 @@ 'stdafx.h', 'winrt_utils.cc', 'winrt_utils.h', + '<(SHARED_INTERMEDIATE_DIR)/metro_driver/metro_driver_dll_version.rc', ], 'conditions': [ ['use_aura==1', { diff --git a/win8/metro_driver/metro_driver_dll.ver b/win8/metro_driver/metro_driver_dll.ver new file mode 100644 index 0000000..72d1cc8 --- /dev/null +++ b/win8/metro_driver/metro_driver_dll.ver @@ -0,0 +1,2 @@ +INTERNAL_NAME=metro_driver_dll +ORIGINAL_FILENAME=metro_driver.dll -- cgit v1.1