Committing for jeffbailey....

chrome_frame/chrome_tab_version.rc

Index: chrome_frame/chrome_tab_version.rc
===================================================================
--- chrome_frame/chrome_tab_version.rc	(revision 46685)
+++ chrome_frame/chrome_tab_version.rc	(working copy)
@@ -1,3 +1,9 @@
+#include "version.h"
+
+#ifdef APSTUDIO_INVOKED
+# error Don't open this in the GUI, it'll be massacred on save.
+#endif // APSTUDIO_INVOKED
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
@@ -4,8 +10,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION @MAJOR@,@MINOR@,@BUILD@,@PATCH@
- PRODUCTVERSION @MAJOR@,@MINOR@,@BUILD@,@PATCH@
+ FILEVERSION CHROME_VERSION
+ PRODUCTVERSION CHROME_VERSION
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -21,21 +27,21 @@
         // Note that Firefox 3.0 requires the charset to be 04e4 (multi-lingual).
         BLOCK "040904e4"
         BEGIN
-            VALUE "CompanyName", "@COMPANY_FULLNAME@"
-            VALUE "CompanyShortName", "@COMPANY_SHORTNAME@"
+            VALUE "CompanyName", COMPANY_FULLNAME_STRING
+            VALUE "CompanyShortName", COMPANY_SHORTNAME_STRING
             VALUE "ProductName", "Google Chrome Frame"
             VALUE "ProductShortName", "ChromeFrame"
-            VALUE "ProductVersion", "@MAJOR@.@MINOR@.@BUILD@.@PATCH@"
+            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", "@MAJOR@.@MINOR@.@BUILD@.@PATCH@"
+            VALUE "FileVersion", CHROME_VERSION_STRING
             VALUE "InternalName", "Google Chrome Frame"
-            VALUE "LegalCopyright", "@COPYRIGHT@"
+            VALUE "LegalCopyright", COPYRIGHT_STRING
             VALUE "MIMEType", "application/chromeframe"
             VALUE "FileExtents", "chromeframe"
             VALUE "FileOpenName", "chromeframe"
             VALUE "OriginalFilename", "npchrome_frame.dll"
-            VALUE "LastChange", "@LASTCHANGE@"
-            VALUE "Official Build", "@OFFICIAL_BUILD@"
+            VALUE "LastChange", LASTCHANGE_STRING
+            VALUE "Official Build", OFFICIAL_BUILD_STRING
         END
     END
     BLOCK "VarFileInfo"