Chromium Code Reviews| 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") |
| 11 import("//remoting/remoting_locales.gni") | 11 import("//remoting/remoting_locales.gni") |
| 12 import("//remoting/remoting_options.gni") | 12 import("//remoting/remoting_options.gni") |
| 13 import("//remoting/remoting_srcs.gni") | 13 import("//remoting/remoting_srcs.gni") |
| 14 import("//remoting/remoting_version.gni") | 14 import("//remoting/remoting_version.gni") |
| 15 import("//remoting/tools/build/remoting_localize.gni") | 15 import("//remoting/tools/build/remoting_localize.gni") |
| 16 | 16 |
| 17 process_version("remoting_version") { | 17 process_version("remoting_version") { |
| 18 template_file = "//remoting/host/version.h.in" | 18 template_file = "//remoting/host/version.h.in" |
| 19 sources = [ | 19 sources = [ |
| 20 branding_path, | 20 branding_path, |
| 21 ] | 21 ] |
| 22 output = "$target_gen_dir/version.h" | 22 output = "$target_gen_dir/version.h" |
| 23 } | 23 } |
| 24 | 24 |
| 25 if (is_win) { | 25 if (is_win) { |
| 26 import("//remoting/host/predefines_win.gni") | 26 import("//remoting/host/predefines_win.gni") |
| 27 } else if (is_mac) { | |
| 28 import("//build/config/mac/rules.gni") | |
| 27 } | 29 } |
| 28 | 30 |
| 29 # Reference this manifest to indicate that a process is per-monitor DPI aware. | 31 # Reference this manifest to indicate that a process is per-monitor DPI aware. |
| 30 dpi_aware_manifest = "//remoting/host/win/dpi_aware.manifest" | 32 dpi_aware_manifest = "//remoting/host/win/dpi_aware.manifest" |
| 31 | 33 |
| 32 # Depending on this target gives a default executable manifest with the addition | 34 # Depending on this target gives a default executable manifest with the addition |
| 33 # of the DPI aware tag. | 35 # of the DPI aware tag. |
| 34 windows_manifest("dpi_aware_exe_manifest") { | 36 windows_manifest("dpi_aware_exe_manifest") { |
| 35 sources = [ | 37 sources = [ |
| 36 as_invoker_manifest, | 38 as_invoker_manifest, |
| (...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 875 ] | 877 ] |
| 876 | 878 |
| 877 output_name = "remoting_host" | 879 output_name = "remoting_host" |
| 878 | 880 |
| 879 ldflags = [ | 881 ldflags = [ |
| 880 "/ENTRY:HostEntryPoint", | 882 "/ENTRY:HostEntryPoint", |
| 881 # "/NODEFAULTLIB", | 883 # "/NODEFAULTLIB", |
| 882 ] | 884 ] |
| 883 } | 885 } |
| 884 } else { | 886 } else { |
| 885 executable("remoting_me2me_host") { | 887 if (is_mac) { |
| 886 configs += [ "//remoting:version" ] | 888 app_target_type = "mac_app_bundle" |
| 889 } else { | |
| 890 app_target_type = "executable" | |
| 891 } | |
| 892 | |
| 893 target(app_target_type, "remoting_me2me_host") { | |
|
Robert Sesek
2016/06/27 20:42:28
This and :native_messaging_host may be missing som
nicholss
2016/06/27 20:47:45
yes, I verified they are, working on adding locali
| |
| 894 if (is_mac) { | |
| 895 extra_configs = [ "//remoting:version" ] | |
| 896 info_plist = "remoting_me2me_host-Info.plist" | |
| 897 } else { | |
| 898 configs += [ "//remoting:version" ] | |
| 899 } | |
| 887 | 900 |
| 888 sources = [ | 901 sources = [ |
| 889 "host_main.cc", | 902 "host_main.cc", |
| 890 "host_main.h", | 903 "host_main.h", |
| 891 ] | 904 ] |
| 892 | 905 |
| 893 if (is_mac && is_chrome_branded && is_official_build) { | 906 if (is_mac && is_chrome_branded && is_official_build) { |
| 894 defines = [ "REMOTING_ENABLE_BREAKPAD" ] | 907 defines = [ "REMOTING_ENABLE_BREAKPAD" ] |
| 895 } | 908 } |
| 896 | 909 |
| (...skipping 26 matching lines...) Expand all Loading... | |
| 923 } | 936 } |
| 924 group("remoting_dev_me2me_host") { | 937 group("remoting_dev_me2me_host") { |
| 925 deps = [ | 938 deps = [ |
| 926 ":remoting_me2me_host", | 939 ":remoting_me2me_host", |
| 927 ":remoting_me2me_host_copy_host", | 940 ":remoting_me2me_host_copy_host", |
| 928 ":remoting_me2me_host_copy_script", | 941 ":remoting_me2me_host_copy_script", |
| 929 ] | 942 ] |
| 930 } | 943 } |
| 931 } | 944 } |
| 932 | 945 |
| 933 executable("native_messaging_host") { | 946 target(app_target_type, "native_messaging_host") { |
| 947 if (is_mac) { | |
| 948 info_plist = "setup/native_messaging_host-Info.plist" | |
| 949 extra_configs = [ "//build/config/compiler:wexit_time_destructors" ] | |
| 950 } else { | |
| 951 configs += [ "//build/config/compiler:wexit_time_destructors" ] | |
| 952 } | |
| 953 | |
| 934 sources = [ | 954 sources = [ |
| 935 "setup/me2me_native_messaging_host_entry_point.cc", | 955 "setup/me2me_native_messaging_host_entry_point.cc", |
| 936 "setup/me2me_native_messaging_host_main.cc", | 956 "setup/me2me_native_messaging_host_main.cc", |
| 937 "setup/me2me_native_messaging_host_main.h", | 957 "setup/me2me_native_messaging_host_main.h", |
| 938 ] | 958 ] |
| 939 | 959 |
| 940 deps = [ | 960 deps = [ |
| 941 ":remoting_infoplist_strings", | 961 ":remoting_infoplist_strings", |
| 942 "//base", | 962 "//base", |
| 943 "//remoting/base:breakpad", | 963 "//remoting/base:breakpad", |
| 944 "//remoting/host", | 964 "//remoting/host", |
| 945 "//remoting/host/native_messaging", | 965 "//remoting/host/native_messaging", |
| 946 "//remoting/host/setup", | 966 "//remoting/host/setup", |
| 947 ] | 967 ] |
| 948 | 968 |
| 949 configs += [ "//build/config/compiler:wexit_time_destructors" ] | |
| 950 | |
| 951 # The |major|, |build| and |patch| versions are inherited from Chrome. | 969 # The |major|, |build| and |patch| versions are inherited from Chrome. |
| 952 # Since Chrome's |minor| version is always '0', we replace it with a | 970 # Since Chrome's |minor| version is always '0', we replace it with a |
| 953 # Chromoting-specific patch version. | 971 # Chromoting-specific patch version. |
| 954 defines = [ "VERSION=" + "$chrome_version_major" + "." + | 972 defines = [ "VERSION=" + "$chrome_version_major" + "." + |
| 955 "$remoting_version_patch" + "." + "$chrome_version_build" + | 973 "$remoting_version_patch" + "." + "$chrome_version_build" + |
| 956 "." + "$chrome_version_patch" ] | 974 "." + "$chrome_version_patch" ] |
| 957 } | 975 } |
| 958 } | 976 } |
| 959 | 977 |
| 960 if (is_chrome_branded && enable_me2me_host && is_linux && !is_chromeos) { | 978 if (is_chrome_branded && enable_me2me_host && is_linux && !is_chromeos) { |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1133 "--defs", | 1151 "--defs", |
| 1134 "BRANDING=$_branding", | 1152 "BRANDING=$_branding", |
| 1135 "DAEMON_CONTROLLER_CLSID={$daemon_controller_clsid}", | 1153 "DAEMON_CONTROLLER_CLSID={$daemon_controller_clsid}", |
| 1136 "RDP_DESKTOP_SESSION_CLSID={$rdp_desktop_session_clsid}", | 1154 "RDP_DESKTOP_SESSION_CLSID={$rdp_desktop_session_clsid}", |
| 1137 "VERSION=$chrome_version_full", | 1155 "VERSION=$chrome_version_full", |
| 1138 "OFFICIAL_BUILD=$_official_build", | 1156 "OFFICIAL_BUILD=$_official_build", |
| 1139 ] | 1157 ] |
| 1140 } | 1158 } |
| 1141 } else if (is_mac) { | 1159 } else if (is_mac) { |
| 1142 import("//build/config/zip.gni") | 1160 import("//build/config/zip.gni") |
| 1143 zip("remoting_me2me_host_archive") { | 1161 |
| 1144 # TODO(crbug.com/622415) - This list of inputs is totally wrong | 1162 action("remoting_me2me_host_archive") { |
| 1145 # and we need the real installer ported over from | 1163 # TODO(GYP) TODO(crbug.com/622415) This needs work and testing. |
| 1146 # remoting/remoting_host_mac.gypi but for now this creates at | 1164 |
| 1147 # least a placeholder .zip file. | 1165 # TODO(GYP) At the very least, we need to add in the localized strings. |
| 1148 inputs = [ | 1166 |
| 1149 # "$root_build_dir/remoting_me2me_host", | 1167 _installer_mac_files = [ |
| 1150 ] | 1168 "installer/mac/do_signing.sh", |
| 1151 output = "$root_build_dir/remoting-me2me-host-mac.zip" | 1169 "installer/mac/do_signing.props", |
| 1152 deps = [ | 1170 "installer/mac/ChromotingHost.pkgproj", |
| 1153 # ":remoting_me2me_host", | 1171 "installer/mac/ChromotingHostService.pkgproj", |
| 1172 "installer/mac/ChromotingHostUninstaller.pkgproj", | |
| 1173 "installer/mac/LaunchAgents/org.chromium.chromoting.plist", | |
| 1174 "installer/mac/PrivilegedHelperTools/org.chromium.chromoting.me2me.sh", | |
| 1175 "installer/mac/Scripts/keystone_install.sh", | |
| 1176 "installer/mac/Scripts/remoting_postflight.sh", | |
| 1177 "installer/mac/Scripts/remoting_preflight.sh", | |
| 1178 "installer/mac/Keystone/GoogleSoftwareUpdate.pkg", | |
| 1179 "//chrome/installer/mac/pkg-dmg", | |
| 1180 ] | |
| 1181 | |
| 1182 inputs = _installer_mac_files | |
| 1183 | |
| 1184 zip_path = "$root_build_dir/remoting-me2me-host-mac.zip" | |
| 1185 | |
| 1186 outputs = [ | |
| 1187 "$root_build_dir/remoting-me2me-host-mac.zip", | |
| 1188 ] | |
| 1189 | |
| 1190 script = "installer/build-installer-archive.py" | |
| 1191 | |
| 1192 # TODO(GYP) TODO(crbug.com/622415): Fill these in. | |
| 1193 host_name_nospace = host_name | |
| 1194 host_service_name_nospace = host_service_name | |
| 1195 host_uninstaller_name_nospace = host_uninstaller_name | |
| 1196 | |
| 1197 args = [ | |
| 1198 rebase_path(target_gen_dir, root_build_dir), | |
| 1199 rebase_path(zip_path, root_build_dir), | |
| 1200 "--source-file-roots", | |
| 1201 rebase_path("installer/mac/", root_build_dir), | |
| 1202 rebase_path("//chrome/installer/mac", root_build_dir), | |
| 1203 "--source-files", | |
| 1204 ] + rebase_path(_installer_mac_files, root_build_dir) + [ | |
| 1205 "--generated-files", | |
| 1206 "remoting_host_prefpane.prefPane", | |
| 1207 "remoting_me2me_host.app", | |
| 1208 "native_messaging_host.app", | |
| 1209 "remote_assistance_host.app", | |
| 1210 "remoting_host_uninstaller.app", | |
| 1211 "remoting/com.google.chrome.remote_desktop.json", | |
| 1212 "remoting/com.google.chrome.remote_assistance.json", | |
| 1213 "--generated-files-dst", | |
| 1214 "PreferencePanes/$prefpane_bundle_name", | |
| 1215 "PrivilegedHelperTools/$host_bundle_name", | |
| 1216 "PrivilegedHelperTools/$host_bundle_name/Contents/MacOS/$native_m essaging_host_bundle_name", | |
| 1217 "PrivilegedHelperTools/$host_bundle_name/Contents/MacOS/$remote_a ssistance_host_bundle_name", | |
| 1218 "Applications/$host_uninstaller_name.app", | |
| 1219 "Config/com.google.chrome.remote_desktop.json", | |
| 1220 "Config/com.google.chrome.remote_assistance.json", | |
| 1221 "--defs", | |
| 1222 "VERSION=$chrome_version_full", | |
| 1223 "VERSION_SHORT=$chrome_version_major.$chrome_version_minor.$chrom e_version_build", | |
| 1224 "VERSION_MAJOR=$chrome_version_major", | |
| 1225 "VERSION_MINOR=$chrome_version_minor", | |
| 1226 "HOST_NAME=$host_name", | |
| 1227 "HOST_BUNDLE_NAME=$me2me_host_bundle_name", | |
| 1228 "HOST_SERVICE_NAME=$host_service_name", | |
| 1229 "HOST_UNINSTALLER_NAME=$host_uninstaller_name", | |
| 1230 "HOST_PKG=$host_name", | |
| 1231 "HOST_SERVICE_PKG=$host_service_name_nospace", | |
| 1232 "HOST_UNINSTALLER_PKG=$host_uninstaller_name_nospace", | |
| 1233 "BUNDLE_ID_HOST=$bundle_prefix.$host_name_nospace", | |
| 1234 "BUNDLE_ID_HOST_SERVICE=$bundle_prefix.$host_service_name_nospace ", | |
| 1235 "BUNDLE_ID_HOST_UNINSTALLER=$bundle_prefix.$host_uninstaller_name _nospace", | |
| 1236 "DMG_VOLUME_NAME=$host_name $chrome_version_full", | |
| 1237 "DMG_FILE_NAME=$host_name_nospace-$chrome_version_full", | |
| 1238 "NATIVE_MESSAGING_HOST_BUNDLE_NAME=$native_messaging_host_bundle_ name", | |
| 1239 "REMOTE_ASSISTANCE_HOST_BUNDLE_NAME=$remote_assistance_host_bundl e_name", | |
| 1240 "PREFPANE_BUNDLE_NAME=$prefpane_bundle_name", | |
| 1241 ] | |
| 1242 | |
| 1243 deps = [ | |
| 1244 ":native_messaging_host", | |
| 1245 ":remoting_host_prefpane.prefPane", | |
| 1246 ":remoting_host_uninstaller", | |
| 1247 ":remoting_me2me_host", | |
| 1248 ":remoting_native_messaging_manifests", | |
| 1249 "//remoting/host/it2me:remote_assistance_host", | |
| 1250 ] | |
| 1251 } | |
| 1252 | |
| 1253 _uninstaller_plist = | |
| 1254 "installer/mac/uninstaller/remoting_uninstaller-Info.plist" | |
| 1255 | |
| 1256 mac_app_bundle("remoting_host_uninstaller") { | |
| 1257 info_plist = _uninstaller_plist | |
| 1258 | |
| 1259 defines = [ | |
| 1260 "HOST_BUNDLE_NAME=\"" + host_bundle_name + "\"", | |
| 1261 "PREFPANE_BUNDLE_NAME=\"" + prefpane_bundle_name + "\"", | |
| 1262 ] | |
| 1263 | |
| 1264 sources = [ | |
| 1265 "constants_mac.cc", | |
| 1266 "constants_mac.h", | |
| 1267 "installer/mac/uninstaller/remoting_uninstaller.h", | |
| 1268 "installer/mac/uninstaller/remoting_uninstaller.mm", | |
| 1269 "installer/mac/uninstaller/remoting_uninstaller_app.h", | |
| 1270 "installer/mac/uninstaller/remoting_uninstaller_app.mm", | |
| 1271 ] | |
| 1272 | |
| 1273 libs = [ | |
| 1274 "Cocoa.framework", | |
| 1275 "CoreFoundation.framework", | |
| 1276 "Security.framework", | |
| 1277 ] | |
| 1278 | |
| 1279 deps = [ | |
| 1280 ":remoting_host_uninstaller_xibs", | |
| 1281 ":remoting_infoplist_strings", | |
| 1282 "//base", | |
| 1283 ] | |
| 1284 } | |
| 1285 | |
| 1286 mac_xib_bundle_data("remoting_host_uninstaller_xibs") { | |
| 1287 sources = [ | |
| 1288 #"installer/mac/uninstaller/remoting_uninstaller.icns", | |
| 1289 "installer/mac/uninstaller/remoting_uninstaller.xib", | |
| 1290 #_uninstaller_plist | |
| 1291 ] | |
| 1292 } | |
| 1293 | |
| 1294 create_bundle("remoting_host_prefpane.prefPane") { | |
| 1295 bundle_root_dir = "$root_build_dir/$target_name/Contents" | |
| 1296 bundle_resources_dir = bundle_root_dir + "/Resources" | |
| 1297 bundle_executable_dir = bundle_root_dir + "/MacOS" | |
| 1298 | |
| 1299 deps = [ | |
| 1300 ":remoting_host_prefpane", | |
| 1301 ":remoting_host_prefpane_bundle_data", | |
| 1302 ":remoting_host_prefpane_plist", | |
| 1303 ":remoting_host_prefpane_xibs", | |
| 1304 ] | |
| 1305 } | |
| 1306 | |
| 1307 bundle_data("remoting_host_prefpane_bundle_data") { | |
| 1308 deps = [ | |
| 1309 ":remoting_host_prefpane", | |
| 1310 ] | |
| 1311 sources = [ | |
| 1312 "$root_build_dir/gen/remoting/host/remoting_host_prefpane", | |
| 1313 ] | |
| 1314 outputs = [ | |
| 1315 "{{bundle_executable_dir}}/remoting_host_prefname", | |
| 1316 ] | |
| 1317 } | |
| 1318 | |
| 1319 loadable_module("remoting_host_prefpane") { | |
| 1320 output_dir = "$root_out_dir/gen/remoting/host" | |
| 1321 output_extension = "" | |
| 1322 | |
| 1323 sources = [ | |
| 1324 "mac/me2me_preference_pane.h", | |
| 1325 "mac/me2me_preference_pane.mm", | |
| 1326 "mac/me2me_preference_pane_confirm_pin.h", | |
| 1327 "mac/me2me_preference_pane_confirm_pin.mm", | |
| 1328 "mac/me2me_preference_pane_disable.h", | |
| 1329 "mac/me2me_preference_pane_disable.mm", | |
| 1330 ] | |
| 1331 | |
| 1332 libs = [ | |
| 1333 "Cocoa.framework", | |
| 1334 "CoreFoundation.framework", | |
| 1335 "PreferencePanes.framework", | |
| 1336 "Security.framework", | |
| 1337 ] | |
| 1338 | |
| 1339 deps = [ | |
| 1340 ":host", | |
| 1341 ":remoting_host_prefpane_xibs", | |
| 1342 ":remoting_infoplist_strings", | |
| 1343 "//remoting/base", | |
| 1344 "//third_party/jsoncpp", | |
| 1345 ] | |
| 1346 } | |
| 1347 | |
| 1348 bundle_data("remoting_host_prefpane_plist") { | |
| 1349 sources = [ | |
| 1350 "mac/me2me_preference_pane-Info.plist", | |
| 1351 ] | |
| 1352 outputs = [ | |
| 1353 "{{bundle_root_dir}}/Info.plist", | |
| 1354 ] | |
| 1355 } | |
| 1356 | |
| 1357 mac_xib_bundle_data("remoting_host_prefpane_xibs") { | |
| 1358 sources = [ | |
| 1359 "mac/me2me_preference_pane.xib", | |
| 1360 #"mac/me2me_preference_pane_confirm_pin.xib", | |
| 1361 #"mac/me2me_preference_pane_disable.xib", | |
| 1362 #"mac/me2me_preference_pane-Info.plist", | |
| 1363 #"//remoting/resources/chromoting128.png", | |
| 1154 ] | 1364 ] |
| 1155 } | 1365 } |
| 1156 } else { | 1366 } else { |
| 1157 group("remoting_me2me_host_archive") { | 1367 group("remoting_me2me_host_archive") { |
| 1158 } | 1368 } |
| 1159 } | 1369 } |
| 1160 | 1370 |
| 1161 if (is_win && is_chrome_branded) { | 1371 if (is_win && is_chrome_branded) { |
| 1162 if (target_cpu == "x86") { | 1372 if (target_cpu == "x86") { |
| 1163 # The script uses "ia32" instead of "x86". | 1373 # The script uses "ia32" instead of "x86". |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 1182 rebase_path("$root_gen_dir/installation", root_build_dir), | 1392 rebase_path("$root_gen_dir/installation", root_build_dir), |
| 1183 "--target_arch", | 1393 "--target_arch", |
| 1184 msi_script_arch, | 1394 msi_script_arch, |
| 1185 rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip", | 1395 rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip", |
| 1186 root_build_dir), | 1396 root_build_dir), |
| 1187 rebase_path(outputs[0], root_build_dir), | 1397 rebase_path(outputs[0], root_build_dir), |
| 1188 ] | 1398 ] |
| 1189 } | 1399 } |
| 1190 } | 1400 } |
| 1191 } | 1401 } |
| OLD | NEW |