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

6 files changed, 13 insertions, 44 deletions

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