Undo removal of chrome_dll_version from r67457.

This is not a straight revert as we keep the part where chrome.dll
directly includes the generated .rc file instead of having it included
via chrome_dll.rc, as that seems to cause other dependency issues.

BUG=none
TEST=it builds, incremental builds on changes to chrome/VERSION work.

Review URL: http://codereview.chromium.org/5259007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67657 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 142 insertions, 78 deletions

diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc
index b236691..099ef98 100644
--- a/chrome/app/chrome_dll.rc
+++ b/chrome/app/chrome_dll.rc
@@ -274,3 +274,6 @@ END
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
+
+// (temp change to touch this file or incremental builds may break now
+// that we removed chrome_dll_version.rc from it)
diff --git a/chrome/app/chrome_dll_version.rc b/chrome/app/chrome_dll_version.rc
deleted file mode 100644
index 2efc993..0000000
--- a/chrome/app/chrome_dll_version.rc
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) 2010 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.
-
-#include <verrsrc.h>
-
-#include "version.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION CHROME_VERSION
- PRODUCTVERSION CHROME_VERSION
- 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_STRING
-            VALUE "FileDescription", PRODUCT_FULLNAME_STRING
-            VALUE "FileVersion", CHROME_VERSION_STRING
-            VALUE "InternalName", "chrome_dll"
-            VALUE "LegalCopyright", COPYRIGHT_STRING
-            VALUE "OriginalFilename", "chrome.dll"
-            VALUE "ProductName", PRODUCT_FULLNAME_STRING
-            VALUE "ProductVersion", CHROME_VERSION_STRING
-            VALUE "CompanyShortName", COMPANY_SHORTNAME_STRING
-            VALUE "ProductShortName", PRODUCT_SHORTNAME_STRING
-            VALUE "LastChange", LASTCHANGE_STRING
-            VALUE "Official Build", OFFICIAL_BUILD_STRING
-        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_dll_version.rc.version
new file mode 100644
index 0000000..df37d51
--- /dev/null
+++ b/chrome/app/chrome_dll_version.rc.version
@@ -0,0 +1,47 @@
+// Copyright (c) 2010 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.
+
+#include <verrsrc.h>
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION @MAJOR@,@MINOR@,@BUILD@,@PATCH@
+ PRODUCTVERSION @MAJOR@,@MINOR@,@BUILD@,@PATCH@
+ 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", "@MAJOR@.@MINOR@.@BUILD@.@PATCH@"
+            VALUE "InternalName", "chrome_dll"
+            VALUE "LegalCopyright", "@COPYRIGHT@"
+            VALUE "OriginalFilename", "chrome.dll"
+            VALUE "ProductName", "@PRODUCT_FULLNAME@"
+            VALUE "ProductVersion", "@MAJOR@.@MINOR@.@BUILD@.@PATCH@"
+            VALUE "CompanyShortName", "@COMPANY_SHORTNAME@"
+            VALUE "ProductShortName", "@PRODUCT_SHORTNAME@"
+            VALUE "LastChange", "@LASTCHANGE@"
+            VALUE "Official Build", "@OFFICIAL_BUILD@"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index ae48340..71fb193 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1678,6 +1678,59 @@
           ],
         },
         {
+          'target_name': 'chrome_dll_version',
+          'type': 'none',
+          #'msvs_guid': '414D4D24-5D65-498B-A33F-3A29AD3CDEDC',
+          'dependencies': [
+            '../build/util/build_util.gyp:lastchange',
+          ],
+          'direct_dependent_settings': {
+            'include_dirs': [
+              '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version',
+            ],
+          },
+          'actions': [
+            {
+              'action_name': 'version',
+              'variables': {
+                'lastchange_path':
+                  '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
+                'template_input_path': 'app/chrome_dll_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)',
+                '<(lastchange_path)',
+              ],
+              'outputs': [
+                '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
+              ],
+              'action': [
+                'python',
+                '<(version_py_path)',
+                '-f', '<(version_path)',
+                '-f', '<(branding_path)',
+                '-f', '<(lastchange_path)',
+                '<(template_input_path)',
+                '<@(_outputs)',
+              ],
+              'message': 'Generating version information in <(_outputs)'
+            },
+          ],
+        },
+        {
           'target_name': 'chrome_version_header',
           'type': 'none',
           'hard_dependency': 1,
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 6975efe..01f3329 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -77,7 +77,7 @@
               'dependencies': [
                 # On Windows, link the dependencies (libraries) that make
                 # up actual Chromium functionality into this .dll.
-                'chrome_version_header',
+                'chrome_dll_version',
                 'chrome_resources',
                 'installer_util_strings',
                 'worker',
@@ -94,7 +94,7 @@
                 'app/chrome_dll.rc',
                 'app/chrome_dll_resource.h',
                 'app/chrome_main.cc',
-                'app/chrome_dll_version.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
 
                 '../webkit/glue/resources/aliasb.cur',
                 '../webkit/glue/resources/cell.cur',
@@ -124,10 +124,6 @@
                 #'app/check_dependents.bat',
                 #'app/chrome.dll.deps',
               ],
-              'include_dirs': [
-                # For version.h
-                '<(SHARED_INTERMEDIATE_DIR)',
-              ],
               'msvs_settings': {
                 'VCLinkerTool': {
                   'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib',
@@ -564,12 +560,10 @@
           },
           'include_dirs': [
             '..',
-            # For version.h
-            '<(SHARED_INTERMEDIATE_DIR)',
           ],
           'dependencies': [
-            'chrome_version_header',
             '<@(nacl_win64_dependencies)',
+            'chrome_dll_version',
             'nacl_win64',
           ],
           'defines': [
@@ -578,11 +572,10 @@
           'sources': [
             'app/chrome_command_ids.h',
             'app/chrome_dll_resource.h',
-            'app/chrome_dll_version.rc',
             'app/chrome_main.cc',
-
             'browser/renderer_host/render_process_host_dummy.cc',
             'common/googleurl_dummy.cc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
 
             # TODO:  It would be nice to have these pulled in
             # automatically from direct_dependent_settings in
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 0347af2..8c653e8 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -28,8 +28,8 @@
         'renderer',
         'chrome_resources',
         'chrome_strings',
-        'browser/policy/proto/device_management_proto.gyp:device_management_proto_cpp',
         'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
+        'browser/policy/proto/device_management_proto.gyp:device_management_proto_cpp',
         'theme_resources',
         '../base/base.gyp:test_support_base',
         '../skia/skia.gyp:skia',
@@ -384,7 +384,7 @@
           ],
           'dependencies': [
             '../app/app.gyp:app_resources',
-            'chrome.gyp:chrome_version_header',
+            'chrome.gyp:chrome_dll_version',
             'chrome.gyp:crash_service',  # run time dependency
             'chrome.gyp:installer_util_strings',
             '../sandbox/sandbox.gyp:sandbox',
@@ -401,7 +401,6 @@
             '../webkit/glue/resources/zoom_out.cur',
 
             'app/chrome_dll.rc',
-            'app/chrome_dll_version.rc',
             'test/data/resource.rc',
 
             # TODO:  It would be nice to have these pulled in
@@ -414,6 +413,7 @@
             '<(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_dll_version/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
@@ -998,6 +998,7 @@
       },
       'sources': [
         'app/breakpad_mac_stubs.mm',
+        'app/chrome_dll.rc',
         # All unittests in browser, common, renderer and service.
         'browser/about_flags_unittest.cc',
         'browser/accessibility/browser_accessibility_mac_unittest.mm',
@@ -1802,7 +1803,7 @@
         }],
         ['OS=="win"', {
           'dependencies': [
-            'chrome_version_header',
+            'chrome_dll_version',
             'installer_util_strings',
             '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
             '../third_party/isimpledom/isimpledom.gyp:isimpledom',
@@ -1819,9 +1820,6 @@
             '<(DEPTH)/third_party/wtl/include',
           ],
           'sources': [
-            'app/chrome_dll.rc',
-            'app/chrome_dll_version.rc',
-
             # TODO:  It would be nice to have these pulled in
             # automatically from direct_dependent_settings in
             # their various targets (net.gyp:net_resources, etc.),
@@ -1832,6 +1830,7 @@
             '<(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_dll_version/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
@@ -1858,6 +1857,7 @@
           },
         }, { # else: OS != "win"
           'sources!': [
+            'app/chrome_dll.rc',
             'browser/accessibility/browser_accessibility_win_unittest.cc',
             'browser/bookmarks/bookmark_codec_unittest.cc',
             'browser/bookmarks/bookmark_node_data_unittest.cc',
@@ -1922,6 +1922,10 @@
       'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
       'sources': [
         'app/breakpad_mac_stubs.mm',
+        'app/chrome_command_ids.h',
+        'app/chrome_dll.rc',
+        'app/chrome_dll_resource.h',
+        'app/chrome_dll_version.rc.version',
         'browser/autocomplete/autocomplete_browsertest.cc',
         'browser/browser_browsertest.cc',
         'browser/browsing_data_database_helper_browsertest.cc',
@@ -2136,13 +2140,10 @@
         }],
         ['OS=="win"', {
           'sources': [
-            'app/chrome_command_ids.h',
-            'app/chrome_dll_resource.h',
-            'app/chrome_dll.rc',
-            'app/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
@@ -2153,7 +2154,7 @@
             '<(DEPTH)/third_party/wtl/include',
           ],
           'dependencies': [
-            'chrome_version_header',
+            'chrome_dll_version',
             'installer_util_strings',
             '../sandbox/sandbox.gyp:sandbox',
           ],
@@ -2175,6 +2176,10 @@
           }
         }, { # else: OS != "win"
           'sources!': [
+            'app/chrome_command_ids.h',
+            'app/chrome_dll.rc',
+            'app/chrome_dll_resource.h',
+            'app/chrome_dll_version.rc.version',
             'browser/extensions/extension_popup_apitest.cc',
             'browser/extensions/extension_rlz_apitest.cc',
             # TODO(jam): http://crbug.com/15101 These tests fail on Linux and
@@ -2269,6 +2274,7 @@
       ],
       'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
       'sources': [
+        'app/chrome_dll.rc',
         'browser/safe_browsing/safe_browsing_test.cc',
         'test/in_process_browser_test.cc',
         'test/in_process_browser_test.h',
@@ -2277,15 +2283,14 @@
       'conditions': [
         ['OS=="win"', {
           'dependencies': [
-            'chrome_version_header',
+            'chrome_dll_version',
             'installer_util_strings',
             '../sandbox/sandbox.gyp:sandbox',
           ],
           'sources': [
-            'app/chrome_dll.rc',
-            'app/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
@@ -2732,6 +2737,10 @@
       # TODO(phajdan.jr): Only temporary, to make transition easier.
       'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
       'sources': [
+        'app/chrome_command_ids.h',
+        'app/chrome_dll.rc',
+        'app/chrome_dll_resource.h',
+        'app/chrome_dll_version.rc.version',
         'browser/autofill/autofill_common_test.cc',
         'browser/autofill/autofill_common_test.h',
         'browser/password_manager/password_form_data.cc',
@@ -2783,6 +2792,7 @@
         'test/ui_test_utils_linux.cc',
         'test/ui_test_utils_mac.mm',
         'test/ui_test_utils_win.cc',
+        'test/data/resource.rc',
       ],
       'conditions': [
         # Plugin code.
@@ -2812,13 +2822,9 @@
         }],
         ['OS=="win"', {
           'sources': [
-            'app/chrome_command_ids.h',
-            'app/chrome_dll.rc',
-            'app/chrome_dll_resource.h',
-            'app/chrome_dll_version.rc',
-            'test/data/resource.rc',
             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
           ],
@@ -2826,7 +2832,7 @@
             '<(DEPTH)/third_party/wtl/include',
           ],
           'dependencies': [
-            'chrome_version_header',
+            'chrome_dll_version',
             'installer_util_strings',
             '../sandbox/sandbox.gyp:sandbox',
           ],
@@ -2846,6 +2852,12 @@
               },
             },
           },
+        }, { # else: OS != "win"
+          'sources!': [
+            'app/chrome_dll.rc',
+            'app/chrome_dll_version.rc.version',
+            'test/data/resource.rc',
+          ],
         }],
         ['toolkit_views==1', {
           'dependencies': [
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index f141e09..6fc4d6d 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -498,7 +498,7 @@
             '../breakpad/breakpad.gyp:breakpad_handler',
             '../chrome/chrome.gyp:automation',
             '../chrome/chrome.gyp:crash_service',
-            '../chrome/chrome.gyp:chrome_version_header',
+            '../chrome/chrome.gyp:chrome_dll_version',
             '../chrome/chrome.gyp:installer_util',
             '../google_update/google_update.gyp:google_update',
           ],
@@ -869,7 +869,7 @@
         'chrome_frame_launcher.gyp:chrome_frame_helper_dll',
         '../chrome/chrome.gyp:chrome',
         '../chrome/chrome.gyp:chrome_dll',
-        '../chrome/chrome.gyp:chrome_version_header',
+        '../chrome/chrome.gyp:chrome_dll_version',
         '../chrome/chrome.gyp:common',
         '../chrome/chrome.gyp:utility',
       ],