Generate version resources for Chrome Frame using the same machinery as Chrome itself.

Including generated files from within .rc files doesn't work since there's no dependency tracking going on.

BUG=155714
TEST=none


Review URL: https://chromiumcodereview.appspot.com/11147012

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

13 files changed, 196 insertions, 181 deletions

diff --git a/chrome_frame/BRANDING b/chrome_frame/BRANDING
new file mode 100644
index 0000000..f952f77
--- /dev/null
+++ b/chrome_frame/BRANDING
@@ -0,0 +1,3 @@
+PRODUCT_FULLNAME=Google Chrome Frame
+PRODUCT_SHORTNAME=ChromeFrame
+PRODUCT_DESCRIPTION=Chrome Frame renders the Web of the future in the browsers of the past. It's like strapping a rocket engine to a minivan.
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 0d5a7b1..ad944f1 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -6,13 +6,6 @@
   'variables': {
     'chromium_code': 1,
 
-    'variables': {
-      'version_py_path': '../tools/build/version.py',
-      'version_path': 'VERSION',
-    },
-    'version_py_path': '<(version_py_path) -f',
-    'version_path': '<(version_path)',
-
     # Keep the archive builder happy.
     'chrome_personalization%': 1,
     'use_syncapi_stub%': 0,
@@ -31,6 +24,7 @@
   },
   'includes': [
     '../build/win_precompile.gypi',
+    '../chrome/version.gypi',
   ],
   'target_defaults': {
     'dependencies': [
@@ -48,6 +42,38 @@
   },
   'targets': [
     {
+      'target_name': 'chrome_frame_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': 'chrome_frame',
+        'template_input_path': 'npchrome_frame_version.rc.version',
+        'extra_variable_files_arguments': [ '-f', 'BRANDING' ],
+        'extra_variable_files': [ 'BRANDING' ], # NOTE: matches that above
+      },
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(SHARED_INTERMEDIATE_DIR)/<(output_dir)',
+        ],
+      },
+      'sources': [
+        'npchrome_frame_dll.ver',
+      ],
+      'includes': [
+        '../chrome/version_resource_rules.gypi',
+      ],
+    },
+    {
       # Builds the crash tests in crash_reporting.
       'target_name': 'chrome_frame_crash_tests',
       'type': 'none',
@@ -188,7 +214,6 @@
       'dependencies': [
         '../base/base.gyp:test_support_base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
-        '../chrome/chrome.gyp:chrome_version_header',
         '../chrome/chrome.gyp:common',
         '../chrome/chrome.gyp:utility',
         '../chrome/chrome.gyp:browser',
@@ -251,7 +276,7 @@
         'test/url_request_test.cc',
         'test/win_event_receiver.cc',
         'test/win_event_receiver.h',
-        'chrome_launcher_version.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_launcher_exe_version.rc',
         '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
         'test_utils.cc',
         'test_utils.h',
@@ -851,6 +876,7 @@
         'chrome_frame_ie',
         'chrome_frame_strings',
         'chrome_frame_utils',
+        'chrome_frame_version_resources',
         'chrome_tab_idl',
         'chrome_frame_launcher.gyp:chrome_launcher',
         'chrome_frame_launcher.gyp:chrome_frame_helper',
@@ -872,11 +898,11 @@
         'chrome_tab.cc',
         'chrome_tab.def',
         '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/npchrome_frame_dll_version.rc',
         # FIXME(slightlyoff): For chrome_tab.tlb. Giant hack until we can
         #   figure out something more gyp-ish.
         'resources/tlb_resource.rc',
         'chrome_tab.rgs',
-        'chrome_tab_version.rc',
         'resource.h',
       ],
       'conditions': [
diff --git a/chrome_frame/chrome_frame_helper_dll.ver b/chrome_frame/chrome_frame_helper_dll.ver
new file mode 100644
index 0000000..9451728
--- /dev/null
+++ b/chrome_frame/chrome_frame_helper_dll.ver
@@ -0,0 +1,3 @@
+INTERNAL_NAME=chrome_frame_helper_dll
+ORIGINAL_FILENAME=chrome_frame_helper.dll
+FILETYPE=0x2L
diff --git a/chrome_frame/chrome_frame_helper_exe.ver b/chrome_frame/chrome_frame_helper_exe.ver
new file mode 100644
index 0000000..2d96e8c
--- /dev/null
+++ b/chrome_frame/chrome_frame_helper_exe.ver
@@ -0,0 +1,3 @@
+INTERNAL_NAME=chrome_frame_helper_exe
+ORIGINAL_FILENAME=chrome_frame_helper.exe
+FILETYPE=0x1L
diff --git a/chrome_frame/chrome_frame_helper_version.rc b/chrome_frame/chrome_frame_helper_version.rc
deleted file mode 100644
index 9e35524..0000000
--- a/chrome_frame/chrome_frame_helper_version.rc
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "version.h"

-

-#ifdef APSTUDIO_INVOKED

-# error Don't open this in the GUI, it'll be massacred on save.

-#endif // APSTUDIO_INVOKED

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Version

-//

-

-1 VERSIONINFO

- FILEVERSION CHROME_VERSION

- PRODUCTVERSION CHROME_VERSION

- FILEFLAGSMASK 0x17L

-#ifdef _DEBUG

- FILEFLAGS 0x1L

-#else

- FILEFLAGS 0x0L

-#endif

- FILEOS 0x4L

- FILETYPE 0x2L

- FILESUBTYPE 0x0L

-BEGIN

-    BLOCK "StringFileInfo"

-    BEGIN

-        // Note that Firefox 3.0 requires the charset to be 04e4 (multi-lingual).

-        BLOCK "040904e4"

-        BEGIN

-            VALUE "CompanyName", COMPANY_FULLNAME_STRING

-            VALUE "CompanyShortName", COMPANY_SHORTNAME_STRING

-            VALUE "ProductName", "Google Chrome Frame"

-            VALUE "ProductShortName", "ChromeFrame"

-            VALUE "ProductVersion", CHROME_VERSION_STRING

-            VALUE "FileDescription", "Chrome Frame renders the Web of the future in the browsers of the past. It's like strapping a rocket engine to a minivan."

-            VALUE "FileVersion", CHROME_VERSION_STRING

-            VALUE "InternalName", "Google Chrome Frame"

-            VALUE "LegalCopyright", COPYRIGHT_STRING

-            VALUE "FileExtents", "chromeframe"

-            VALUE "FileOpenName", "chromeframe"

-            VALUE "LastChange", LASTCHANGE_STRING

-            VALUE "Official Build", OFFICIAL_BUILD_STRING

-        END

-    END

-    BLOCK "VarFileInfo"

-    BEGIN

-        // Note that Firefox 3.0 requires the charset to be 1252 (multi-lingual).

-        VALUE "Translation", 0x409, 1252

-    END

-END

diff --git a/chrome_frame/chrome_frame_launcher.gyp b/chrome_frame/chrome_frame_launcher.gyp
index 2e317ea..6a2b7dd 100644
--- a/chrome_frame/chrome_frame_launcher.gyp
+++ b/chrome_frame/chrome_frame_launcher.gyp
@@ -29,6 +29,9 @@
       }],
     ],
   },
