Switched to version generation with ver files.

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

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

11 files changed, 74 insertions, 128 deletions

diff --git a/cloud_print/BRANDING b/cloud_print/BRANDING
new file mode 100644
index 0000000..0ab41da
--- /dev/null
+++ b/cloud_print/BRANDING
@@ -0,0 +1,3 @@
+PRODUCT_FULLNAME=Google Cloud Print
+PRODUCT_SHORTNAME=GCP
+PRODUCT_DESCRIPTION=Google Cloud Print (GCP) enables any app on any device to print to any cloud-connected printer.
diff --git a/cloud_print/cloud_print.gyp b/cloud_print/cloud_print.gyp
index a563cf5..30d7e9f 100644
--- a/cloud_print/cloud_print.gyp
+++ b/cloud_print/cloud_print.gyp
@@ -2,8 +2,56 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
+  '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)',
+  },
+  'includes': [
+    '../chrome/version.gypi',
+  ],
   'targets': [
     {
+      'target_name': 'cloud_print_version_resources',
+      'type': 'none',
+      'conditions': [
+        ['branding == "Chrome"', {
+          'variables': {
+             'branding_path': '<(DEPTH)/chrome/app/theme/google_chrome/BRANDING',
+          },
+        }, { # else branding!="Chrome"
+          'variables': {
+             'branding_path': '<(DEPTH)/chrome/app/theme/chromium/BRANDING',
+          },
+        }],
+      ],
+      'variables': {
+        'output_dir': 'cloud_print',
+        'template_input_path': '../chrome/app/chrome_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': [
+        'service/win/cloud_print_service_exe.ver',
+        'virtual_driver/win/gcp_portmon64_dll.ver',
+        'virtual_driver/win/gcp_portmon_dll.ver',
+        'virtual_driver/win/install/virtual_driver_setup_exe.ver',
+      ],
+      'includes': [
+        '../chrome/version_resource_rules.gypi',
+      ],
+    },
+    {
       'target_name': 'cloud_print',
       'type': 'none',
       'dependencies': [
diff --git a/cloud_print/service/service.gyp b/cloud_print/service/service.gyp
index bbf6065..2c3df79 100644
--- a/cloud_print/service/service.gyp
+++ b/cloud_print/service/service.gyp
@@ -62,6 +62,7 @@
       'target_name': 'cloud_print_service',
       'type': 'executable',
       'sources': [
+        '<(SHARED_INTERMEDIATE_DIR)/cloud_print/cloud_print_service_exe_version.rc',
         'win/cloud_print_service.cc',
         'win/cloud_print_service.rc',
         'win/resource.h',
diff --git a/cloud_print/service/win/cloud_print_service.rc b/cloud_print/service/win/cloud_print_service.rc
index 9ed0efb..2eccba4 100644
--- a/cloud_print/service/win/cloud_print_service.rc
+++ b/cloud_print/service/win/cloud_print_service.rc
@@ -1,105 +1,27 @@
-// Microsoft Visual C++ generated resource script.
-//
+// Copyright (c) 2013 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 "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
-//
+# error Don't open this in the GUI, it'll be massacred on save.
+#endif // APSTUDIO_INVOKED
 
 IDR_CLOUDPRINTSERVICE   REGISTRY                "cloud_print_service.rgs"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
 STRINGTABLE
 BEGIN
     IDS_SERVICENAME         "CloudPrintService"
 END
 
 #endif    // English (United States) resources
-/////////////////////////////////////////////////////////////////////////////
-
diff --git a/cloud_print/service/win/cloud_print_service_exe.ver b/cloud_print/service/win/cloud_print_service_exe.ver
new file mode 100644
index 0000000..945062e
--- /dev/null
+++ b/cloud_print/service/win/cloud_print_service_exe.ver
@@ -0,0 +1,3 @@
+INTERNAL_NAME=cloud_print_service.exe
+ORIGINAL_FILENAME=cloud_print_service.exe
+FILETYPE=0x1L
diff --git a/cloud_print/virtual_driver/win/gcp_portmon64_dll.ver b/cloud_print/virtual_driver/win/gcp_portmon64_dll.ver
new file mode 100644
index 0000000..958a012
--- /dev/null
+++ b/cloud_print/virtual_driver/win/gcp_portmon64_dll.ver
@@ -0,0 +1,3 @@
+INTERNAL_NAME=gcp_portmon64.dll
+ORIGINAL_FILENAME=gcp_portmon64.dll
+FILETYPE=0x2L
diff --git a/cloud_print/virtual_driver/win/gcp_portmon_dll.ver b/cloud_print/virtual_driver/win/gcp_portmon_dll.ver
new file mode 100644
index 0000000..dd75a0f1
--- /dev/null
+++ b/cloud_print/virtual_driver/win/gcp_portmon_dll.ver
@@ -0,0 +1,3 @@
+INTERNAL_NAME=gcp_portmon.dll
+ORIGINAL_FILENAME=gcp_portmon.dll
+FILETYPE=0x2L
diff --git a/cloud_print/virtual_driver/win/install/virtual_driver_install.gyp b/cloud_print/virtual_driver/win/install/virtual_driver_install.gyp
index 5d6785e..acb22e7 100644
--- a/cloud_print/virtual_driver/win/install/virtual_driver_install.gyp
+++ b/cloud_print/virtual_driver/win/install/virtual_driver_install.gyp
@@ -22,12 +22,12 @@
       'dependencies': [
         '../virtual_driver.gyp:virtual_driver_lib',
         '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/chrome/chrome.gyp:chrome_version_header',
+        '<(DEPTH)/cloud_print/cloud_print.gyp:cloud_print_version_resources',
         'virtual_driver_setup_resources',
       ],
       'sources': [
         'setup.cc',
-        '../virtual_driver_common_resources.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/cloud_print/virtual_driver_setup_exe_version.rc',
         '<(SHARED_INTERMEDIATE_DIR)/virtual_driver_setup_resources/virtual_driver_setup_resources_ar.rc',
         '<(SHARED_INTERMEDIATE_DIR)/virtual_driver_setup_resources/virtual_driver_setup_resources_bg.rc',
         '<(SHARED_INTERMEDIATE_DIR)/virtual_driver_setup_resources/virtual_driver_setup_resources_bn.rc',
diff --git a/cloud_print/virtual_driver/win/install/virtual_driver_setup_exe.ver b/cloud_print/virtual_driver/win/install/virtual_driver_setup_exe.ver
new file mode 100644
index 0000000..1667c07
--- /dev/null
+++ b/cloud_print/virtual_driver/win/install/virtual_driver_setup_exe.ver
@@ -0,0 +1,3 @@
+INTERNAL_NAME=virtual_driver_setup.exe
+ORIGINAL_FILENAME=virtual_driver_setup.exe
+FILETYPE=0x1L
diff --git a/cloud_print/virtual_driver/win/virtual_driver.gypi b/cloud_print/virtual_driver/win/virtual_driver.gypi
index 7c13ed8..15e7b39 100644
--- a/cloud_print/virtual_driver/win/virtual_driver.gypi
+++ b/cloud_print/virtual_driver/win/virtual_driver.gypi
@@ -45,11 +45,12 @@
       'sources': [
         'port_monitor/port_monitor.def',
         'port_monitor/port_monitor_dll.cc',
-        'virtual_driver_common_resources.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/cloud_print/gcp_portmon<(virtual_driver_suffix)_dll_version.rc',
       ],
       'dependencies': [
         'gcp_portmon_lib<(virtual_driver_suffix)',
         '<(DEPTH)/chrome/chrome.gyp:chrome_version_header',
+        '<(DEPTH)/cloud_print/cloud_print.gyp:cloud_print_version_resources',
       ],
       'include_dirs': [
         # To allow including "version.h"
diff --git a/cloud_print/virtual_driver/win/virtual_driver_common_resources.rc b/cloud_print/virtual_driver/win/virtual_driver_common_resources.rc
deleted file mode 100644
index 7f1e0a2..0000000
--- a/cloud_print/virtual_driver/win/virtual_driver_common_resources.rc
+++ /dev/null
@@ -1,41 +0,0 @@
-// 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.
-
-#include "version.h"
-
-#ifdef APSTUDIO_INVOKED
-# error Don't open this in the GUI, it'll be massacred on save.
-#endif // APSTUDIO_INVOKED
-
-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 "040904b0"
-        BEGIN
-            VALUE "CompanyName", "Google, Inc."
-            VALUE "FileDescription", "Google Cloud Printer"
-            VALUE "FileVersion", CHROME_VERSION_STRING
-            VALUE "InternalName", "Google Cloud Printer"
-            VALUE "ProductName", "Google Cloud Printer"
-            VALUE "ProductVersion", CHROME_VERSION_STRING
-            VALUE "LegalCopyright", "Copyright (c) 2012 The Chromium Authors. All rights reserved."
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END