Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(144)

Unified Diff: chrome/BUILD.gn

Issue 874413003: Add targets for generating version files in Windows GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix issues after review, update GYP. Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/common/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/BUILD.gn
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index f4414af23fb420bfe2c67a66a2bdd0384348175c..b6ea4da518280fcb3ab757a58df6fa37d4a41e3e 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -31,6 +31,7 @@ if (!is_android) {
if (is_win) {
sources += [
+ "$target_gen_dir/chrome_exe_version.rc",
"app/chrome_exe_main_win.cc",
"app/client_util.cc",
"app/client_util.h",
@@ -39,6 +40,7 @@ if (!is_android) {
"//content/app/startup_helper_win.cc",
]
deps += [
+ ":chrome_version_resources",
":image_pre_reader",
"//chrome/browser:chrome_process_finder",
"//chrome/chrome_watcher",
@@ -146,7 +148,7 @@ shared_library("main_dll") {
deps += [
# On Windows, link the dependencies (libraries) that make up actual
# Chromium functionality into this .dll.
- #'chrome_version_resources', TODO(GYP)
+ ":chrome_version_resources",
"//chrome/app/theme:chrome_unscaled_resources",
"//chrome_elf",
"//content/app/resources",
@@ -260,6 +262,51 @@ if (is_win) {
output = "$root_gen_dir/version.h"
}
+ process_version("chrome_exe_version") {
+ source = "//chrome/app/chrome_version.rc.version"
+ output = "$target_gen_dir/chrome_exe_version.rc"
+ extra_args = [
+ "-f",
+ rebase_path("app/chrome_exe.ver", root_build_dir),
+ ]
+ }
+
+ process_version("chrome_dll_version") {
+ source = "//chrome/app/chrome_version.rc.version"
+ output = "$target_gen_dir/chrome_dll_version.rc"
+ extra_args = [
+ "-f",
+ rebase_path("app/chrome_dll.ver", root_build_dir),
+ ]
+ }
+
+ process_version("nacl64_exe_version") {
+ source = "//chrome/app/chrome_version.rc.version"
+ output = "$target_gen_dir/nacl64_exe_version.rc"
+ extra_args = [
+ "-f",
+ rebase_path("app/nacl64_exe.ver", root_build_dir),
+ ]
+ }
+
+ process_version("other_version") {
+ source = "//chrome/app/chrome_version.rc.version"
+ output = "$target_gen_dir/other_version.rc"
+ extra_args = [
+ "-f",
+ rebase_path("app/other.ver", root_build_dir),
+ ]
+ }
+
+ group("chrome_version_resources") {
+ deps = [
+ ":chrome_exe_version",
+ ":chrome_dll_version",
+ ":nacl64_exe_version",
+ ":other_version",
+ ]
+ }
+
source_set("image_pre_reader") {
sources = [
"app/image_pre_reader_win.cc",
« no previous file with comments | « no previous file | chrome/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698