OLD | NEW |
---|---|
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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/config/win/manifest.gni") | 7 import("//build/config/win/manifest.gni") |
8 import("//build/util/version.gni") | 8 import("//build/util/version.gni") |
9 import("//chrome/version.gni") | 9 import("//chrome/version.gni") |
10 import("//remoting/remoting_enable.gni") | 10 import("//remoting/remoting_enable.gni") |
(...skipping 1129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1140 } | 1140 } |
1141 } else { | 1141 } else { |
1142 group("remoting_me2me_host_archive") { | 1142 group("remoting_me2me_host_archive") { |
1143 } | 1143 } |
1144 } | 1144 } |
1145 | 1145 |
1146 if (is_win && is_chrome_branded) { | 1146 if (is_win && is_chrome_branded) { |
1147 if (target_cpu == "x86") { | 1147 if (target_cpu == "x86") { |
1148 # The script uses "ia32" instead of "x86". | 1148 # The script uses "ia32" instead of "x86". |
1149 msi_script_arch = "ia32" | 1149 msi_script_arch = "ia32" |
1150 | |
joedow
2016/06/20 22:15:04
I think adding a comment would be good on why we o
Hzj_jie
2016/06/21 02:14:55
Done.
| |
1151 # GYP version: remoting/remoting_host_win.gyp:remoting_host_installation | |
1152 action("remoting_host_installation") { | |
1153 deps = [ | |
1154 "//remoting/host:remoting_me2me_host_archive", | |
1155 ] | |
1156 script = "../tools/zip2msi.py" | |
1157 outputs = [ | |
1158 "$root_out_dir/chromoting.msi", | |
1159 ] | |
1160 args = [ | |
1161 "--wix_path", | |
1162 rebase_path("//third_party/wix"), | |
1163 "--intermediate_dir", | |
1164 rebase_path("$root_gen_dir/installation", root_build_dir), | |
1165 "--target_arch", | |
1166 msi_script_arch, | |
1167 rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip", | |
1168 root_build_dir), | |
1169 rebase_path(outputs[0], root_build_dir), | |
1170 ] | |
1171 } | |
1150 } else { | 1172 } else { |
1151 msi_script_arch = target_cpu | 1173 group("remoting_host_installation") { |
joedow
2016/06/20 22:15:04
Is this empty target needed? The GYP change just
Hzj_jie
2016/06/21 02:14:55
In GYP, the default empty target has already been
| |
1152 } | 1174 } |
1153 | |
1154 # GYP version: remoting/remoting_host_win.gyp:remoting_host_installation | |
1155 action("remoting_host_installation") { | |
1156 deps = [ | |
1157 "//remoting/host:remoting_me2me_host_archive", | |
1158 ] | |
1159 script = "../tools/zip2msi.py" | |
1160 outputs = [ | |
1161 "$root_out_dir/chromoting.msi", | |
1162 ] | |
1163 args = [ | |
1164 "--wix_path", | |
1165 rebase_path("//third_party/wix"), | |
1166 "--intermediate_dir", | |
1167 rebase_path("$root_gen_dir/installation", root_build_dir), | |
1168 "--target_arch", | |
1169 msi_script_arch, | |
1170 rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip", | |
1171 root_build_dir), | |
1172 rebase_path(outputs[0], root_build_dir), | |
1173 ] | |
1174 } | 1175 } |
1175 } | 1176 } |
1176 } | 1177 } |
OLD | NEW |