summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/app/chrome_dll.ver2
-rw-r--r--chrome/app/chrome_exe.rc41
-rw-r--r--chrome/app/chrome_exe.ver2
-rw-r--r--chrome/app/chrome_exe_version.rc.version40
-rw-r--r--chrome/app/chrome_version.rc.version (renamed from chrome/app/chrome_dll_version.rc.version)6
-rw-r--r--chrome/app/nacl64_dll.ver2
-rw-r--r--chrome/app/nacl64_exe.ver2
-rw-r--r--chrome/app/other.ver2
-rw-r--r--chrome/chrome.gyp21
-rw-r--r--chrome/chrome_dll.gypi10
-rw-r--r--chrome/chrome_exe.gypi51
-rw-r--r--chrome/chrome_tests.gypi34
-rw-r--r--chrome_frame/chrome_frame.gyp4
13 files changed, 62 insertions, 155 deletions
diff --git a/chrome/app/chrome_dll.ver b/chrome/app/chrome_dll.ver
new file mode 100644
index 0000000..910fca2
--- /dev/null
+++ b/chrome/app/chrome_dll.ver
@@ -0,0 +1,2 @@
+INTERNAL_NAME=chrome_dll
+ORIGINAL_FILENAME=chrome.dll
diff --git a/chrome/app/chrome_exe.rc b/chrome/app/chrome_exe.rc
index da84c04..0a8ca06 100644
--- a/chrome/app/chrome_exe.rc
+++ b/chrome/app/chrome_exe.rc
@@ -24,36 +24,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#endif //_WIN32
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "chrome_exe_resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
- "#include ""windows.h""\r\n"
- "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#else // APSTUDIO_INVOKED
-#include "chrome_exe_version.rc"
-#endif // APSTUDIO_INVOKED
-
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
@@ -77,14 +47,3 @@ IDR_MAINFRAME ICON "theme\chromium\chromium.ico"
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
diff --git a/chrome/app/chrome_exe.ver b/chrome/app/chrome_exe.ver
new file mode 100644
index 0000000..a2d3901
--- /dev/null
+++ b/chrome/app/chrome_exe.ver
@@ -0,0 +1,2 @@
+INTERNAL_NAME=chrome_exe
+ORIGINAL_FILENAME=chrome.exe
diff --git a/chrome/app/chrome_exe_version.rc.version b/chrome/app/chrome_exe_version.rc.version
deleted file mode 100644
index d7704ce..0000000
--- a/chrome/app/chrome_exe_version.rc.version
+++ /dev/null
@@ -1,40 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,0,0,0
- PRODUCTVERSION 0,0,0,0
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "@COMPANY_FULLNAME@"
- VALUE "FileDescription", "@PRODUCT_FULLNAME@"
- VALUE "FileVersion", "0.0.0.0"
- VALUE "InternalName", "chrome_exe"
- VALUE "LegalCopyright", "@COPYRIGHT@"
- VALUE "OriginalFilename", "chrome.exe"
- VALUE "ProductName", "@PRODUCT_FULLNAME@"
- VALUE "ProductVersion", "0.0.0.0"
- VALUE "CompanyShortName", "@COMPANY_SHORTNAME@"
- VALUE "ProductShortName", "@PRODUCT_SHORTNAME@"
- VALUE "Official Build", "@OFFICIAL_BUILD@"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
diff --git a/chrome/app/chrome_dll_version.rc.version b/chrome/app/chrome_version.rc.version
index df37d51..0ec74bd 100644
--- a/chrome/app/chrome_dll_version.rc.version
+++ b/chrome/app/chrome_version.rc.version
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -29,9 +29,9 @@ BEGIN
VALUE "CompanyName", "@COMPANY_FULLNAME@"
VALUE "FileDescription", "@PRODUCT_FULLNAME@"
VALUE "FileVersion", "@MAJOR@.@MINOR@.@BUILD@.@PATCH@"
- VALUE "InternalName", "chrome_dll"
+ VALUE "InternalName", "@INTERNAL_NAME@"
VALUE "LegalCopyright", "@COPYRIGHT@"
- VALUE "OriginalFilename", "chrome.dll"
+ VALUE "OriginalFilename", "@ORIGINAL_FILENAME@"
VALUE "ProductName", "@PRODUCT_FULLNAME@"
VALUE "ProductVersion", "@MAJOR@.@MINOR@.@BUILD@.@PATCH@"
VALUE "CompanyShortName", "@COMPANY_SHORTNAME@"
diff --git a/chrome/app/nacl64_dll.ver b/chrome/app/nacl64_dll.ver
new file mode 100644
index 0000000..998c4a2
--- /dev/null
+++ b/chrome/app/nacl64_dll.ver
@@ -0,0 +1,2 @@
+INTERNAL_NAME=nacl64_dll
+ORIGINAL_FILENAME=nacl64.dll
diff --git a/chrome/app/nacl64_exe.ver b/chrome/app/nacl64_exe.ver
new file mode 100644
index 0000000..1e6d83c
--- /dev/null
+++ b/chrome/app/nacl64_exe.ver
@@ -0,0 +1,2 @@
+INTERNAL_NAME=nacl64_exe
+ORIGINAL_FILENAME=nacl64.exe
diff --git a/chrome/app/other.ver b/chrome/app/other.ver
new file mode 100644
index 0000000..0d7391b6
--- /dev/null
+++ b/chrome/app/other.ver
@@ -0,0 +1,2 @@
+INTERNAL_NAME=other_test_file
+ORIGINAL_FILENAME=other_test_file
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index df4d661..eaf8c7a 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1425,23 +1425,31 @@
],
},
{
- 'target_name': 'chrome_dll_version',
+ 'target_name': 'chrome_version_resources',
'type': 'none',
'dependencies': [
'../build/util/build_util.gyp:lastchange',
],
'direct_dependent_settings': {
'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_version',
],
},
- 'actions': [
+ 'sources': [
+ 'app/chrome_exe.ver',
+ 'app/chrome_dll.ver',
+ 'app/nacl64_exe.ver',
+ 'app/nacl64_dll.ver',
+ 'app/other.ver',
+ ],
+ 'rules': [
{
- 'action_name': 'version',
+ 'rule_name': 'version',
+ 'extension': 'ver',
'variables': {
'lastchange_path':
'<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
- 'template_input_path': 'app/chrome_dll_version.rc.version',
+ 'template_input_path': 'app/chrome_version.rc.version',
},
'conditions': [
[ 'branding == "Chrome"', {
@@ -1461,11 +1469,12 @@
'<(lastchange_path)',
],
'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/<(RULE_INPUT_ROOT)_version.rc',
],
'action': [
'python',
'<(version_py_path)',
+ '-f', '<(RULE_INPUT_PATH)',
'-f', '<(version_path)',
'-f', '<(branding_path)',
'-f', '<(lastchange_path)',
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 01aed75..3c234ca 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -78,7 +78,7 @@
'dependencies': [
# On Windows, link the dependencies (libraries) that make
# up actual Chromium functionality into this .dll.
- 'chrome_dll_version',
+ 'chrome_version_resources',
'chrome_resources',
'installer_util_strings',
'../content/content.gyp:content_worker',
@@ -95,7 +95,8 @@
'app/chrome_dll_resource.h',
'app/chrome_main.cc',
'app/chrome_main_win.cc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
+
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc',
'../webkit/glue/resources/aliasb.cur',
'../webkit/glue/resources/cell.cur',
@@ -587,7 +588,7 @@
],
'dependencies': [
'<@(nacl_win64_dependencies)',
- 'chrome_dll_version',
+ 'chrome_version_resources',
'nacl_win64',
'../base/base.gyp:base_i18n_nacl_win64',
],
@@ -604,7 +605,8 @@
'browser/policy/policy_path_parser_win.cc',
'browser/renderer_host/render_process_host_dummy.cc',
'common/googleurl_dummy.cc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
+
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/nacl64_dll_version.rc',
# TODO: It would be nice to have these pulled in
# automatically from direct_dependent_settings in
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 84810ee..8f0a481 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -45,13 +45,6 @@
},
'conditions': [
['OS=="win"', {
- 'sources': [
- 'app/chrome_exe.rc',
- 'app/chrome_exe_version.rc.version',
- ],
- 'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)/chrome',
- ],
# TODO(scottbyer): This is a temporary workaround. The right fix
# is to change the output file to be in $(IntDir) for this project
# and the .dll project and use the hardlink script to link it back
@@ -83,41 +76,6 @@
},
'actions': [
{
- 'action_name': 'version',
- 'variables': {
- 'template_input_path': 'app/chrome_exe_version.rc.version',
- },
- 'conditions': [
- [ 'branding == "Chrome"', {
- 'variables': {
- 'branding_path': 'app/theme/google_chrome/BRANDING',
- },
- }, { # else branding!="Chrome"
- 'variables': {
- 'branding_path': 'app/theme/chromium/BRANDING',
- },
- }],
- ],
- 'inputs': [
- '<(template_input_path)',
- '<(version_path)',
- '<(branding_path)',
- ],
- 'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_exe_version.rc',
- ],
- 'action': [
- 'python',
- '<(version_py_path)',
- '-f', '<(version_path)',
- '-f', '<(branding_path)',
- '<(template_input_path)',
- '<@(_outputs)',
- ],
- 'process_outputs_as_sources': 1,
- 'message': 'Generating version information in <(_outputs)'
- },
- {
'action_name': 'first_run',
'inputs': [
'app/FirstRun',
@@ -465,6 +423,7 @@
}],
['OS=="win"', {
'dependencies': [
+ 'chrome_version_resources',
'installer_util',
'installer_util_strings',
'../base/base.gyp:base',
@@ -474,6 +433,10 @@
'app/locales/locales.gyp:*',
'app/policy/cloud_policy_codegen.gyp:policy',
],
+ 'sources': [
+ 'app/chrome_exe.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc',
+ ],
'msvs_settings': {
'VCLinkerTool': {
'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib',
@@ -498,6 +461,7 @@
# On Windows make sure we've built Win64 version of chrome_dll,
# which contains all of the library code with Chromium
# functionality.
+ 'chrome_version_resources',
'chrome_dll_nacl_win64',
'common_constants_win64',
'installer_util_nacl_win64',
@@ -514,6 +478,9 @@
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)/chrome',
],
+ 'sources': [
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/nacl64_exe_version.rc',
+ ],
'msvs_settings': {
'VCLinkerTool': {
'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 252c417..b50013c 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -565,7 +565,7 @@
'../third_party/wtl/include',
],
'dependencies': [
- 'chrome.gyp:chrome_dll_version',
+ 'chrome.gyp:chrome_version_resources',
'chrome.gyp:installer_util_strings',
'../sandbox/sandbox.gyp:sandbox',
'../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
@@ -597,7 +597,7 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
@@ -2229,7 +2229,7 @@
}],
['OS=="win"', {
'dependencies': [
- 'chrome_dll_version',
+ 'chrome_version_resources',
'installer_util_strings',
'../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
'../third_party/isimpledom/isimpledom.gyp:isimpledom',
@@ -2256,7 +2256,7 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
@@ -2367,7 +2367,7 @@
'app/chrome_command_ids.h',
'app/chrome_dll.rc',
'app/chrome_dll_resource.h',
- 'app/chrome_dll_version.rc.version',
+ 'app/chrome_version.rc.version',
'browser/accessibility/renderer_accessibility_browsertest.cc',
'browser/autocomplete/autocomplete_browsertest.cc',
'browser/autofill/form_structure_browsertest.cc',
@@ -2679,7 +2679,7 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
@@ -2691,7 +2691,7 @@
'<(DEPTH)/third_party/wtl/include',
],
'dependencies': [
- 'chrome_dll_version',
+ 'chrome_version_resources',
'installer_util_strings',
'../sandbox/sandbox.gyp:sandbox',
],
@@ -2716,7 +2716,7 @@
'app/chrome_command_ids.h',
'app/chrome_dll.rc',
'app/chrome_dll_resource.h',
- 'app/chrome_dll_version.rc.version',
+ 'app/chrome_version.rc.version',
'browser/extensions/extension_rlz_apitest.cc',
# http://crbug.com/15101 These tests fail on Linux and Mac.
'browser/renderer_host/web_cache_manager_browsertest.cc',
@@ -2854,7 +2854,7 @@
}],
['OS=="win"', {
'dependencies': [
- 'chrome_dll_version',
+ 'chrome_version_resources',
'installer_util_strings',
'../sandbox/sandbox.gyp:sandbox',
],
@@ -2865,7 +2865,7 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
@@ -3452,7 +3452,7 @@
'app/chrome_command_ids.h',
'app/chrome_dll.rc',
'app/chrome_dll_resource.h',
- 'app/chrome_dll_version.rc.version',
+ 'app/chrome_version.rc.version',
'browser/password_manager/password_form_data.cc',
'browser/sessions/session_backend.cc',
'browser/sync/glue/session_model_associator.cc',
@@ -3545,14 +3545,14 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
],
'include_dirs': [
'<(DEPTH)/third_party/wtl/include',
],
'dependencies': [
- 'chrome_dll_version',
+ 'chrome_version_resources',
'installer_util_strings',
'../sandbox/sandbox.gyp:sandbox',
],
@@ -3575,7 +3575,7 @@
}, { # else: OS != "win"
'sources!': [
'app/chrome_dll.rc',
- 'app/chrome_dll_version.rc.version',
+ 'app/chrome_version.rc.version',
'test/data/resource.rc',
],
}],
@@ -3648,7 +3648,7 @@
'conditions': [
['OS=="win"', {
'dependencies': [
- 'chrome_dll_version',
+ 'chrome_version_resources',
'installer_util_strings',
'../sandbox/sandbox.gyp:sandbox',
],
@@ -3658,14 +3658,14 @@
'sources': [
'app/chrome_dll.rc',
'app/chrome_dll_resource.h',
- 'app/chrome_dll_version.rc.version',
+ 'app/chrome_version.rc.version',
'<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index a7723c1..d6d3b56 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -428,7 +428,7 @@
'../breakpad/breakpad.gyp:breakpad_handler',
'../chrome/chrome.gyp:automation',
'../chrome/chrome.gyp:crash_service',
- '../chrome/chrome.gyp:chrome_dll_version',
+ '../chrome/chrome.gyp:chrome_version_resources',
'../chrome/chrome.gyp:installer_util',
'../google_update/google_update.gyp:google_update',
],
@@ -831,7 +831,7 @@
'chrome_frame_launcher.gyp:chrome_frame_helper_dll',
'../chrome/chrome.gyp:chrome',
'../chrome/chrome.gyp:chrome_dll',
- '../chrome/chrome.gyp:chrome_dll_version',
+ '../chrome/chrome.gyp:chrome_version_resources',
'../chrome/chrome.gyp:common',
],
'sources': [
generated by cgit v1.1 at 2025-01-16 05:59:01 +0000