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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: remoting/remoting_host_win.gypi

Issue 896743004: [Chromoting] Remove wildcard ('*') from remoting_all target. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unused dep 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
« remoting/remoting_host_mac.gypi ('K') | « remoting/remoting_host_mac.gypi ('k') | remoting/remoting_test.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/remoting_host_win.gypi
diff --git a/remoting/remoting_host_win.gypi b/remoting/remoting_host_win.gypi
index d91505a56436011b18fcccc3a8f115063cb1e9b0..77b44cbb8f59cb7cf7c3533feb765a5d2698ca14 100644
--- a/remoting/remoting_host_win.gypi
+++ b/remoting/remoting_host_win.gypi
@@ -3,18 +3,19 @@
# found in the LICENSE file.
{
- 'variables': {
- 'remoting_host_installer_win_roots': [
- 'host/installer/win/',
- ],
- 'remoting_host_installer_win_files': [
- 'host/installer/win/chromoting.wxs',
- 'host/installer/win/parameters.json',
- ],
- },
-
'conditions': [
['OS=="win"', {
+
kelvinp 2015/02/04 01:01:58 Nit: remove extra blank line
+ 'variables': {
+ 'remoting_host_installer_win_roots': [
+ 'host/installer/win/',
+ ],
+ 'remoting_host_installer_win_files': [
+ 'host/installer/win/chromoting.wxs',
+ 'host/installer/win/parameters.json',
+ ],
+ }, # end of 'variables'
+
kelvinp 2015/02/04 01:01:58 Nit: remove extra blank line
'targets': [
{
'target_name': 'remoting_breakpad_tester',
@@ -478,144 +479,161 @@
],
}, # end of target 'remoting_windows_resources'
], # end of 'targets'
- }], # 'OS=="win"'
- # The host installation is generated only if WiX is available. If
- # component build is used the produced installation will not work due to
- # missing DLLs. We build it anyway to make sure the GYP scripts are executed
- # by the bots.
- ['OS == "win" and wix_exists == "True" and sas_dll_exists == "True"', {
- 'targets': [
- {
- 'target_name': 'remoting_host_installation',
- 'type': 'none',
- 'dependencies': [
- 'remoting_me2me_host_archive',
- ],
- 'sources': [
- '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip',
- ],
- 'outputs': [
- '<(PRODUCT_DIR)/chromoting.msi',
- ],
- 'rules': [
+ 'conditions': [
+ # The host installation is generated only if WiX is available. If
+ # component build is used the produced installation will not work due to
+ # missing DLLs. We build it anyway to make sure the GYP scripts are
+ # executed by the bots.
+ ['wix_exists == "True" and sas_dll_exists == "True"', {
+ 'targets': [
{
- 'rule_name': 'zip2msi',
- 'extension': 'zip',
- 'inputs': [
- 'tools/zip2msi.py',
+ 'target_name': 'remoting_host_installation',
+ 'type': 'none',
+ 'dependencies': [
+ 'remoting_me2me_host_archive',
+ ],
+ 'sources': [
+ '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip',
],
'outputs': [
'<(PRODUCT_DIR)/chromoting.msi',
],
- 'action': [
- 'python', 'tools/zip2msi.py',
- '--wix_path', '<(wix_path)',
- '--intermediate_dir', '<(INTERMEDIATE_DIR)/installation',
- '--target_arch', '<(target_arch)',
- '<(RULE_INPUT_PATH)',
- '<@(_outputs)',
+ 'rules': [
+ {
+ 'rule_name': 'zip2msi',
+ 'extension': 'zip',
+ 'inputs': [
+ 'tools/zip2msi.py',
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/chromoting.msi',
+ ],
+ 'action': [
+ 'python', 'tools/zip2msi.py',
+ '--wix_path', '<(wix_path)',
+ '--intermediate_dir', '<(INTERMEDIATE_DIR)/installation',
+ '--target_arch', '<(target_arch)',
+ '<(RULE_INPUT_PATH)',
+ '<@(_outputs)',
+ ],
+ 'message': 'Generating <@(_outputs)',
+ },
],
- 'message': 'Generating <@(_outputs)',
- },
- ],
- }, # end of target 'remoting_host_installation'
+ }, # end of target 'remoting_host_installation'
- {
- 'target_name': 'remoting_me2me_host_archive',
- 'type': 'none',
- 'dependencies': [
- '<(icu_gyp_path):icudata',
- 'remoting_core',
- 'remoting_desktop',
- 'remoting_it2me_native_messaging_host',
- 'remoting_me2me_host',
- 'remoting_me2me_native_messaging_host',
- 'remoting_native_messaging_manifests',
- ],
- 'compiled_inputs': [
- '<(PRODUCT_DIR)/remote_assistance_host.exe',
- '<(PRODUCT_DIR)/remoting_core.dll',
- '<(PRODUCT_DIR)/remoting_desktop.exe',
- '<(PRODUCT_DIR)/remoting_host.exe',
- '<(PRODUCT_DIR)/remoting_native_messaging_host.exe',
- ],
- 'compiled_inputs_dst': [
- 'files/remote_assistance_host.exe',
- 'files/remoting_core.dll',
- 'files/remoting_desktop.exe',
- 'files/remoting_host.exe',
- 'files/remoting_native_messaging_host.exe',
- ],
- 'conditions': [
- ['buildtype == "Official"', {
- 'defs': [
- 'OFFICIAL_BUILD=1',
+ {
+ 'target_name': 'remoting_me2me_host_archive',
+ 'type': 'none',
+ 'dependencies': [
+ '<(icu_gyp_path):icudata',
+ 'remoting_core',
+ 'remoting_desktop',
+ 'remoting_it2me_native_messaging_host',
+ 'remoting_me2me_host',
+ 'remoting_me2me_native_messaging_host',
+ 'remoting_native_messaging_manifests',
],
- }, { # else buildtype != "Official"
- 'defs': [
- 'OFFICIAL_BUILD=0',
+ 'compiled_inputs': [
+ '<(PRODUCT_DIR)/remote_assistance_host.exe',
+ '<(PRODUCT_DIR)/remoting_core.dll',
+ '<(PRODUCT_DIR)/remoting_desktop.exe',
+ '<(PRODUCT_DIR)/remoting_host.exe',
+ '<(PRODUCT_DIR)/remoting_native_messaging_host.exe',
],
- }],
- ],
- 'defs': [
- 'BRANDING=<(branding)',
- 'DAEMON_CONTROLLER_CLSID={<(daemon_controller_clsid)}',
- 'RDP_DESKTOP_SESSION_CLSID={<(rdp_desktop_session_clsid)}',
- 'VERSION=<(version_full)',
- ],
- 'generated_files': [
- '<@(_compiled_inputs)',
- '<(sas_dll_path)/sas.dll',
- '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_assistance.json',
- '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json',
- 'resources/chromoting.ico',
- '<(PRODUCT_DIR)/icudtl.dat',
- ],
- 'generated_files_dst': [
- '<@(_compiled_inputs_dst)',
- 'files/sas.dll',
- 'files/com.google.chrome.remote_assistance.json',
- 'files/com.google.chrome.remote_desktop.json',
- 'files/chromoting.ico',
- 'files/icudtl.dat',
- ],
- 'zip_path': '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip',
- 'outputs': [
- '<(_zip_path)',
- ],
- 'actions': [
- {
- 'action_name': 'Zip installer files for signing',
- 'temp_dir': '<(INTERMEDIATE_DIR)/installation',
- 'source_files': [
- '<@(remoting_host_installer_win_files)',
+ 'compiled_inputs_dst': [
+ 'files/remote_assistance_host.exe',
+ 'files/remoting_core.dll',
+ 'files/remoting_desktop.exe',
+ 'files/remoting_host.exe',
+ 'files/remoting_native_messaging_host.exe',
],
- 'inputs': [
+ 'conditions': [
+ ['buildtype == "Official"', {
+ 'defs': [
+ 'OFFICIAL_BUILD=1',
+ ],
+ }, { # else buildtype != "Official"
+ 'defs': [
+ 'OFFICIAL_BUILD=0',
+ ],
+ }],
+ ],
+ 'defs': [
+ 'BRANDING=<(branding)',
+ 'DAEMON_CONTROLLER_CLSID={<(daemon_controller_clsid)}',
+ 'RDP_DESKTOP_SESSION_CLSID={<(rdp_desktop_session_clsid)}',
+ 'VERSION=<(version_full)',
+ ],
+ 'generated_files': [
'<@(_compiled_inputs)',
'<(sas_dll_path)/sas.dll',
- '<@(_source_files)',
- 'host/installer/build-installer-archive.py',
+ '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_assistance.json',
+ '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json',
'resources/chromoting.ico',
+ '<(PRODUCT_DIR)/icudtl.dat',
],
- 'outputs': [
- '<(_zip_path)',
+ 'generated_files_dst': [
+ '<@(_compiled_inputs_dst)',
+ 'files/sas.dll',
+ 'files/com.google.chrome.remote_assistance.json',
+ 'files/com.google.chrome.remote_desktop.json',
+ 'files/chromoting.ico',
+ 'files/icudtl.dat',
],
- 'action': [
- 'python', 'host/installer/build-installer-archive.py',
- '<(_temp_dir)',
+ 'zip_path': '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip',
+ 'outputs': [
'<(_zip_path)',
- '--source-file-roots', '<@(remoting_host_installer_win_roots)',
- '--source-files', '<@(_source_files)',
- '--generated-files', '<@(_generated_files)',
- '--generated-files-dst', '<@(_generated_files_dst)',
- '--defs', '<@(_defs)',
],
+ 'actions': [
+ {
+ 'action_name': 'Zip installer files for signing',
+ 'temp_dir': '<(INTERMEDIATE_DIR)/installation',
+ 'source_files': [
+ '<@(remoting_host_installer_win_files)',
+ ],
+ 'inputs': [
+ '<@(_compiled_inputs)',
+ '<(sas_dll_path)/sas.dll',
+ '<@(_source_files)',
+ 'host/installer/build-installer-archive.py',
+ 'resources/chromoting.ico',
+ ],
+ 'outputs': [
+ '<(_zip_path)',
+ ],
+ 'action': [
+ 'python', 'host/installer/build-installer-archive.py',
+ '<(_temp_dir)',
+ '<(_zip_path)',
+ '--source-file-roots', '<@(remoting_host_installer_win_roots)',
+ '--source-files', '<@(_source_files)',
+ '--generated-files', '<@(_generated_files)',
+ '--generated-files-dst', '<@(_generated_files_dst)',
+ '--defs', '<@(_defs)',
+ ],
+ },
+ ], # actions
+ }, # end of target 'remoting_me2me_host_archive'
+ ], # end of 'targets'
+ }, {
+ # Dummy targets for when Wix is not available.
+ 'targets': [
+ {
+ 'target_name': 'remoting_host_installation',
+ 'type': 'none',
},
- ], # actions
- }, # end of target 'remoting_me2me_host_archive'
- ], # end of 'targets'
- }], # '<(wix_path) != ""'
+
+ {
+ 'target_name': 'remoting_me2me_host_archive',
+ 'type': 'none',
+ },
+ ], # end of 'targets'
+ }], # 'wix_exists == "True" and sas_dll_exists == "True"'
+
+ ], # end of 'conditions'
+
+ }], # 'OS=="win"'
], # end of 'conditions'
}
« remoting/remoting_host_mac.gypi ('K') | « remoting/remoting_host_mac.gypi ('k') | remoting/remoting_test.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698