Revert of Cleanup chrome/version.h handling (patchset Pissandshittium#9…

… id:160001 of https://codereview.chromium.org/1405633002/ ) Reason for revert: Causing failures on the GN build (not gyp) for Mac: http://build.chromium.org/p/chromium.mac/builders/Mac%20GN%20%28dbg%29/builds/23191 Original issue's description: > Cleanup chrome/common/chrome_version.h handling > > Rename "version.h" to "chrome/common/chrome_version.h" > Update #include and GYP/GN references > Generate on all platforms > Remove redundant generated chrome/common/chrome_version.cc.version > Fix DEPS include_rules > > BUG=542807 > > Committed: https://crrev.com/59647ecac9524d954010d3d10b539ee4a340bf94 > Cr-Commit-Position: refs/heads/master@{#355196} > > Committed: https://crrev.com/31f086c2013853749cac45522eb950b9d0ab0302 > Cr-Commit-Position: refs/heads/master@{#355377} TBR=brettw@chromium.org,mdempsky@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=542807 Review URL: https://codereview.chromium.org/1418933002 Cr-Commit-Position: refs/heads/master@{#355393}
qweri0p · Oct 21, 2015 · 43a8e38 · 43a8e38
1 parent dd1274f
commit 43a8e38
Show file tree

Hide file tree

Showing 27 changed files with 123 additions and 87 deletions.
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
@@ -425,6 +425,22 @@ group("child_dependencies") {
 }
 
 if (is_win) {
+  # TODO(brettw) this duplicates "//chrome/common:version" which applies to
+  # Linux.
+  process_version("version_header") {
+    # TODO(brettW) this should have more reduced visibility, but chrome/browser
+    # currently depends on this.
+    #visibility = [ ":*" ]
+
+    # This one just uses the custom template and no separate sources.
+    sources = []
+    template_file = "version.h.in"
+
+    # TODO(brettw) this should move to $target_gen_dir/version.h and
+    # source files including it should reference it via "chrome/version.h"
+    output = "$root_gen_dir/version.h"
+  }
+
   process_version("chrome_exe_version") {
     template_file = chrome_version_rc_template
     sources = [

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
@@ -766,7 +766,7 @@ source_set("browser") {
     ]
     deps += [
       ":chrome_process_finder",
-      "//chrome/common:version_header",
+      "//chrome:version_header",
       "//chrome/installer/util:strings",
       "//chrome_elf",
       "//chrome_elf:constants",

diff --git a/chrome/browser/chrome_elf_init_unittest_win.cc b/chrome/browser/chrome_elf_init_unittest_win.cc
@@ -10,13 +10,13 @@
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_reg_util_win.h"
-#include "chrome/common/chrome_version.h"
 #include "chrome_elf/chrome_elf_constants.h"
 #include "components/variations/entropy_provider.h"
 #include "components/variations/variations_associated_data.h"
 #include "components/version_info/version_info.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "version.h"  // NOLINT
 
 namespace {
 

diff --git a/chrome/browser/chrome_elf_init_win.cc b/chrome/browser/chrome_elf_init_win.cc
@@ -9,12 +9,12 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "chrome/browser/chrome_elf_init_win.h"
-#include "chrome/common/chrome_version.h"
 #include "chrome_elf/blacklist/blacklist.h"
 #include "chrome_elf/chrome_elf_constants.h"
 #include "chrome_elf/dll_hash/dll_hash.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/browser_thread.h"
+#include "version.h"  // NOLINT
 
 const char kBrowserBlacklistTrialName[] = "BrowserBlacklist";
 const char kBrowserBlacklistTrialDisabledGroupName[] = "NoBlacklist";

diff --git a/chrome/browser/google/google_update_win_unittest.cc b/chrome/browser/google/google_update_win_unittest.cc
@@ -22,14 +22,14 @@
 #include "base/version.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_comptr.h"
-#include "chrome/common/chrome_version.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chrome/installer/util/helper.h"
 #include "google_update/google_update_idl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/win/atl_module.h"
+#include "version.h"
 
 using ::testing::DoAll;
 using ::testing::HasSubstr;

diff --git a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win.cc b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win.cc
@@ -7,7 +7,7 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "chrome/common/chrome_version.h"
+#include "version.h"  // NOLINT
 
 namespace safe_browsing {
 

diff --git a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc
@@ -13,10 +13,10 @@
 #include "chrome/browser/safe_browsing/incident_reporting/incident.h"
 #include "chrome/browser/safe_browsing/incident_reporting/mock_incident_receiver.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_version.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "version.h"  // NOLINT
 
 using ::testing::_;
 using ::testing::StrictMock;

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
@@ -414,6 +414,41 @@
             'version_resource_rules.gypi',
           ],
         },
+        {
+          # GN version: //chrome:version_header
+          'target_name': 'chrome_version_header',
+          'type': 'none',
+          'hard_dependency': 1,
+          'actions': [
+            {
+              'action_name': 'version_header',
+              'variables': {
+                'lastchange_path':
+                  '<(DEPTH)/build/util/LASTCHANGE',
+                'branding_path': 'app/theme/<(branding_path_component)/BRANDING',
+              },
+              'inputs': [
+                '<(version_path)',
+                '<(branding_path)',
+                '<(lastchange_path)',
+                'version.h.in',
+              ],
+              'outputs': [
+                '<(SHARED_INTERMEDIATE_DIR)/version.h',
+              ],
+              'action': [
+                'python',
+                '<(version_py_path)',
+                '-f', '<(version_path)',
+                '-f', '<(branding_path)',
+                '-f', '<(lastchange_path)',
+                'version.h.in',
+                '<@(_outputs)',
+              ],
+              'message': 'Generating version header file: <@(_outputs)',
+            },
+          ],
+        },
         {
           'target_name': 'crash_service',
           'type': 'executable',

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
@@ -3731,7 +3731,7 @@
             'chrome_process_finder',
             'chrome_watcher_client',
             'installer_util_strings',
-            '../chrome/common_constants.gyp:version_header',
+            '../chrome/chrome.gyp:chrome_version_header',
             '../chrome_elf/chrome_elf.gyp:chrome_elf',
             '../chrome_elf/chrome_elf.gyp:chrome_elf_constants',
             '../chrome_elf/chrome_elf.gyp:dll_hash',

diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
@@ -214,12 +214,12 @@
           'target_name': 'setup',
           'type': 'executable',
           'dependencies': [
+            'chrome_version_header',
             'installer_util',
             'installer_util_strings',
             '../base/base.gyp:base',
             '../breakpad/breakpad.gyp:breakpad_handler',
             '../chrome/common_constants.gyp:common_constants',
-            '../chrome/common_constants.gyp:version_header',
             '../chrome_elf/chrome_elf.gyp:chrome_elf_constants',
             '../rlz/rlz.gyp:rlz_lib',
             '../third_party/zlib/zlib.gyp:zlib',

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
@@ -1962,7 +1962,6 @@
       'hard_dependency': 1,
       'dependencies': [
         'automation_client_lib',
-        'common_constants.gyp:version_header',
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../crypto/crypto.gyp:crypto',

diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
@@ -36,7 +36,7 @@ if (enable_extensions) {
   }
 }
 
-# GYP version: chrome/chrome_common.gypi:common
+# GYP version: chrome/chrome_common.gyp:common
 static_library("common") {
   sources = rebase_path(gypi_values.chrome_common_sources, ".", "//chrome")
   defines = []
@@ -269,20 +269,12 @@ static_library("common") {
   }
 }
 
-# GYP version: chrome/common_constants.gyp:version_header
-process_version("version_header") {
-  # TODO(brettw) this should have more reduced visibility, but chrome/browser
-  # currently depends on this.
-  #visibility = [ ":*" ]
-
-  # This one just uses the custom template and no separate sources.
-  sources = []
-  template_file = "chrome_version.h.in"
-
-  output = "$target_gen_dir/chrome_version.h"
+process_version("make_chrome_version") {
+  template_file = "chrome_version.cc.version"
+  output = "$target_gen_dir/chrome_version.cc"
 }
 
-# GYP version: chrome/common_constants.gyp:common_constants
+# GN version: chrome/common_constants.gyp:common_constants
 static_library("constants") {
   sources = [
     "chrome_constants.cc",
@@ -311,7 +303,7 @@ static_library("constants") {
     "//content/public/common:result_codes",
   ]
   deps = [
-    ":version_header",
+    ":make_chrome_version",
     "//base",
     "//base/third_party/dynamic_annotations",
     "//components/bookmarks/common",

diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "chrome/common/chrome_constants.h"
-#include "chrome/common/chrome_version.h"
 
 #define FPL FILE_PATH_LITERAL
 
@@ -20,8 +19,6 @@
 
 namespace chrome {
 
-const char kChromeVersion[] = CHROME_VERSION_STRING;
-
 #if defined(OS_WIN)
 const char kChromeVersionEnvVar[] = "CHROME_VERSION";
 #endif

diff --git a/chrome/common/chrome_version.cc.version b/chrome/common/chrome_version.cc.version
@@ -0,0 +1,11 @@
+// Copyright 2015 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 "chrome/common/chrome_constants.h"
+
+namespace chrome {
+
+const char kChromeVersion[] = "@MAJOR@.@MINOR@.@BUILD@.@PATCH@";
+
+}  // namespace chrome
diff --git a/chrome/common_constants.gyp b/chrome/common_constants.gyp
@@ -5,7 +5,14 @@
 {
   'variables': {
     'chromium_code': 1,
-    'common_constants_sources': [
+  },
+
+  'includes': [
+    '../build/util/version.gypi',
+  ],
+
+  'target_defaults': {
+    'sources': [
       'common/chrome_constants.cc',
       'common/chrome_constants.h',
       'common/chrome_icon_resources_win.cc',
@@ -26,60 +33,43 @@
       'common/pref_names.cc',
       'common/pref_names.h',
     ],
+    'actions': [
+      {
+        'action_name': 'Make chrome_version.cc',
+        'variables': {
+          'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
+          'template_input_path': 'common/chrome_version.cc.version',
+        },
+        'inputs': [
+          '<(version_py_path)',
+          '<(version_path)',
+          '<(lastchange_path)',
+          '<(template_input_path)',
+        ],
+        'outputs': [
+          '<(INTERMEDIATE_DIR)/chrome_version.cc',
+        ],
+        'action': [
+          'python',
+          '<(version_py_path)',
+          '-f', '<(version_path)',
+          '-f', '<(lastchange_path)',
+          '<(template_input_path)',
+          '<@(_outputs)',
+        ],
+        'process_outputs_as_sources': 1,
+      },
+    ],
   },
-
-  'includes': [
-    '../build/util/version.gypi',
-  ],
-
   'targets': [
-    {
-      # GN version: //chrome/common:version_header
-      'target_name': 'version_header',
-      'type': 'none',
-      'hard_dependency': 1,
-      'actions': [
-        {
-          'action_name': 'version_header',
-          'variables': {
-            'lastchange_path':
-              '<(DEPTH)/build/util/LASTCHANGE',
-            'branding_path': 'app/theme/<(branding_path_component)/BRANDING',
-          },
-          'inputs': [
-            '<(version_path)',
-            '<(branding_path)',
-            '<(lastchange_path)',
-            'common/chrome_version.h.in',
-          ],
-          'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/common/chrome_version.h',
-          ],
-          'action': [
-            'python',
-            '<(version_py_path)',
-            '-f', '<(version_path)',
-            '-f', '<(branding_path)',
-            '-f', '<(lastchange_path)',
-            'common/chrome_version.h.in',
-            '<@(_outputs)',
-          ],
-          'message': 'Generating version header file: <@(_outputs)',
-        },
-      ],
-    },
     {
       # GN version: //chrome/common:constants
       'target_name': 'common_constants',
       'type': 'static_library',
-      'sources': [
-        '<@(common_constants_sources)'
-      ],
       'include_dirs': [
         '<(SHARED_INTERMEDIATE_DIR)',  # Needed by chrome_paths.cc.
       ],
       'dependencies': [
-        'version_header',
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../components/components.gyp:bookmarks_common',
@@ -109,14 +99,10 @@
         {
           'target_name': 'common_constants_win64',
           'type': 'static_library',
-          'sources': [
-            '<@(common_constants_sources)'
-          ],
           'include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)',  # Needed by chrome_paths.cc.
           ],
           'dependencies': [
-            'version_header',
             '../base/base.gyp:base_win64',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64',
             '../components/nacl.gyp:nacl_switches_win64',

diff --git a/chrome/installer/setup/BUILD.gn b/chrome/installer/setup/BUILD.gn
@@ -23,7 +23,7 @@ if (is_win) {
     deps = [
       ":lib",
       "//build/config/sanitizers:deps",
-      "//chrome/common:version_header",
+      "//chrome:version_header",
     ]
   }
 

diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
@@ -40,7 +40,6 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/chrome_version.h"
 #include "chrome/installer/setup/archive_patch_helper.h"
 #include "chrome/installer/setup/install.h"
 #include "chrome/installer/setup/install_worker.h"
@@ -69,6 +68,7 @@
 #include "chrome/installer/util/self_cleaning_temp_dir.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/user_experiment.h"
+#include "version.h"  // NOLINT
 
 #if defined(GOOGLE_CHROME_BUILD)
 #include "chrome/installer/util/updating_app_registration_data.h"

diff --git a/chrome/common/chrome_version.h.in → chrome/version.h.in b/chrome/common/chrome_version.h.in → chrome/version.h.in
diff --git a/chrome_elf/BUILD.gn b/chrome_elf/BUILD.gn
@@ -90,7 +90,7 @@ source_set("breakpad") {
   deps = [
     ":common",
     "//breakpad:breakpad_handler",
-    "//chrome/common:version_header",
+    "//chrome:version_header",
   ]
 }