Chromium Code Reviews| 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/compiler/compiler.gni") | 5 import("//build/config/compiler/compiler.gni") |
| 6 import("//build/config/features.gni") | 6 import("//build/config/features.gni") |
| 7 import("//build/config/ui.gni") | 7 import("//build/config/ui.gni") |
| 8 import("//build/config/win/visual_studio_version.gni") | 8 import("//build/config/win/visual_studio_version.gni") |
| 9 import("//build_overrides/v8.gni") | 9 import("//build_overrides/v8.gni") |
| 10 import("//chrome/test/mini_installer/mini_installer_test.gni") | 10 import("//chrome/test/mini_installer/mini_installer_test.gni") |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 92 "//chrome/installer/setup", | 92 "//chrome/installer/setup", |
| 93 ] | 93 ] |
| 94 } | 94 } |
| 95 | 95 |
| 96 # Generates a mini installer. | 96 # Generates a mini installer. |
| 97 # | 97 # |
| 98 # out_dir (required) | 98 # out_dir (required) |
| 99 # The output directory out_dir where the mini_installer image should be | 99 # The output directory out_dir where the mini_installer image should be |
| 100 # written. | 100 # written. |
| 101 # | 101 # |
| 102 # chrome_dll_file (required) | |
| 103 # The path to the version of chrome.dll that should be included in the | |
| 104 # installer archive. | |
| 105 # | |
| 106 # chrome_dll_target (required) | |
| 107 # The target that generated chrome_dll_file. | |
| 108 # | |
| 102 # deps (required) | 109 # deps (required) |
| 103 # Normal meaning. | 110 # Normal meaning. |
| 104 template("generate_mini_installer") { | 111 template("generate_mini_installer") { |
| 105 custom_deps = invoker.deps | 112 chrome_dll_file = invoker.chrome_dll_file |
| 113 chrome_dll_target = invoker.chrome_dll_target | |
| 106 output_dir = invoker.out_dir | 114 output_dir = invoker.out_dir |
| 107 | 115 |
| 108 packed_files_rc_file = "$target_gen_dir/$target_name/packed_files.rc" | 116 packed_files_rc_file = "$target_gen_dir/$target_name/packed_files.rc" |
| 109 archive_name = target_name + "_archive" | 117 archive_name = target_name + "_archive" |
| 110 staging_dir = "$target_gen_dir/$target_name" | 118 staging_dir = "$target_gen_dir/$target_name" |
| 111 | 119 |
| 112 action(archive_name) { | 120 action(archive_name) { |
| 113 script = "//chrome/tools/build/win/create_installer_archive.py" | 121 script = "//chrome/tools/build/win/create_installer_archive.py" |
| 114 | 122 |
| 115 release_file = "chrome.release" | 123 release_file = "chrome.release" |
| 116 | 124 |
| 117 inputs = [ | 125 inputs = [ |
| 118 "$output_dir/chrome.dll", | 126 "$chrome_dll_file", |
| 119 "$root_out_dir/chrome.exe", | 127 "$root_out_dir/chrome.exe", |
| 120 "$root_out_dir/locales/en-US.pak", | 128 "$root_out_dir/locales/en-US.pak", |
| 121 "$root_out_dir/setup.exe", | 129 "$root_out_dir/setup.exe", |
| 122 release_file, | 130 release_file, |
| 123 ] | 131 ] |
| 124 | 132 |
| 125 outputs = [ | 133 outputs = [ |
| 126 # See also chrome.packed.7z conditionally added below. | 134 # See also chrome.packed.7z conditionally added below. |
| 127 "$output_dir/chrome.7z", | 135 "$output_dir/chrome.7z", |
| 128 "$output_dir/setup.ex_", | 136 "$output_dir/setup.ex_", |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 148 | 156 |
| 149 # Optional arguments to generate diff installer. | 157 # Optional arguments to generate diff installer. |
| 150 #'--last_chrome_installer=C:/Temp/base', | 158 #'--last_chrome_installer=C:/Temp/base', |
| 151 #'--setup_exe_format=DIFF', | 159 #'--setup_exe_format=DIFF', |
| 152 #'--diff_algorithm=COURGETTE', | 160 #'--diff_algorithm=COURGETTE', |
| 153 | 161 |
| 154 # Optional argument for verbose archiving output. | 162 # Optional argument for verbose archiving output. |
| 155 #'--verbose', | 163 #'--verbose', |
| 156 ] | 164 ] |
| 157 | 165 |
| 158 deps = custom_deps + [ | 166 deps = [ |
| 159 ":chrome_runtime_deps", | 167 ":chrome_runtime_deps", |
| 160 ":setup_runtime_deps", | 168 ":setup_runtime_deps", |
| 161 "//chrome", | 169 "$chrome_dll_target", |
|
brettw
2016/06/28 20:32:22
Just write
chrome_dll_target,
(what you wrote do
| |
| 162 "//chrome/browser/extensions/default_extensions", | 170 "//chrome", |
| 163 "//chrome/installer/setup", | 171 "//chrome/browser/extensions/default_extensions", |
| 164 "//third_party/icu:icudata", | 172 "//chrome/installer/setup", |
| 165 ] | 173 "//third_party/icu:icudata", |
| 174 ] | |
| 166 | 175 |
| 167 if (enable_hidpi) { | 176 if (enable_hidpi) { |
| 168 args += [ "--enable_hidpi=1" ] | 177 args += [ "--enable_hidpi=1" ] |
| 169 } | 178 } |
| 170 if (is_component_build) { | 179 if (is_component_build) { |
| 171 args += [ "--component_build=1" ] | 180 args += [ "--component_build=1" ] |
| 172 } else { | 181 } else { |
| 173 outputs += [ "$output_dir/chrome.packed.7z" ] | 182 outputs += [ "$output_dir/chrome.packed.7z" ] |
| 174 } | 183 } |
| 175 | 184 |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 242 ":lib", | 251 ":lib", |
| 243 ":version", | 252 ":version", |
| 244 "//build/config/sanitizers:deps", | 253 "//build/config/sanitizers:deps", |
| 245 "//build/win:default_exe_manifest", | 254 "//build/win:default_exe_manifest", |
| 246 ] | 255 ] |
| 247 } | 256 } |
| 248 } | 257 } |
| 249 | 258 |
| 250 generate_mini_installer("mini_installer") { | 259 generate_mini_installer("mini_installer") { |
| 251 out_dir = root_out_dir | 260 out_dir = root_out_dir |
| 252 deps = [ | 261 chrome_dll_file = "$root_out_dir/chrome.dll" |
| 253 "//chrome:main_dll", | 262 chrome_dll_target = "//chrome:main_dll" |
| 254 ] | |
| 255 } | 263 } |
| 256 | 264 |
| 257 if (syzygy_optimize) { | 265 if (syzygy_optimize) { |
| 258 generate_mini_installer("mini_installer_syzygy") { | 266 generate_mini_installer("mini_installer_syzygy") { |
| 259 out_dir = "$root_out_dir/syzygy/" | 267 out_dir = "$root_out_dir/syzygy/" |
| 260 deps = [ | 268 chrome_dll_file = "$root_out_dir/syzygy/chrome.dll" |
| 261 "//chrome/tools/build/win/syzygy:chrome_dll_syzygy", | 269 chrome_dll_target = "//chrome/tools/build/win/syzygy:chrome_dll_syzygy" |
| 262 ] | |
| 263 } | 270 } |
| 264 } | 271 } |
| 265 | 272 |
| 266 # next_version_mini_installer.exe can't be generated in an x86 Debug component | 273 # next_version_mini_installer.exe can't be generated in an x86 Debug component |
| 267 # build because it requires too much memory. | 274 # build because it requires too much memory. |
| 268 if (!(is_component_build && is_debug && target_cpu == "x86")) { | 275 if (!(is_component_build && is_debug && target_cpu == "x86")) { |
| 269 action("next_version_mini_installer") { | 276 action("next_version_mini_installer") { |
| 270 script = "generate_next_version_mini_installer.py" | 277 script = "generate_next_version_mini_installer.py" |
| 271 testonly = true | 278 testonly = true |
| 272 inputs = [ | 279 inputs = [ |
| 273 "$root_out_dir/alternate_version_generator.exe", | 280 "$root_out_dir/alternate_version_generator.exe", |
| 274 "$root_out_dir/mini_installer.exe", | 281 "$root_out_dir/mini_installer.exe", |
| 275 ] | 282 ] |
| 276 outputs = [ | 283 outputs = [ |
| 277 "$root_out_dir/$target_name.exe", | 284 "$root_out_dir/$target_name.exe", |
| 278 ] | 285 ] |
| 279 args = [ | 286 args = [ |
| 280 "--out", | 287 "--out", |
| 281 "$target_name.exe", | 288 "$target_name.exe", |
| 282 ] | 289 ] |
| 283 deps = [ | 290 deps = [ |
| 284 ":mini_installer", | 291 ":mini_installer", |
| 285 "//chrome/installer/test:alternate_version_generator", | 292 "//chrome/installer/test:alternate_version_generator", |
| 286 ] | 293 ] |
| 287 } | 294 } |
| 288 } | 295 } |
| OLD | NEW |