+  'includes': [
+    '../chrome/version.gypi',
+  ],
   'target_defaults': {
     'include_dirs': [
       # all our own includes are relative to src/
@@ -60,18 +63,52 @@
   },
   'targets': [
     {
+      'target_name': 'chrome_frame_launcher_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': 'chrome_frame',
+        'template_input_path': 'chrome_frame_version.rc.version',
+        'extra_variable_files_arguments': [ '-f', 'BRANDING' ],
+        'extra_variable_files': [ 'BRANDING' ], # NOTE: matches that above
+      },
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(SHARED_INTERMEDIATE_DIR)/<(output_dir)',
+        ],
+      },
+      'sources': [
+        'chrome_frame_helper_dll.ver',
+        'chrome_frame_helper_exe.ver',
+        'chrome_launcher_exe.ver',
+      ],
+      'includes': [
+        '../chrome/version_resource_rules.gypi',
+      ],
+    },
+    {
       'target_name': 'chrome_launcher',
       'type': 'executable',
       'dependencies': [
         '../breakpad/breakpad.gyp:breakpad_handler',
         '../chrome/app/policy/cloud_policy_codegen.gyp:policy',
-        '../chrome/chrome.gyp:chrome_version_header',
         '../google_update/google_update.gyp:google_update',
         'chrome_frame.gyp:chrome_frame_utils',
+        'chrome_frame_launcher_version_resources',
       ],
       'sources': [
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_launcher_exe_version.rc',
         'chrome_launcher_main.cc',
-        'chrome_launcher_version.rc',
         'chrome_launcher.cc',
         'chrome_launcher.h',
         'update_launcher.cc',
@@ -92,14 +129,14 @@
       'type': 'executable',
       'dependencies': [
         '../breakpad/breakpad.gyp:breakpad_handler',
-        '../chrome/chrome.gyp:chrome_version_header',
         'chrome_frame.gyp:chrome_frame_utils',
         'chrome_frame_helper_dll',
         'chrome_frame_helper_lib',
+        'chrome_frame_launcher_version_resources',
       ],
       'sources': [
         'chrome_frame_helper_main.cc',
-        'chrome_frame_helper_version.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_helper_exe_version.rc',
       ],
       'msvs_settings': {
         'VCLinkerTool': {
@@ -114,16 +151,16 @@
       'target_name': 'chrome_frame_helper_dll',
       'type': 'shared_library',
       'dependencies': [
-        '../chrome/chrome.gyp:chrome_version_header',
         'chrome_frame.gyp:chrome_tab_idl',
         'chrome_frame_helper_lib',
+        'chrome_frame_launcher_version_resources',
       ],
       'sources': [
         'bho_loader.cc',
         'bho_loader.h',
         'chrome_frame_helper_dll.cc',
         'chrome_frame_helper_dll.def',
-        'chrome_frame_helper_version.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_helper_dll_version.rc',
         '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
         'event_hooker.cc',
         'event_hooker.h',
@@ -142,7 +179,6 @@
       'target_name': 'chrome_frame_helper_lib',
       'type': 'static_library',
       'dependencies': [
-        '../chrome/chrome.gyp:chrome_version_header',
         'chrome_frame.gyp:chrome_tab_idl',
       ],
       'sources': [
diff --git a/chrome_frame/chrome_frame_version.rc.version b/chrome_frame/chrome_frame_version.rc.version
new file mode 100644
index 0000000..8cac5eb
--- /dev/null
+++ b/chrome_frame/chrome_frame_version.rc.version
@@ -0,0 +1,49 @@
+// Copyright (c) 2012 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.
+
+#ifdef APSTUDIO_INVOKED
+# error Don't open this in the GUI, it'll be massacred on save.
+#endif // APSTUDIO_INVOKED
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+1 VERSIONINFO
+ FILEVERSION @MAJOR@,@MINOR@,@BUILD@,@PATCH@
+ PRODUCTVERSION @MAJOR@,@MINOR@,@BUILD@,@PATCH@
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE @FILETYPE@
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904e4"
+        BEGIN
+            VALUE "CompanyName", "@COMPANY_FULLNAME@"
+            VALUE "FileDescription", "@PRODUCT_DESCRIPTION@"
+            VALUE "FileVersion", "@MAJOR@.@MINOR@.@BUILD@.@PATCH@"
+            VALUE "InternalName", "@INTERNAL_NAME@"
+            VALUE "LegalCopyright", "@COPYRIGHT@"
+            VALUE "OriginalFilename", "@ORIGINAL_FILENAME@"
+            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, 1252
+    END
+END
diff --git a/chrome_frame/chrome_launcher_exe.ver b/chrome_frame/chrome_launcher_exe.ver
new file mode 100644
index 0000000..4c7f347
--- /dev/null
+++ b/chrome_frame/chrome_launcher_exe.ver
@@ -0,0 +1,3 @@
+INTERNAL_NAME=chrome_launcher_exe
+ORIGINAL_FILENAME=chrome_launcher.exe
+FILETYPE=0x1L
diff --git a/chrome_frame/chrome_launcher_version.rc b/chrome_frame/chrome_launcher_version.rc
deleted file mode 100644
index b7bb21c..0000000
--- a/chrome_frame/chrome_launcher_version.rc
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "version.h"
-
-#ifdef APSTUDIO_INVOKED
-# error Don't open this in the GUI, it'll be massacred on save.
-#endif // APSTUDIO_INVOKED
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-1 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 "040904e4"
-        BEGIN
-            VALUE "CompanyName", COMPANY_FULLNAME_STRING
-            VALUE "CompanyShortName", COMPANY_SHORTNAME_STRING
-            VALUE "ProductName", "Google Chrome Frame"
-            VALUE "ProductShortName", "ChromeFrame"
-            VALUE "ProductVersion", CHROME_VERSION_STRING
-            VALUE "FileDescription", "Chrome Frame renders the Web of the future in the browsers of the past. It's like strapping a rocket engine to a minivan."
-            VALUE "FileVersion", CHROME_VERSION_STRING
-            VALUE "InternalName", "Google Chrome Frame Launcher"
-            VALUE "LegalCopyright", COPYRIGHT_STRING
-            VALUE "OriginalFilename", "chrome_launcher.exe"
-            VALUE "LastChange", LASTCHANGE_STRING
-            VALUE "Official Build", OFFICIAL_BUILD_STRING
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
diff --git a/chrome_frame/chrome_tab_version.rc b/chrome_frame/chrome_tab_version.rc
deleted file mode 100644
index f384e0b..0000000
--- a/chrome_frame/chrome_tab_version.rc
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "version.h"
-
-#ifdef APSTUDIO_INVOKED
-# error Do not open this in the GUI, it will be massacred on save. Do not do it.
-#endif // APSTUDIO_INVOKED
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-1 VERSIONINFO
- FILEVERSION CHROME_VERSION
- PRODUCTVERSION CHROME_VERSION
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        // Note that Firefox 3.0 requires the charset to be 04e4 (multi-lingual).
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "CompanyName", COMPANY_FULLNAME_STRING
-            VALUE "CompanyShortName", COMPANY_SHORTNAME_STRING
-            VALUE "ProductName", "Google Chrome Frame"
-            VALUE "ProductShortName", "ChromeFrame"
-            VALUE "ProductVersion", CHROME_VERSION_STRING
-            VALUE "FileDescription", "Chrome Frame renders the Web of the future in the browsers of the past. It's like strapping a rocket engine to a minivan."
-            VALUE "FileVersion", CHROME_VERSION_STRING
-            VALUE "InternalName", "Google Chrome Frame"
-            VALUE "LegalCopyright", COPYRIGHT_STRING
-            VALUE "MIMEType", "application/chromeframe"
-            VALUE "FileExtents", "chromeframe"
-            VALUE "FileOpenName", "chromeframe"
-            VALUE "OriginalFilename", "npchrome_frame.dll"
-            VALUE "LastChange", LASTCHANGE_STRING
-            VALUE "Official Build", OFFICIAL_BUILD_STRING
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        // Note that Firefox 3.0 requires the charset to be 1252 (multi-lingual).
-        VALUE "Translation", 0x409, 1252
-    END
-END
diff --git a/chrome_frame/npchrome_frame_dll.ver b/chrome_frame/npchrome_frame_dll.ver
new file mode 100644
index 0000000..a37a77e
--- /dev/null
+++ b/chrome_frame/npchrome_frame_dll.ver
@@ -0,0 +1,2 @@
+INTERNAL_NAME=npchrome_frame_dll
+ORIGINAL_FILENAME=npchrome_frame.dll
diff --git a/chrome_frame/npchrome_frame_version.rc.version b/chrome_frame/npchrome_frame_version.rc.version
new file mode 100644
index 0000000..7e209de
--- /dev/null
+++ b/chrome_frame/npchrome_frame_version.rc.version
@@ -0,0 +1,54 @@
+// Copyright (c) 2012 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.
+
+#ifdef APSTUDIO_INVOKED
+# error Do not open this in the GUI, it will be massacred on save. Do not do it.
+#endif // APSTUDIO_INVOKED
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+1 VERSIONINFO
+ FILEVERSION @MAJOR@,@MINOR@,@BUILD@,@PATCH@
+ PRODUCTVERSION @MAJOR@,@MINOR@,@BUILD@,@PATCH@
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        // Note that Firefox 3.0 requires charset 04e4 (multi-lingual).
+        BLOCK "040904e4"
+        BEGIN
+            VALUE "CompanyName", "@COMPANY_FULLNAME@"
+            VALUE "FileDescription", "@PRODUCT_DESCRIPTION@"
+            VALUE "FileVersion", "@MAJOR@.@MINOR@.@BUILD@.@PATCH@"
+            VALUE "InternalName", "@INTERNAL_NAME@"
+            VALUE "LegalCopyright", "@COPYRIGHT@"
+            VALUE "OriginalFilename", "@ORIGINAL_FILENAME@"
+            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@"
+            VALUE "MIMEType", "application/chromeframe"
+            VALUE "FileExtents", "chromeframe"
+            VALUE "FileOpenName", "chromeframe"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        // Note that Firefox 3.0 requires charset 1252 (multi-lingual).
+        VALUE "Translation", 0x409, 1252
+    END
+END
diff --git a/chrome_frame/support.gyp b/chrome_frame/support.gyp
deleted file mode 100644
index 9063fe0..0000000
--- a/chrome_frame/support.gyp
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2009 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.
-
-{
-  'targets': [
-    {
-      'target_name': 'support',
-      'type': 'none',
-      'dependencies': [
-        'chrome_frame.gyp:*',
-       ],
-    },
-  ],
-}