OLD | NEW |
---|---|
1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 import("//build/config/features.gni") | 5 import("//build/config/features.gni") |
6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
7 import("//build_overrides/v8.gni") | 7 import("//build_overrides/v8.gni") |
8 import("//chrome/version.gni") | 8 import("//chrome/version.gni") |
9 import("//third_party/icu/config.gni") | 9 import("//third_party/icu/config.gni") |
10 import("//ui/base/ui_features.gni") | 10 import("//ui/base/ui_features.gni") |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
61 ":lib", | 61 ":lib", |
62 ] | 62 ] |
63 deps = [ | 63 deps = [ |
64 "//base", | 64 "//base", |
65 "//testing/gtest", | 65 "//testing/gtest", |
66 ] | 66 ] |
67 } | 67 } |
68 | 68 |
69 packed_files_rc_file = "$target_gen_dir/packed_files.rc" | 69 packed_files_rc_file = "$target_gen_dir/packed_files.rc" |
70 | 70 |
71 # The runtime deps are used to tell create_installer_archive what component | |
72 # build DLLs need to be packaged. | |
gab
2016/06/20 15:15:26
s/component build DLLs need to be packaged/compone
| |
73 setup_runtime_deps = "$root_gen_dir/setup.runtime_deps" | |
74 installer_runtime_deps = "$root_gen_dir/mini_installer.runtime_deps" | |
gab
2016/06/20 15:15:26
s/installer_runtime_deps/component_runtime_deps/
| |
75 | |
76 group("setup_runtime_deps") { | |
77 write_runtime_deps = setup_runtime_deps | |
78 data_deps = [ | |
79 "//chrome/installer/setup", | |
80 ] | |
81 } | |
82 | |
71 action("archive") { | 83 action("archive") { |
72 script = "//chrome/tools/build/win/create_installer_archive.py" | 84 script = "//chrome/tools/build/win/create_installer_archive.py" |
73 | 85 |
74 release_file = "chrome.release" | 86 release_file = "chrome.release" |
75 | 87 |
76 inputs = [ | 88 inputs = [ |
77 "$root_out_dir/chrome.exe", | 89 "$root_out_dir/chrome.exe", |
78 "$root_out_dir/chrome.dll", | 90 "$root_out_dir/chrome.dll", |
79 "$root_out_dir/locales/en-US.pak", | 91 "$root_out_dir/locales/en-US.pak", |
80 "$root_out_dir/setup.exe", | 92 "$root_out_dir/setup.exe", |
(...skipping 10 matching lines...) Expand all Loading... | |
91 "--build_dir", | 103 "--build_dir", |
92 rebase_path(root_out_dir, root_build_dir), | 104 rebase_path(root_out_dir, root_build_dir), |
93 "--staging_dir", | 105 "--staging_dir", |
94 rebase_path(root_gen_dir, root_build_dir), | 106 rebase_path(root_gen_dir, root_build_dir), |
95 "--input_file", | 107 "--input_file", |
96 rebase_path(release_file, root_build_dir), | 108 rebase_path(release_file, root_build_dir), |
97 "--resource_file_path", | 109 "--resource_file_path", |
98 rebase_path(packed_files_rc_file, root_build_dir), | 110 rebase_path(packed_files_rc_file, root_build_dir), |
99 "--target_arch=$current_cpu", | 111 "--target_arch=$current_cpu", |
100 "--distribution=_google_chrome", | 112 "--distribution=_google_chrome", |
113 "--runtime_deps", | |
114 rebase_path(installer_runtime_deps, root_build_dir), | |
115 "--setup_runtime_deps", | |
116 rebase_path(setup_runtime_deps, root_build_dir), | |
101 | 117 |
102 # Optional arguments to generate diff installer. | 118 # Optional arguments to generate diff installer. |
103 #'--last_chrome_installer=C:/Temp/base', | 119 #'--last_chrome_installer=C:/Temp/base', |
104 #'--setup_exe_format=DIFF', | 120 #'--setup_exe_format=DIFF', |
105 #'--diff_algorithm=COURGETTE', | 121 #'--diff_algorithm=COURGETTE', |
106 | 122 |
107 # Optional argument for verbose archiving output. | 123 # Optional argument for verbose archiving output. |
108 #'--verbose', | 124 #'--verbose', |
109 ] | 125 ] |
110 | 126 |
111 deps = [ | 127 deps = [ |
128 ":setup_runtime_deps", | |
112 "//chrome", | 129 "//chrome", |
113 "//chrome:main_dll", | 130 "//chrome:main_dll", |
114 "//chrome/browser/extensions/default_extensions", | 131 "//chrome/browser/extensions/default_extensions", |
115 "//chrome/installer/setup", | 132 "//chrome/installer/setup", |
116 "//third_party/icu:icudata", | 133 "//third_party/icu:icudata", |
117 ] | 134 ] |
118 | 135 |
119 if (enable_hidpi) { | 136 if (enable_hidpi) { |
120 args += [ "--enable_hidpi=1" ] | 137 args += [ "--enable_hidpi=1" ] |
121 } | 138 } |
(...skipping 22 matching lines...) Expand all Loading... | |
144 } | 161 } |
145 | 162 |
146 if (v8_use_external_startup_data) { | 163 if (v8_use_external_startup_data) { |
147 inputs += [ | 164 inputs += [ |
148 "$root_out_dir/natives_blob.bin", | 165 "$root_out_dir/natives_blob.bin", |
149 "$root_out_dir/snapshot_blob.bin", | 166 "$root_out_dir/snapshot_blob.bin", |
150 ] | 167 ] |
151 deps += [ "//v8" ] | 168 deps += [ "//v8" ] |
152 } | 169 } |
153 | 170 |
171 write_runtime_deps = installer_runtime_deps | |
gab
2016/06/20 15:15:26
These actually only need to be the deps for chrome
| |
172 | |
154 depfile = "$target_gen_dir/archive.d" | 173 depfile = "$target_gen_dir/archive.d" |
155 args += [ | 174 args += [ |
156 "--depfile", | 175 "--depfile", |
157 rebase_path(depfile, root_build_dir), | 176 rebase_path(depfile, root_build_dir), |
158 ] | 177 ] |
159 } | 178 } |
160 | 179 |
161 executable("mini_installer") { | 180 executable("mini_installer") { |
162 sources = [ | 181 sources = [ |
163 "mini_installer.cc", | 182 "mini_installer.cc", |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
213 args = [ | 232 args = [ |
214 "--out", | 233 "--out", |
215 "$target_name.exe", | 234 "$target_name.exe", |
216 ] | 235 ] |
217 deps = [ | 236 deps = [ |
218 ":mini_installer", | 237 ":mini_installer", |
219 "//chrome/installer/test:alternate_version_generator", | 238 "//chrome/installer/test:alternate_version_generator", |
220 ] | 239 ] |
221 } | 240 } |
222 } | 241 } |
OLD | NEW |