Use Chrome version for cloud print targets.

BUG=none
TEST=none

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

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

2 files changed, 116 insertions, 104 deletions

diff --git a/cloud_print/service/service.gyp b/cloud_print/service/service.gyp
index 35c448d..37bd013 100644
--- a/cloud_print/service/service.gyp
+++ b/cloud_print/service/service.gyp
@@ -38,6 +38,10 @@
     {
       'target_name': 'cloud_print_service',
       'type': 'executable',
+      'include_dirs': [
+        # To allow including "version.h"
+        '<(SHARED_INTERMEDIATE_DIR)',
+      ],
       'sources': [
         'win/cloud_print_service.cc',
         'win/cloud_print_service.h',
@@ -47,6 +51,13 @@
       'dependencies': [
         'cloud_print_service_lib',
       ],
+      'conditions': [
+        ['OS=="win"', {
+          'dependencies': [
+            '<(DEPTH)/chrome/chrome.gyp:chrome_version_header',
+          ],
+        }],
+      ],
       'msvs_settings': {
         'VCLinkerTool': {
           'SubSystem': '1',         # Set /SUBSYSTEM:CONSOLE
diff --git a/cloud_print/service/win/cloud_print_service.rc b/cloud_print/service/win/cloud_print_service.rc
index ea5c57d9..9ed0efb 100644
--- a/cloud_print/service/win/cloud_print_service.rc
+++ b/cloud_print/service/win/cloud_print_service.rc
@@ -1,104 +1,105 @@
-// Microsoft Visual C++ generated resource script.

-//

-#include "resource.h"

-

-#define APSTUDIO_READONLY_SYMBOLS

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

-//

-// Generated from the TEXTINCLUDE 2 resource.

-//

-#include "winres.h"

-#include "verrsrc.h"

-

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

-#undef APSTUDIO_READONLY_SYMBOLS

-

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

-// English (United States) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-

-#ifdef APSTUDIO_INVOKED

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

-//

-// TEXTINCLUDE

-//

-

-1 TEXTINCLUDE 

-BEGIN

-    "resource.h\0"

-END

-

-2 TEXTINCLUDE 

-BEGIN

-    "#ifndef APSTUDIO_INVOKED\r\n"

-    "#include ""targetver.h""\r\n"

-    "#endif\r\n"

-    "#include ""winres.h""\r\n"

-    "#include ""verrsrc.h""\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", "Google"

-            VALUE "FileDescription", "CloudPrint Service"

-            VALUE "FileVersion", "1.0.0.1"

-            VALUE "InternalName", "CloudPrintService.exe"

-            VALUE "LegalCopyright", "(c) Google.  All rights reserved."

-            VALUE "OriginalFilename", "CloudPrintService.exe"

-            VALUE "ProductName", "Google Cloud Print Service"

-            VALUE "ProductVersion", "1.0.0.1"

-        END

-    END

-    BLOCK "VarFileInfo"

-    BEGIN

-        VALUE "Translation", 0x409, 1200

-    END

-END

-

-

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

-//

-// REGISTRY

-//

-

-IDR_CLOUDPRINTSERVICE   REGISTRY                "cloud_print_service.rgs"

-

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

-//

-// String Table

-//

-

-STRINGTABLE

-BEGIN

-    IDS_SERVICENAME         "CloudPrintService"

-END

-

-#endif    // English (United States) resources

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

-

+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+#include "verrsrc.h"
+
+#include "version.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United States) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#ifndef APSTUDIO_INVOKED\r\n"
+    "#include ""targetver.h""\r\n"
+    "#endif\r\n"
+    "#include ""winres.h""\r\n"
+    "#include ""verrsrc.h""\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION CHROME_VERSION
+ PRODUCTVERSION CHROME_VERSION
+ 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", "Google, Inc."
+            VALUE "FileDescription", "Cloud Print Service"
+            VALUE "FileVersion", CHROME_VERSION_STRING
+            VALUE "InternalName", "Cloud Print Service"
+            VALUE "ProductName", "Google Cloud Print Service"
+            VALUE "ProductVersion", CHROME_VERSION_STRING
+            VALUE "LegalCopyright", "Copyright (c) 2012 The Chromium Authors. All rights."
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// REGISTRY
+//
+
+IDR_CLOUDPRINTSERVICE   REGISTRY                "cloud_print_service.rgs"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE
+BEGIN
+    IDS_SERVICENAME         "CloudPrintService"
+END
+
+#endif    // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+