Skip to content

GitLab

T
tangled
Commit c29be3bc authored by bshe's avatar bshe Committed by Commit bot
Browse files
Options

Revert of [Chromoting] Remove wildcard ('*') from remoting_all target.... 

Revert of [Chromoting] Remove wildcard ('*') from remoting_all target. (patchset #8 id:140001 of https://codereview.chromium.org/896743004/)

Reason for revert:
It cause ChromiumOS.Chromium and PFQ bots to fail. The reason might because chroot didn't have "dpkg-architecture" command. The correct solution might be add "dpkg-architecture" command to chroot. But this CL currently break PFQ and a bunch of bots. So revert it for immediate fix.
See crbug.com/456491

Original issue's description:
> [Chromoting] Remove wildcard ('*') from remoting_all target.
>
> Support for the wildcard is going away in GN, so this helps prepare for the transition away from GYP.
>
> This cl adds dummy targets so that that logic for when the proper targets should be build can be kept in the platform-specific files.
>
> Some of the conditions in the host gyp files needed to be restructured so that the dummy targets would be defined only when necessary.  The updated conditions caused a lot of lines to be re-indented, but the target definitions are the same (except for the new dummy targets).
>
> BUG=
>
> Committed: https://crrev.com/9fb75ed89c0ae4ced679576f9cf030cc8c30e928
> Cr-Commit-Position: refs/heads/master@{#315150}

TBR=kelvinp@chromium.org,garykac@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=

Review URL: https://codereview.chromium.org/905223002

Cr-Commit-Position: refs/heads/master@{#315261}
parent 1e04aae8
Hide whitespace changes
Inline Side-by-side
Showing with 844 additions and 939 deletions
remoting/remoting_all.gyp
View file @ c29be3bc
...@@ -3,76 +3,14 @@ ...@@ -3,76 +3,14 @@
# found in the LICENSE file. # found in the LICENSE file.
{ {
'includes': [
'remoting_enable.gypi',
],
'targets': [ 'targets': [
{ {
'target_name': 'remoting_all', 'target_name': 'remoting_all',
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
'../remoting/remoting.gyp:remoting_base', '../remoting/remoting.gyp:*',
'../remoting/remoting.gyp:remoting_breakpad', '../remoting/app_remoting_webapp.gyp:*',
'../remoting/remoting.gyp:remoting_browser_test_resources',
'../remoting/remoting.gyp:remoting_client',
'../remoting/remoting.gyp:remoting_client_plugin',
'../remoting/remoting.gyp:remoting_protocol',
'../remoting/remoting.gyp:remoting_test_common',
'../remoting/remoting.gyp:remoting_unittests',
'../remoting/remoting.gyp:remoting_resources',
'../remoting/remoting.gyp:remoting_webapp',
'../remoting/remoting.gyp:remoting_webapp_html',
'../remoting/remoting.gyp:remoting_webapp_unittest',
'../remoting/app_remoting_webapp.gyp:ar_sample_app',
],
'conditions' : [
['OS=="win"', {
'dependencies': [
'../remoting/remoting.gyp:remoting_breakpad_tester',
'../remoting/remoting.gyp:remoting_console',
'../remoting/remoting.gyp:remoting_core',
'../remoting/remoting.gyp:remoting_desktop',
'../remoting/remoting.gyp:remoting_host_installation',
'../remoting/remoting.gyp:remoting_windows_resources',
],
}],
['OS=="android"', {
'dependencies': [
'../remoting/remoting.gyp:remoting_android_client_java',
'../remoting/remoting.gyp:remoting_android_resources',
'../remoting/remoting.gyp:remoting_apk',
'../remoting/remoting.gyp:remoting_apk_manifest',
'../remoting/remoting.gyp:remoting_client_jni',
'../remoting/remoting.gyp:remoting_jni_headers',
'../remoting/remoting.gyp:remoting_test_apk',
'../remoting/remoting.gyp:remoting_unittests_apk',
],
}],
['enable_remoting_host==1', {
'dependencies': [
'../remoting/remoting.gyp:remoting_infoplist_strings',
'../remoting/remoting.gyp:remoting_it2me_host_static',
'../remoting/remoting.gyp:remoting_it2me_native_messaging_host',
'../remoting/remoting.gyp:remoting_host',
'../remoting/remoting.gyp:remoting_host_setup_base',
'../remoting/remoting.gyp:remoting_native_messaging_base',
'../remoting/remoting.gyp:remoting_native_messaging_manifests',
'../remoting/remoting.gyp:remoting_perftests',
'../remoting/remoting.gyp:remoting_start_host',
],
}],
['enable_me2me_host==1', {
'dependencies': [
'../remoting/remoting.gyp:remoting_me2me_host',
'../remoting/remoting.gyp:remoting_me2me_host_archive',
'../remoting/remoting.gyp:remoting_me2me_host_static',
'../remoting/remoting.gyp:remoting_me2me_native_messaging_host',
],
}],
], ],
}, # end of target 'remoting_all' }, # end of target 'remoting_all'
], # end of targets ], # end of targets
} }
remoting/remoting_enable.gypi deleted 100644 → 0
View file @ 1e04aae8
# Copyright 2015 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'variables': {
'enable_remoting_host%': 0,
'enable_me2me_host%': 0,
'conditions': [
['OS=="win" or OS=="mac"', {
'enable_remoting_host': 1,
'enable_me2me_host': 1,
}],
['OS=="linux" and chromeos==0 and use_x11==1', {
'enable_remoting_host': 1,
'enable_me2me_host': 1,
}],
['OS=="linux" and chromeos==1', {
'enable_remoting_host': 1,
}],
], # end of conditions
}, # end of variables
}
remoting/remoting_host.gypi
View file @ c29be3bc
...@@ -4,26 +4,32 @@ ...@@ -4,26 +4,32 @@
{ {
'includes': [ 'includes': [
'remoting_enable.gypi', 'remoting_host_linux.gypi',
'remoting_host_mac.gypi',
'remoting_host_win.gypi',
], ],
'conditions': [ 'variables': {
['OS=="mac"', { 'conditions': [
'includes': [ # Remoting host is supported only on Windows, OSX and Linux (with X11).
'remoting_host_mac.gypi', ['OS=="win" or OS=="mac" or (OS=="linux" and use_x11==1)', {
], 'enable_me2me_host': 1,
}], 'enable_it2me_host': 1,
['OS=="win"', { 'enable_remoting_host': 1,
'includes': [ }, {
'remoting_host_win.gypi', 'enable_me2me_host': 0,
], 'enable_it2me_host': 0,
}], 'enable_remoting_host': 0,
['OS=="linux"', { }],
'includes': [ ['chromeos==1', {
'remoting_host_linux.gypi', 'enable_remoting_host': 1,
], 'enable_me2me_host': 0,
}], 'enable_it2me_host': 1,
}],
],
},
'conditions': [
['enable_remoting_host==1', { ['enable_remoting_host==1', {
'targets': [ 'targets': [
{ {
...@@ -387,28 +393,6 @@ ...@@ -387,28 +393,6 @@
]}, ]},
], ],
}, # end of target 'remoting_infoplist_strings' }, # end of target 'remoting_infoplist_strings'
{
# GN version: //remoting/host/it2me:common
'target_name': 'remoting_it2me_host_static',
'type': 'static_library',
'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
'../base/base.gyp:base_i18n',
'../components/components.gyp:policy',
'../net/net.gyp:net',
'remoting_base',
'remoting_host',
'remoting_infoplist_strings',
'remoting_protocol',
'remoting_resources',
],
'defines': [
'VERSION=<(version_full)',
],
'sources': [
'<@(remoting_it2me_host_static_sources)',
],
}, # end of target 'remoting_it2me_host_static'
], # end of 'targets' ], # end of 'targets'
}], # 'enable_remoting_host==1' }], # 'enable_remoting_host==1'
...@@ -447,8 +431,35 @@ ...@@ -447,8 +431,35 @@
}], }],
], # end of 'conditions' ], # end of 'conditions'
}, # end of target 'remoting_me2me_host_static' }, # end of target 'remoting_me2me_host_static'
] # end of targets ] # end of targets
}], # end of enable_me2me_host==1 }], # end of enable_me2me_host==1
['enable_it2me_host==1', {
'targets': [
{
# GN version: //remoting/host/it2me:common
'target_name': 'remoting_it2me_host_static',
'type': 'static_library',
'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
'../base/base.gyp:base_i18n',
'../components/components.gyp:policy',
'../net/net.gyp:net',
'remoting_base',
'remoting_host',
'remoting_infoplist_strings',
'remoting_protocol',
'remoting_resources',
],
'defines': [
'VERSION=<(version_full)',
],
'sources': [
'<@(remoting_it2me_host_static_sources)',
],
}, # end of target 'remoting_it2me_host_static'
] # end of targets
}], # end of 'enable_it2me_host==1'
['OS!="win" and enable_me2me_host==1', { ['OS!="win" and enable_me2me_host==1', {
'targets': [ 'targets': [
...@@ -631,115 +642,104 @@ ...@@ -631,115 +642,104 @@
], # targets ], # targets
}], # end of OS!="win" and enable_me2me_host==1 }], # end of OS!="win" and enable_me2me_host==1
['OS!="win" and enable_remoting_host==1', { ['OS!="win" and enable_it2me_host==1 and chromeos==0', {
'conditions': [ 'targets': [
['chromeos==0', { {
'targets': [ 'target_name': 'remoting_it2me_native_messaging_host',
{ 'type': 'executable',
'target_name': 'remoting_it2me_native_messaging_host', 'product_name': 'remote_assistance_host',
'type': 'executable', 'variables': { 'enable_wexit_time_destructors': 1, },
'product_name': 'remote_assistance_host', 'dependencies': [
'variables': { 'enable_wexit_time_destructors': 1, }, '../base/base.gyp:base',
'remoting_base',
'remoting_breakpad',
'remoting_host',
'remoting_it2me_host_static',
'remoting_native_messaging_base',
'remoting_protocol',
],
'defines': [
'VERSION=<(version_full)',
],
'sources': [
'host/it2me/it2me_native_messaging_host_entry_point.cc',
'host/it2me/it2me_native_messaging_host_main.cc',
'host/it2me/it2me_native_messaging_host_main.h',
],
'conditions': [
['OS=="linux" and chromeos==0 and use_ozone==0', {
'dependencies': [ 'dependencies': [
'../base/base.gyp:base', # Always use GTK on Linux, even for Aura builds.
'remoting_base', '../build/linux/system.gyp:gtk',
'remoting_breakpad',
'remoting_host',
'remoting_it2me_host_static',
'remoting_native_messaging_base',
'remoting_protocol',
], ],
'defines': [ }],
'VERSION=<(version_full)', ['OS=="linux" and use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
], ],
'sources': [ }],
'host/it2me/it2me_native_messaging_host_entry_point.cc', ['OS=="mac"', {
'host/it2me/it2me_native_messaging_host_main.cc', 'mac_bundle': 1,
'host/it2me/it2me_native_messaging_host_main.h', 'variables': {
'host_bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_REMOTE_ASSISTANCE_HOST_BUNDLE_ID@")',
},
'xcode_settings': {
'INFOPLIST_FILE': 'host/it2me/remote_assistance_host-Info.plist',
'INFOPLIST_PREPROCESS': 'YES',
'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_ID="<(host_bundle_id)"',
},
'mac_bundle_resources': [
'<(PRODUCT_DIR)/icudtl.dat',
'host/disconnect_window.xib',
'host/it2me/remote_assistance_host-Info.plist',
'<!@pymod_do_main(remoting_copy_locales -o -p <(OS) -x <(PRODUCT_DIR) <(remoting_locales))',
# Localized strings for 'Info.plist'
'<!@pymod_do_main(remoting_localize --locale_output '
'"<(SHARED_INTERMEDIATE_DIR)/remoting/remote_assistance_host-InfoPlist.strings/@{json_suffix}.lproj/InfoPlist.strings" '
'--print_only <(remoting_locales))',
],
'mac_bundle_resources!': [
'host/it2me/remote_assistance_host-Info.plist',
], ],
'conditions': [ 'conditions': [
['OS=="linux" and chromeos==0 and use_ozone==0', { ['mac_breakpad==1', {
'dependencies': [
# Always use GTK on Linux, even for Aura builds.
'../build/linux/system.gyp:gtk',
],
}],
['OS=="linux" and use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
}],
['OS=="mac"', {
'mac_bundle': 1,
'variables': { 'variables': {
'host_bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_REMOTE_ASSISTANCE_HOST_BUNDLE_ID@")', # A real .dSYM is needed for dump_syms to operate on.
}, 'mac_real_dsym': 1,
'xcode_settings': {
'INFOPLIST_FILE': 'host/it2me/remote_assistance_host-Info.plist',
'INFOPLIST_PREPROCESS': 'YES',
'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_ID="<(host_bundle_id)"',
}, },
'mac_bundle_resources': [ 'copies': [
'<(PRODUCT_DIR)/icudtl.dat', {
'host/disconnect_window.xib', 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Resources',
'host/it2me/remote_assistance_host-Info.plist', 'files': [
'<!@pymod_do_main(remoting_copy_locales -o -p <(OS) -x <(PRODUCT_DIR) <(remoting_locales))', '<(PRODUCT_DIR)/crash_inspector',
'<(PRODUCT_DIR)/crash_report_sender.app'
# Localized strings for 'Info.plist' ],
'<!@pymod_do_main(remoting_localize --locale_output ' },
'"<(SHARED_INTERMEDIATE_DIR)/remoting/remote_assistance_host-InfoPlist.strings/@{json_suffix}.lproj/InfoPlist.strings" '
'--print_only <(remoting_locales))',
], ],
'mac_bundle_resources!': [ 'dependencies': [
'host/it2me/remote_assistance_host-Info.plist', '../breakpad/breakpad.gyp:dump_syms',
], ],
'conditions': [ 'postbuilds': [
['mac_breakpad==1', { {
'postbuild_name': 'Dump Symbols',
'variables': { 'variables': {
# A real .dSYM is needed for dump_syms to operate on. 'dump_product_syms_path':
'mac_real_dsym': 1, 'scripts/mac/dump_product_syms',
}, },
'copies': [ 'action': [
{ '<(dump_product_syms_path)',
'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Resources', '<(version_full)',
'files': [
'<(PRODUCT_DIR)/crash_inspector',
'<(PRODUCT_DIR)/crash_report_sender.app'
],
},
],
'dependencies': [
'../breakpad/breakpad.gyp:dump_syms',
], ],
'postbuilds': [ }, # end of postbuild 'dump_symbols'
{ ], # end of 'postbuilds'
'postbuild_name': 'Dump Symbols', }], # mac_breakpad==1
'variables': { ], # conditions
'dump_product_syms_path': }], # OS=mac
'scripts/mac/dump_product_syms', ],
}, }, # end of target 'remoting_it2me_native_messaging_host'
'action': [ ], # end of 'targets'
'<(dump_product_syms_path)', }], # # end of OS!="win" and enable_it2me_host==1
'<(version_full)',
],
}, # end of postbuild 'dump_symbols'
], # end of 'postbuilds'
}], # mac_breakpad==1
], # conditions
}], # OS=mac
], # end of conditions
}, # end of target 'remoting_it2me_native_messaging_host'
], # targets
}, { # chromeos==0
'targets': [
{
# Dummy target for chromeos==1
'target_name': 'remoting_it2me_native_messaging_host',
'type': 'executable',
},
], # targets
}], # end of chromeos==0
], # end of conditions
}], # end of OS!="win" and enable_remoting_host==1
], # end of 'conditions' ], # end of 'conditions'
} }
remoting/remoting_host_linux.gypi
View file @ c29be3bc
...@@ -3,22 +3,20 @@ ...@@ -3,22 +3,20 @@
# found in the LICENSE file. # found in the LICENSE file.
{ {
'variables': {
'build_deb_script': 'host/installer/linux/build-deb.sh',
'deb_filename': 'host/installer/<!(["<(build_deb_script)", "-p", "-s", "<(DEPTH)"])',
'packaging_outputs': [
'<(deb_filename)',
'<!(echo <(deb_filename) | sed -e "s/.deb$/.changes/")',
'<(PRODUCT_DIR)/remoting_me2me_host.debug',
'<(PRODUCT_DIR)/remoting_start_host.debug',
'<(PRODUCT_DIR)/native_messaging_host.debug',
'<(PRODUCT_DIR)/remote_assistance_host.debug',
]
},
'conditions': [ 'conditions': [
['(branding=="Chrome" and enable_remoting_host==1 and chromeos==0) or (archive_chromoting_tests==1)', { ['OS=="linux" and ( (branding=="Chrome" and enable_remoting_host==1 and chromeos==0) or (archive_chromoting_tests==1) )', {
'variables': {
'build_deb_script': 'host/installer/linux/build-deb.sh',
'deb_filename': 'host/installer/<!(["<(build_deb_script)", "-p", "-s", "<(DEPTH)"])',
'packaging_outputs': [
'<(deb_filename)',
'<!(echo <(deb_filename) | sed -e "s/.deb$/.changes/")',
'<(PRODUCT_DIR)/remoting_me2me_host.debug',
'<(PRODUCT_DIR)/remoting_start_host.debug',
'<(PRODUCT_DIR)/native_messaging_host.debug',
'<(PRODUCT_DIR)/remote_assistance_host.debug',
]
},
'targets': [ 'targets': [
{ {
# Store the installer package(s) into a zip file so there is a # Store the installer package(s) into a zip file so there is a
...@@ -42,7 +40,8 @@ ...@@ -42,7 +40,8 @@
'action': [ 'zip', '-j', '-0', '<@(_outputs)', '<@(_inputs)' ], 'action': [ 'zip', '-j', '-0', '<@(_outputs)', '<@(_inputs)' ],
}, },
], ],
}, { },
{
'target_name': 'remoting_me2me_host_deb_installer', 'target_name': 'remoting_me2me_host_deb_installer',
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
...@@ -76,18 +75,10 @@ ...@@ -76,18 +75,10 @@
}, },
], ],
}, },
], # end of 'targets' ],
}, { }], # OS=="linux" and branding=="Chrome"
# Dummy targets.
'targets': [
{
'target_name': 'remoting_me2me_host_archive',
'type': 'none',
},
], # end of 'targets'
}], # branding=="Chrome"
['enable_remoting_host==1', { ['OS=="linux" and enable_remoting_host==1', {
'targets': [ 'targets': [
# Linux breakpad processing # Linux breakpad processing
# The following target is disabled temporarily because it was failing # The following target is disabled temporarily because it was failing
...@@ -126,7 +117,7 @@ ...@@ -126,7 +117,7 @@
# ], # end of 'conditions' # ], # end of 'conditions'
# }, # end of target 'remoting_linux_symbols' # }, # end of target 'remoting_linux_symbols'
], # end of 'targets' ], # end of 'targets'
}], # 'enable_remoting_host==1' }], # 'OS=="linux"'
], # end of 'conditions' ], # end of 'conditions'
} }
remoting/remoting_host_mac.gypi
View file @ c29be3bc
...@@ -25,233 +25,237 @@ ...@@ -25,233 +25,237 @@
], ],
}, },
'targets': [ 'conditions': [
{ ['OS=="mac"', {
'target_name': 'remoting_host_uninstaller', 'targets': [
'type': 'executable',
'mac_bundle': 1,
'variables': {
'bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_UNINSTALLER_BUNDLE_ID@")',
'host_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_HOST_BUNDLE_NAME@")',
'prefpane_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_PREFPANE_BUNDLE_NAME@")',
},
'dependencies': [
'<(DEPTH)/base/base.gyp:base',
'remoting_infoplist_strings',
],
'defines': [
'HOST_BUNDLE_NAME="<(host_bundle_name)"',
'PREFPANE_BUNDLE_NAME="<(prefpane_bundle_name)"',
],
'sources': [
'host/constants_mac.cc',
'host/constants_mac.h',
'host/installer/mac/uninstaller/remoting_uninstaller.h',
'host/installer/mac/uninstaller/remoting_uninstaller.mm',
'host/installer/mac/uninstaller/remoting_uninstaller_app.h',
'host/installer/mac/uninstaller/remoting_uninstaller_app.mm',
],
'xcode_settings': {
'INFOPLIST_FILE': 'host/installer/mac/uninstaller/remoting_uninstaller-Info.plist',
'INFOPLIST_PREPROCESS': 'YES',
'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_ID="<(bundle_id)"',
},
'mac_bundle_resources': [
'host/installer/mac/uninstaller/remoting_uninstaller.icns',
'host/installer/mac/uninstaller/remoting_uninstaller.xib',
'host/installer/mac/uninstaller/remoting_uninstaller-Info.plist',
# Localized strings for 'Info.plist'
'<!@pymod_do_main(remoting_localize --locale_output '
'"<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_uninstaller-InfoPlist.strings/@{json_suffix}.lproj/InfoPlist.strings" '
'--print_only <(remoting_locales))',
],
'mac_bundle_resources!': [
'host/installer/mac/uninstaller/remoting_uninstaller-Info.plist',
],
}, # end of target 'remoting_host_uninstaller'
# This packages up the files needed for the remoting host installer so
# they can be sent off to be signed.
# We don't build an installer here because we don't have signed binaries.
{
'target_name': 'remoting_me2me_host_archive',
'type': 'none',
'dependencies': [
'remoting_host_prefpane',
'remoting_host_uninstaller',
'remoting_me2me_host',
'remoting_me2me_native_messaging_host',
'remoting_it2me_native_messaging_host',
'remoting_native_messaging_manifests',
],
'variables': {
'host_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_HOST_PACKAGE_NAME@")',
'host_service_name': '<!(python <(version_py_path) -f <(branding_path) -t "@DAEMON_FILE_NAME@")',
'host_uninstaller_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_UNINSTALLER_NAME@")',
'bundle_prefix': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_UNINSTALLER_BUNDLE_PREFIX@")',
'me2me_host_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_HOST_BUNDLE_NAME@")',
'prefpane_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_PREFPANE_BUNDLE_NAME@")',
'native_messaging_host_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_NATIVE_MESSAGING_HOST_BUNDLE_NAME@")',
'remote_assistance_host_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_REMOTE_ASSISTANCE_HOST_BUNDLE_NAME@")',
},
'actions': [
{ {
'action_name': 'Zip installer files for signing', 'target_name': 'remoting_host_uninstaller',
'temp_dir': '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting-me2me-host', 'type': 'executable',
'zip_path': '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip', 'mac_bundle': 1,
'variables': { 'variables': {
'host_name_nospace': '<!(echo <(host_name) | sed "s/ //g")', 'bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_UNINSTALLER_BUNDLE_ID@")',
'host_service_name_nospace': '<!(echo <(host_service_name) | sed "s/ //g")', 'host_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_HOST_BUNDLE_NAME@")',
'host_uninstaller_name_nospace': '<!(echo <(host_uninstaller_name) | sed "s/ //g")', 'prefpane_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_PREFPANE_BUNDLE_NAME@")',
}, },
'generated_files': [ 'dependencies': [
'<(PRODUCT_DIR)/remoting_host_prefpane.prefPane', '<(DEPTH)/base/base.gyp:base',
'<(PRODUCT_DIR)/remoting_me2me_host.app', 'remoting_infoplist_strings',
'<(PRODUCT_DIR)/native_messaging_host.app',
'<(PRODUCT_DIR)/remote_assistance_host.app',
'<(PRODUCT_DIR)/remoting_host_uninstaller.app',
'<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json',
'<(PRODUCT_DIR)/remoting/com.google.chrome.remote_assistance.json',
],
'generated_files_dst': [
'PreferencePanes/<(prefpane_bundle_name)',
'PrivilegedHelperTools/<(me2me_host_bundle_name)',
'PrivilegedHelperTools/<(me2me_host_bundle_name)/Contents/MacOS/<(native_messaging_host_bundle_name)',
'PrivilegedHelperTools/<(me2me_host_bundle_name)/Contents/MacOS/<(remote_assistance_host_bundle_name)',
'Applications/<(host_uninstaller_name).app',
'Config/com.google.chrome.remote_desktop.json',
'Config/com.google.chrome.remote_assistance.json',
], ],
'source_files': [ 'defines': [
'<@(remoting_host_installer_mac_files)', 'HOST_BUNDLE_NAME="<(host_bundle_name)"',
'PREFPANE_BUNDLE_NAME="<(prefpane_bundle_name)"',
], ],
'defs': [ 'sources': [
'VERSION=<(version_full)', 'host/constants_mac.cc',
'VERSION_SHORT=<(version_short)', 'host/constants_mac.h',
'VERSION_MAJOR=<(version_major)', 'host/installer/mac/uninstaller/remoting_uninstaller.h',
'VERSION_MINOR=<(version_minor)', 'host/installer/mac/uninstaller/remoting_uninstaller.mm',
'HOST_NAME=<(host_name)', 'host/installer/mac/uninstaller/remoting_uninstaller_app.h',
'HOST_BUNDLE_NAME=<(me2me_host_bundle_name)', 'host/installer/mac/uninstaller/remoting_uninstaller_app.mm',
'HOST_SERVICE_NAME=<(host_service_name)',
'HOST_UNINSTALLER_NAME=<(host_uninstaller_name)',
'HOST_PKG=<(host_name)',
'HOST_SERVICE_PKG=<(host_service_name_nospace)',
'HOST_UNINSTALLER_PKG=<(host_uninstaller_name_nospace)',
'BUNDLE_ID_HOST=<(bundle_prefix).<(host_name_nospace)',
'BUNDLE_ID_HOST_SERVICE=<(bundle_prefix).<(host_service_name_nospace)',
'BUNDLE_ID_HOST_UNINSTALLER=<(bundle_prefix).<(host_uninstaller_name_nospace)',
'DMG_VOLUME_NAME=<(host_name) <(version_full)',
'DMG_FILE_NAME=<!(echo <(host_name) | sed "s/ //g")-<(version_full)',
'NATIVE_MESSAGING_HOST_BUNDLE_NAME=<(native_messaging_host_bundle_name)',
'REMOTE_ASSISTANCE_HOST_BUNDLE_NAME=<(remote_assistance_host_bundle_name)',
'PREFPANE_BUNDLE_NAME=<(prefpane_bundle_name)',
], ],
'inputs': [ 'xcode_settings': {
'host/installer/build-installer-archive.py', 'INFOPLIST_FILE': 'host/installer/mac/uninstaller/remoting_uninstaller-Info.plist',
'<@(_source_files)', 'INFOPLIST_PREPROCESS': 'YES',
], 'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_ID="<(bundle_id)"',
'outputs': [ },
'<(_zip_path)', 'mac_bundle_resources': [
'host/installer/mac/uninstaller/remoting_uninstaller.icns',
'host/installer/mac/uninstaller/remoting_uninstaller.xib',
'host/installer/mac/uninstaller/remoting_uninstaller-Info.plist',
# Localized strings for 'Info.plist'
'<!@pymod_do_main(remoting_localize --locale_output '
'"<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_uninstaller-InfoPlist.strings/@{json_suffix}.lproj/InfoPlist.strings" '
'--print_only <(remoting_locales))',
], ],
'action': [ 'mac_bundle_resources!': [
'python', 'host/installer/build-installer-archive.py', 'host/installer/mac/uninstaller/remoting_uninstaller-Info.plist',
'<(_temp_dir)',
'<(_zip_path)',
'--source-file-roots', '<@(remoting_host_installer_mac_roots)',
'--source-files', '<@(_source_files)',
'--generated-files', '<@(_generated_files)',
'--generated-files-dst', '<@(_generated_files_dst)',
'--defs', '<@(_defs)',
], ],
}, }, # end of target 'remoting_host_uninstaller'
], # actions
}, # end of target 'remoting_me2me_host_archive'
{ # This packages up the files needed for the remoting host installer so
'target_name': 'remoting_host_prefpane', # they can be sent off to be signed.
'type': 'loadable_module', # We don't build an installer here because we don't have signed binaries.
'mac_bundle': 1, {
'product_extension': 'prefPane', 'target_name': 'remoting_me2me_host_archive',
'variables': { 'type': 'none',
'bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_PREFPANE_BUNDLE_ID@")', 'dependencies': [
'host_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_HOST_BUNDLE_NAME@")', 'remoting_host_prefpane',
'prefpane_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_PREFPANE_BUNDLE_NAME@")', 'remoting_host_uninstaller',
}, 'remoting_me2me_host',
'dependencies': [ 'remoting_me2me_native_messaging_host',
'remoting_infoplist_strings', 'remoting_it2me_native_messaging_host',
], 'remoting_native_messaging_manifests',
'defines': [ ],
'HOST_BUNDLE_NAME="<(host_bundle_name)"', 'variables': {
'PREFPANE_BUNDLE_NAME="<(prefpane_bundle_name)"', 'host_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_HOST_PACKAGE_NAME@")',
'JSON_USE_EXCEPTION=0', 'host_service_name': '<!(python <(version_py_path) -f <(branding_path) -t "@DAEMON_FILE_NAME@")',
], 'host_uninstaller_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_UNINSTALLER_NAME@")',
'include_dirs': [ 'bundle_prefix': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_UNINSTALLER_BUNDLE_PREFIX@")',
'../third_party/jsoncpp/overrides/include/', 'me2me_host_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_HOST_BUNDLE_NAME@")',
'../third_party/jsoncpp/source/include/', 'prefpane_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_PREFPANE_BUNDLE_NAME@")',
'../third_party/jsoncpp/source/src/lib_json/', 'native_messaging_host_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_NATIVE_MESSAGING_HOST_BUNDLE_NAME@")',
], 'remote_assistance_host_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_REMOTE_ASSISTANCE_HOST_BUNDLE_NAME@")',
},
# These source files are included directly, instead of adding target 'actions': [
# dependencies, because the targets are not yet built for 64-bit on {
# Mac OS X - http://crbug.com/125116. 'action_name': 'Zip installer files for signing',
# 'temp_dir': '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting-me2me-host',
# TODO(lambroslambrou): Fix this when Chrome supports building for 'zip_path': '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip',
# Mac OS X 64-bit - http://crbug.com/128122. 'variables': {
'sources': [ 'host_name_nospace': '<!(echo <(host_name) | sed "s/ //g")',
'../third_party/jsoncpp/source/src/lib_json/json_reader.cpp', 'host_service_name_nospace': '<!(echo <(host_service_name) | sed "s/ //g")',
'../third_party/jsoncpp/overrides/src/lib_json/json_value.cpp', 'host_uninstaller_name_nospace': '<!(echo <(host_uninstaller_name) | sed "s/ //g")',
'../third_party/jsoncpp/source/src/lib_json/json_writer.cpp', },
'../third_party/modp_b64/modp_b64.cc', 'generated_files': [
'host/constants_mac.cc', '<(PRODUCT_DIR)/remoting_host_prefpane.prefPane',
'host/constants_mac.h', '<(PRODUCT_DIR)/remoting_me2me_host.app',
'host/host_config_constants.cc', '<(PRODUCT_DIR)/native_messaging_host.app',
'host/mac/me2me_preference_pane.h', '<(PRODUCT_DIR)/remote_assistance_host.app',
'host/mac/me2me_preference_pane.mm', '<(PRODUCT_DIR)/remoting_host_uninstaller.app',
'host/mac/me2me_preference_pane_confirm_pin.h', '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json',
'host/mac/me2me_preference_pane_confirm_pin.mm', '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_assistance.json',
'host/mac/me2me_preference_pane_disable.h', ],
'host/mac/me2me_preference_pane_disable.mm', 'generated_files_dst': [
], 'PreferencePanes/<(prefpane_bundle_name)',
'link_settings': { 'PrivilegedHelperTools/<(me2me_host_bundle_name)',
'libraries': [ 'PrivilegedHelperTools/<(me2me_host_bundle_name)/Contents/MacOS/<(native_messaging_host_bundle_name)',
'$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', 'PrivilegedHelperTools/<(me2me_host_bundle_name)/Contents/MacOS/<(remote_assistance_host_bundle_name)',
'$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', 'Applications/<(host_uninstaller_name).app',
'$(SDKROOT)/System/Library/Frameworks/PreferencePanes.framework', 'Config/com.google.chrome.remote_desktop.json',
'$(SDKROOT)/System/Library/Frameworks/Security.framework', 'Config/com.google.chrome.remote_assistance.json',
], ],
}, 'source_files': [
'xcode_settings': { '<@(remoting_host_installer_mac_files)',
'ARCHS': ['i386', 'x86_64'], ],
'GCC_ENABLE_OBJC_GC': 'supported', 'defs': [
'INFOPLIST_FILE': 'host/mac/me2me_preference_pane-Info.plist', 'VERSION=<(version_full)',
'INFOPLIST_PREPROCESS': 'YES', 'VERSION_SHORT=<(version_short)',
'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_ID="<(bundle_id)"', 'VERSION_MAJOR=<(version_major)',
}, 'VERSION_MINOR=<(version_minor)',
'mac_bundle_resources': [ 'HOST_NAME=<(host_name)',
'host/mac/me2me_preference_pane.xib', 'HOST_BUNDLE_NAME=<(me2me_host_bundle_name)',
'host/mac/me2me_preference_pane_confirm_pin.xib', 'HOST_SERVICE_NAME=<(host_service_name)',
'host/mac/me2me_preference_pane_disable.xib', 'HOST_UNINSTALLER_NAME=<(host_uninstaller_name)',
'host/mac/me2me_preference_pane-Info.plist', 'HOST_PKG=<(host_name)',
'resources/chromoting128.png', 'HOST_SERVICE_PKG=<(host_service_name_nospace)',
'HOST_UNINSTALLER_PKG=<(host_uninstaller_name_nospace)',
'BUNDLE_ID_HOST=<(bundle_prefix).<(host_name_nospace)',
'BUNDLE_ID_HOST_SERVICE=<(bundle_prefix).<(host_service_name_nospace)',
'BUNDLE_ID_HOST_UNINSTALLER=<(bundle_prefix).<(host_uninstaller_name_nospace)',
'DMG_VOLUME_NAME=<(host_name) <(version_full)',
'DMG_FILE_NAME=<!(echo <(host_name) | sed "s/ //g")-<(version_full)',
'NATIVE_MESSAGING_HOST_BUNDLE_NAME=<(native_messaging_host_bundle_name)',
'REMOTE_ASSISTANCE_HOST_BUNDLE_NAME=<(remote_assistance_host_bundle_name)',
'PREFPANE_BUNDLE_NAME=<(prefpane_bundle_name)',
],
'inputs': [
'host/installer/build-installer-archive.py',
'<@(_source_files)',
],
'outputs': [
'<(_zip_path)',
],
'action': [
'python', 'host/installer/build-installer-archive.py',
'<(_temp_dir)',
'<(_zip_path)',
'--source-file-roots', '<@(remoting_host_installer_mac_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'
# Localized strings for 'Info.plist' {
'<!@pymod_do_main(remoting_localize --locale_output ' 'target_name': 'remoting_host_prefpane',
'"<(SHARED_INTERMEDIATE_DIR)/remoting/me2me_preference_pane-InfoPlist.strings/@{json_suffix}.lproj/InfoPlist.strings" ' 'type': 'loadable_module',
'--print_only <(remoting_locales))', 'mac_bundle': 1,
], 'product_extension': 'prefPane',
'mac_bundle_resources!': [
'host/mac/me2me_preference_pane-Info.plist',
],
'conditions': [
['mac_breakpad==1', {
'variables': { 'variables': {
# A real .dSYM is needed for dump_syms to operate on. 'bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_PREFPANE_BUNDLE_ID@")',
'mac_real_dsym': 1, 'host_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_HOST_BUNDLE_NAME@")',
'prefpane_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_PREFPANE_BUNDLE_NAME@")',
}, },
}], # 'mac_breakpad==1' 'dependencies': [
], # conditions 'remoting_infoplist_strings',
}, # end of target 'remoting_host_prefpane' ],
], # end of 'targets' 'defines': [
'HOST_BUNDLE_NAME="<(host_bundle_name)"',
'PREFPANE_BUNDLE_NAME="<(prefpane_bundle_name)"',
'JSON_USE_EXCEPTION=0',
],
'include_dirs': [
'../third_party/jsoncpp/overrides/include/',
'../third_party/jsoncpp/source/include/',
'../third_party/jsoncpp/source/src/lib_json/',
],
# These source files are included directly, instead of adding target
# dependencies, because the targets are not yet built for 64-bit on
# Mac OS X - http://crbug.com/125116.
#
# TODO(lambroslambrou): Fix this when Chrome supports building for
# Mac OS X 64-bit - http://crbug.com/128122.
'sources': [
'../third_party/jsoncpp/source/src/lib_json/json_reader.cpp',
'../third_party/jsoncpp/overrides/src/lib_json/json_value.cpp',
'../third_party/jsoncpp/source/src/lib_json/json_writer.cpp',
'../third_party/modp_b64/modp_b64.cc',
'host/constants_mac.cc',
'host/constants_mac.h',
'host/host_config_constants.cc',
'host/mac/me2me_preference_pane.h',
'host/mac/me2me_preference_pane.mm',
'host/mac/me2me_preference_pane_confirm_pin.h',
'host/mac/me2me_preference_pane_confirm_pin.mm',
'host/mac/me2me_preference_pane_disable.h',
'host/mac/me2me_preference_pane_disable.mm',
],
'link_settings': {
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
'$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
'$(SDKROOT)/System/Library/Frameworks/PreferencePanes.framework',
'$(SDKROOT)/System/Library/Frameworks/Security.framework',
],
},
'xcode_settings': {
'ARCHS': ['i386', 'x86_64'],
'GCC_ENABLE_OBJC_GC': 'supported',
'INFOPLIST_FILE': 'host/mac/me2me_preference_pane-Info.plist',
'INFOPLIST_PREPROCESS': 'YES',
'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_ID="<(bundle_id)"',
},
'mac_bundle_resources': [
'host/mac/me2me_preference_pane.xib',
'host/mac/me2me_preference_pane_confirm_pin.xib',
'host/mac/me2me_preference_pane_disable.xib',
'host/mac/me2me_preference_pane-Info.plist',
'resources/chromoting128.png',
# Localized strings for 'Info.plist'
'<!@pymod_do_main(remoting_localize --locale_output '
'"<(SHARED_INTERMEDIATE_DIR)/remoting/me2me_preference_pane-InfoPlist.strings/@{json_suffix}.lproj/InfoPlist.strings" '
'--print_only <(remoting_locales))',
],
'mac_bundle_resources!': [
'host/mac/me2me_preference_pane-Info.plist',
],
'conditions': [
['mac_breakpad==1', {
'variables': {
# A real .dSYM is needed for dump_syms to operate on.
'mac_real_dsym': 1,
},
}], # 'mac_breakpad==1'
], # conditions
}, # end of target 'remoting_host_prefpane'
], # end of 'targets'
}], # 'OS=="mac"'
], # end of 'conditions'
} }
remoting/remoting_host_win.gypi
View file @ c29be3bc
...@@ -11,478 +11,480 @@ ...@@ -11,478 +11,480 @@
'host/installer/win/chromoting.wxs', 'host/installer/win/chromoting.wxs',
'host/installer/win/parameters.json', 'host/installer/win/parameters.json',
], ],
}, # end of 'variables' },
'targets': [ 'conditions': [
{ ['OS=="win"', {
'target_name': 'remoting_breakpad_tester', 'targets': [
'type': 'executable',
'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
'../base/base.gyp:base',
'remoting_host',
],
'sources': [
'tools/breakpad_tester_win.cc',
],
}, # end of target 'remoting_breakpad_tester'
{
'target_name': 'remoting_lib_idl',
'type': 'static_library',
'sources': [
'host/win/chromoting_lib_idl.templ',
'<(SHARED_INTERMEDIATE_DIR)/remoting/host/chromoting_lib.h',
'<(SHARED_INTERMEDIATE_DIR)/remoting/host/chromoting_lib.idl',
'<(SHARED_INTERMEDIATE_DIR)/remoting/host/chromoting_lib_i.c',
],
# This target exports a hard dependency because dependent targets may
# include chromoting_lib.h, a generated header.
'hard_dependency': 1,
'msvs_settings': {
'VCMIDLTool': {
'OutputDirectory': '<(SHARED_INTERMEDIATE_DIR)/remoting/host',
},
},
'direct_dependent_settings': {
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)',
],
},
'rules': [
{ {
'rule_name': 'generate_idl', 'target_name': 'remoting_breakpad_tester',
'extension': 'templ', 'type': 'executable',
'outputs': [ 'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
'../base/base.gyp:base',
'remoting_host',
],
'sources': [
'tools/breakpad_tester_win.cc',
],
}, # end of target 'remoting_breakpad_tester'
{
'target_name': 'remoting_lib_idl',
'type': 'static_library',
'sources': [
'host/win/chromoting_lib_idl.templ',
'<(SHARED_INTERMEDIATE_DIR)/remoting/host/chromoting_lib.h',
'<(SHARED_INTERMEDIATE_DIR)/remoting/host/chromoting_lib.idl', '<(SHARED_INTERMEDIATE_DIR)/remoting/host/chromoting_lib.idl',
'<(SHARED_INTERMEDIATE_DIR)/remoting/host/chromoting_lib_i.c',
],
# This target exports a hard dependency because dependent targets may
# include chromoting_lib.h, a generated header.
'hard_dependency': 1,
'msvs_settings': {
'VCMIDLTool': {
'OutputDirectory': '<(SHARED_INTERMEDIATE_DIR)/remoting/host',
},
},
'direct_dependent_settings': {
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)',
],
},
'rules': [
{
'rule_name': 'generate_idl',
'extension': 'templ',
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/remoting/host/chromoting_lib.idl',
],
'action': [
'python', '<(version_py_path)',
'-e', "DAEMON_CONTROLLER_CLSID='<(daemon_controller_clsid)'",
'-e', "RDP_DESKTOP_SESSION_CLSID='<(rdp_desktop_session_clsid)'",
'<(RULE_INPUT_PATH)',
'<@(_outputs)',
],
'process_outputs_as_sources': 1,
'message': 'Generating <@(_outputs)',
},
], ],
'action': [ }, # end of target 'remoting_lib_idl'
'python', '<(version_py_path)',
'-e', "DAEMON_CONTROLLER_CLSID='<(daemon_controller_clsid)'",
'-e', "RDP_DESKTOP_SESSION_CLSID='<(rdp_desktop_session_clsid)'",
'<(RULE_INPUT_PATH)',
'<@(_outputs)',
],
'process_outputs_as_sources': 1,
'message': 'Generating <@(_outputs)',
},
],
}, # end of target 'remoting_lib_idl'
# remoting_lib_ps builds the proxy/stub code generated by MIDL (see # remoting_lib_ps builds the proxy/stub code generated by MIDL (see
# remoting_lib_idl). # remoting_lib_idl).
{ {
'target_name': 'remoting_lib_ps', 'target_name': 'remoting_lib_ps',
'type': 'static_library', 'type': 'static_library',
'defines': [ 'defines': [
# Prepend 'Ps' to the MIDL-generated routines. This includes # Prepend 'Ps' to the MIDL-generated routines. This includes
# DllGetClassObject, DllCanUnloadNow, DllRegisterServer, # DllGetClassObject, DllCanUnloadNow, DllRegisterServer,
# DllUnregisterServer, and DllMain. # DllUnregisterServer, and DllMain.
'ENTRY_PREFIX=Ps', 'ENTRY_PREFIX=Ps',
'REGISTER_PROXY_DLL', 'REGISTER_PROXY_DLL',
], ],
'dependencies': [ 'dependencies': [
'remoting_lib_idl', 'remoting_lib_idl',
], ],
'sources': [ 'sources': [
'<(SHARED_INTERMEDIATE_DIR)/remoting/host/chromoting_lib.dlldata.c', '<(SHARED_INTERMEDIATE_DIR)/remoting/host/chromoting_lib.dlldata.c',
'<(SHARED_INTERMEDIATE_DIR)/remoting/host/chromoting_lib_p.c', '<(SHARED_INTERMEDIATE_DIR)/remoting/host/chromoting_lib_p.c',
], ],
}, # end of target 'remoting_lib_ps' }, # end of target 'remoting_lib_ps'
# Regenerates 'chromoting_lib.rc' (used to embed 'chromoting_lib.tlb' # Regenerates 'chromoting_lib.rc' (used to embed 'chromoting_lib.tlb'
# into remoting_core.dll's resources) every time # into remoting_core.dll's resources) every time
# 'chromoting_lib_idl.templ' changes. Making remoting_core depend on # 'chromoting_lib_idl.templ' changes. Making remoting_core depend on
# both this and 'remoting_lib_idl' targets ensures that the resorces # both this and 'remoting_lib_idl' targets ensures that the resorces
# are rebuilt every time the type library is updated. GYP alone is # are rebuilt every time the type library is updated. GYP alone is
# not smart enough to figure out this dependency on its own. # not smart enough to figure out this dependency on its own.
{
'target_name': 'remoting_lib_rc',
'type': 'none',
'sources': [
'host/win/chromoting_lib_idl.templ',
],
'hard_dependency': 1,
'direct_dependent_settings': {
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)',
],
},
'rules': [
{ {
'rule_name': 'generate_rc', 'target_name': 'remoting_lib_rc',
'extension': 'templ', 'type': 'none',
'outputs': [ 'sources': [
'host/win/chromoting_lib_idl.templ',
],
'hard_dependency': 1,
'direct_dependent_settings': {
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)',
],
},
'rules': [
{
'rule_name': 'generate_rc',
'extension': 'templ',
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/remoting/host/chromoting_lib.rc',
],
'action': [
'echo 1 typelib "remoting/host/chromoting_lib.tlb" > <@(_outputs)',
],
'message': 'Generating <@(_outputs)',
},
],
}, # end of target 'remoting_lib_rc'
# The only difference between |remoting_console.exe| and
# |remoting_host.exe| is that the former is a console application.
# |remoting_console.exe| is used for debugging purposes.
{
'target_name': 'remoting_console',
'type': 'executable',
'variables': { 'enable_wexit_time_destructors': 1, },
'defines': [
'BINARY=BINARY_HOST_ME2ME',
],
'dependencies': [
'remoting_core',
'remoting_windows_resources',
],
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/remoting/version.rc',
'host/win/entry_point.cc',
],
'msvs_settings': {
'VCManifestTool': {
'AdditionalManifestFiles': [
'host/win/dpi_aware.manifest',
],
},
'VCLinkerTool': {
'EntryPointSymbol': 'HostEntryPoint',
'IgnoreAllDefaultLibraries': 'true',
'SubSystem': '1', # /SUBSYSTEM:CONSOLE
},
},
}, # end of target 'remoting_console'
{
'target_name': 'remoting_core',
'type': 'shared_library',
'variables': { 'enable_wexit_time_destructors': 1, },
'defines' : [
'_ATL_APARTMENT_THREADED',
'_ATL_CSTRING_EXPLICIT_CONSTRUCTORS',
'_ATL_NO_AUTOMATIC_NAMESPACE',
'_ATL_NO_EXCEPTIONS',
'BINARY=BINARY_CORE',
'DAEMON_CONTROLLER_CLSID="{<(daemon_controller_clsid)}"',
'RDP_DESKTOP_SESSION_CLSID="{<(rdp_desktop_session_clsid)}"',
'HOST_IMPLEMENTATION',
'ISOLATION_AWARE_ENABLED=1',
'STRICT',
'VERSION=<(version_full)',
],
'dependencies': [
'../base/base.gyp:base',
'../base/base.gyp:base_static',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../ipc/ipc.gyp:ipc',
'../net/net.gyp:net',
'../third_party/webrtc/modules/modules.gyp:desktop_capture',
'remoting_base',
'remoting_breakpad',
'remoting_host',
'remoting_host_setup_base',
'remoting_it2me_host_static',
'remoting_lib_idl',
'remoting_lib_ps',
'remoting_lib_rc',
'remoting_me2me_host_static',
'remoting_native_messaging_base',
'remoting_protocol',
'remoting_windows_resources',
],
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/remoting/core.rc',
'<(SHARED_INTERMEDIATE_DIR)/remoting/host/chromoting_lib.rc', '<(SHARED_INTERMEDIATE_DIR)/remoting/host/chromoting_lib.rc',
'<(SHARED_INTERMEDIATE_DIR)/remoting/host/remoting_host_messages.rc',
'<(SHARED_INTERMEDIATE_DIR)/remoting/version.rc',
'host/desktop_process_main.cc',
'host/host_main.cc',
'host/host_main.h',
'host/it2me/it2me_native_messaging_host_main.cc',
'host/it2me/it2me_native_messaging_host_main.h',
'host/setup/me2me_native_messaging_host_main.cc',
'host/setup/me2me_native_messaging_host_main.h',
'host/verify_config_window_win.cc',
'host/verify_config_window_win.h',
'host/win/chromoting_module.cc',
'host/win/chromoting_module.h',
'host/win/core.cc',
'host/win/core_resource.h',
'host/win/elevated_controller.cc',
'host/win/elevated_controller.h',
'host/win/host_service.cc',
'host/win/host_service.h',
'host/win/omaha.cc',
'host/win/omaha.h',
'host/win/rdp_desktop_session.cc',
'host/win/rdp_desktop_session.h',
'host/win/unprivileged_process_delegate.cc',
'host/win/unprivileged_process_delegate.h',
'host/win/worker_process_launcher.cc',
'host/win/worker_process_launcher.h',
'host/win/wts_session_process_delegate.cc',
'host/win/wts_session_process_delegate.h',
'host/worker_process_ipc_delegate.h',
], ],
'action': [ 'msvs_settings': {
'echo 1 typelib "remoting/host/chromoting_lib.tlb" > <@(_outputs)', 'VCManifestTool': {
], 'EmbedManifest': 'true',
'message': 'Generating <@(_outputs)', 'AdditionalManifestFiles': [
}, 'host/win/common-controls.manifest',
], ],
}, # end of target 'remoting_lib_rc'
# The only difference between |remoting_console.exe| and
# |remoting_host.exe| is that the former is a console application.
# |remoting_console.exe| is used for debugging purposes.
{
'target_name': 'remoting_console',
'type': 'executable',
'variables': { 'enable_wexit_time_destructors': 1, },
'defines': [
'BINARY=BINARY_HOST_ME2ME',
],
'dependencies': [
'remoting_core',
'remoting_windows_resources',
],
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/remoting/version.rc',
'host/win/entry_point.cc',
],
'msvs_settings': {
'VCManifestTool': {
'AdditionalManifestFiles': [
'host/win/dpi_aware.manifest',
],
},
'VCLinkerTool': {
'EntryPointSymbol': 'HostEntryPoint',
'IgnoreAllDefaultLibraries': 'true',
'SubSystem': '1', # /SUBSYSTEM:CONSOLE
},
},
}, # end of target 'remoting_console'
{
'target_name': 'remoting_core',
'type': 'shared_library',
'variables': { 'enable_wexit_time_destructors': 1, },
'defines' : [
'_ATL_APARTMENT_THREADED',
'_ATL_CSTRING_EXPLICIT_CONSTRUCTORS',
'_ATL_NO_AUTOMATIC_NAMESPACE',
'_ATL_NO_EXCEPTIONS',
'BINARY=BINARY_CORE',
'DAEMON_CONTROLLER_CLSID="{<(daemon_controller_clsid)}"',
'RDP_DESKTOP_SESSION_CLSID="{<(rdp_desktop_session_clsid)}"',
'HOST_IMPLEMENTATION',
'ISOLATION_AWARE_ENABLED=1',
'STRICT',
'VERSION=<(version_full)',
],
'dependencies': [
'../base/base.gyp:base',
'../base/base.gyp:base_static',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../ipc/ipc.gyp:ipc',
'../net/net.gyp:net',
'../third_party/webrtc/modules/modules.gyp:desktop_capture',
'remoting_base',
'remoting_breakpad',
'remoting_host',
'remoting_host_setup_base',
'remoting_it2me_host_static',
'remoting_lib_idl',
'remoting_lib_ps',
'remoting_lib_rc',
'remoting_me2me_host_static',
'remoting_native_messaging_base',
'remoting_protocol',
'remoting_windows_resources',
],
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/remoting/core.rc',
'<(SHARED_INTERMEDIATE_DIR)/remoting/host/chromoting_lib.rc',
'<(SHARED_INTERMEDIATE_DIR)/remoting/host/remoting_host_messages.rc',
'<(SHARED_INTERMEDIATE_DIR)/remoting/version.rc',
'host/desktop_process_main.cc',
'host/host_main.cc',
'host/host_main.h',
'host/it2me/it2me_native_messaging_host_main.cc',
'host/it2me/it2me_native_messaging_host_main.h',
'host/setup/me2me_native_messaging_host_main.cc',
'host/setup/me2me_native_messaging_host_main.h',
'host/verify_config_window_win.cc',
'host/verify_config_window_win.h',
'host/win/chromoting_module.cc',
'host/win/chromoting_module.h',
'host/win/core.cc',
'host/win/core_resource.h',
'host/win/elevated_controller.cc',
'host/win/elevated_controller.h',
'host/win/host_service.cc',
'host/win/host_service.h',
'host/win/omaha.cc',
'host/win/omaha.h',
'host/win/rdp_desktop_session.cc',
'host/win/rdp_desktop_session.h',
'host/win/unprivileged_process_delegate.cc',
'host/win/unprivileged_process_delegate.h',
'host/win/worker_process_launcher.cc',
'host/win/worker_process_launcher.h',
'host/win/wts_session_process_delegate.cc',
'host/win/wts_session_process_delegate.h',
'host/worker_process_ipc_delegate.h',
],
'msvs_settings': {
'VCManifestTool': {
'EmbedManifest': 'true',
'AdditionalManifestFiles': [
'host/win/common-controls.manifest',
],
},
'VCLinkerTool': {
'AdditionalDependencies': [
'comctl32.lib',
'rpcns4.lib',
'rpcrt4.lib',
'uuid.lib',
'wtsapi32.lib',
],
'AdditionalOptions': [
# Export the proxy/stub entry points. Note that the generated
# routines have 'Ps' prefix to avoid conflicts with our own
# DllMain().
'/EXPORT:DllGetClassObject=PsDllGetClassObject,PRIVATE',
'/EXPORT:DllCanUnloadNow=PsDllCanUnloadNow,PRIVATE',
'/EXPORT:DllRegisterServer=PsDllRegisterServer,PRIVATE',
'/EXPORT:DllUnregisterServer=PsDllUnregisterServer,PRIVATE',
],
},
'conditions': [
['clang==1', {
# atlapp.h contains a global "using namespace WTL;".
# TODO: Remove once remoting/host/verify_config_window_win.h no
# longer depends on atlapp.h, http://crbug.com/5027
'VCCLCompilerTool': {
'AdditionalOptions': ['-Wno-header-hygiene'],
}, },
}], 'VCLinkerTool': {
], 'AdditionalDependencies': [
}, 'comctl32.lib',
}, # end of target 'remoting_core' 'rpcns4.lib',
{ 'rpcrt4.lib',
'target_name': 'remoting_desktop', 'uuid.lib',
'type': 'executable', 'wtsapi32.lib',
'variables': { 'enable_wexit_time_destructors': 1, }, ],
'defines': [ 'AdditionalOptions': [
'BINARY=BINARY_DESKTOP', # Export the proxy/stub entry points. Note that the generated
], # routines have 'Ps' prefix to avoid conflicts with our own
'dependencies': [ # DllMain().
'remoting_core', '/EXPORT:DllGetClassObject=PsDllGetClassObject,PRIVATE',
'remoting_windows_resources', '/EXPORT:DllCanUnloadNow=PsDllCanUnloadNow,PRIVATE',
], '/EXPORT:DllRegisterServer=PsDllRegisterServer,PRIVATE',
'sources': [ '/EXPORT:DllUnregisterServer=PsDllUnregisterServer,PRIVATE',
'<(SHARED_INTERMEDIATE_DIR)/remoting/version.rc', ],
'host/win/entry_point.cc', },
], 'conditions': [
'msvs_settings': { ['clang==1', {
'VCManifestTool': { # atlapp.h contains a global "using namespace WTL;".
'AdditionalManifestFiles': [ # TODO: Remove once remoting/host/verify_config_window_win.h no
'host/win/dpi_aware.manifest', # longer depends on atlapp.h, http://crbug.com/5027
], 'VCCLCompilerTool': {
}, 'AdditionalOptions': ['-Wno-header-hygiene'],
'VCLinkerTool': { },
'EnableUAC': 'true', }],
# Add 'level="requireAdministrator" uiAccess="true"' to ],
# the manifest only for the official builds because it requires },
# the binary to be signed to work. }, # end of target 'remoting_core'
'conditions': [ {
['buildtype == "Official"', { 'target_name': 'remoting_desktop',
'UACExecutionLevel': 2, 'type': 'executable',
'UACUIAccess': 'true', 'variables': { 'enable_wexit_time_destructors': 1, },
}], 'defines': [
'BINARY=BINARY_DESKTOP',
],
'dependencies': [
'remoting_core',
'remoting_windows_resources',
],
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/remoting/version.rc',
'host/win/entry_point.cc',
],
'msvs_settings': {
'VCManifestTool': {
'AdditionalManifestFiles': [
'host/win/dpi_aware.manifest',
],
},
'VCLinkerTool': {
'EnableUAC': 'true',
# Add 'level="requireAdministrator" uiAccess="true"' to
# the manifest only for the official builds because it requires
# the binary to be signed to work.
'conditions': [
['buildtype == "Official"', {
'UACExecutionLevel': 2,
'UACUIAccess': 'true',
}],
],
'EntryPointSymbol': 'HostEntryPoint',
'IgnoreAllDefaultLibraries': 'true',
'SubSystem': '2', # /SUBSYSTEM:WINDOWS
},
},
}, # end of target 'remoting_desktop'
{
'target_name': 'remoting_me2me_host',
'product_name': 'remoting_host',
'type': 'executable',
'variables': { 'enable_wexit_time_destructors': 1, },
'defines': [
'BINARY=BINARY_HOST_ME2ME',
],
'dependencies': [
'remoting_core',
'remoting_windows_resources',
],
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/remoting/version.rc',
'host/win/entry_point.cc',
], ],
'EntryPointSymbol': 'HostEntryPoint', 'msvs_settings': {
'IgnoreAllDefaultLibraries': 'true', 'VCManifestTool': {
'SubSystem': '2', # /SUBSYSTEM:WINDOWS 'AdditionalManifestFiles': [
}, 'host/win/dpi_aware.manifest',
}, ],
}, # end of target 'remoting_desktop' },
{ 'VCLinkerTool': {
'target_name': 'remoting_me2me_host', 'EntryPointSymbol': 'HostEntryPoint',
'product_name': 'remoting_host', 'IgnoreAllDefaultLibraries': 'true',
'type': 'executable', 'OutputFile': '$(OutDir)\\remoting_host.exe',
'variables': { 'enable_wexit_time_destructors': 1, }, 'SubSystem': '2', # /SUBSYSTEM:WINDOWS
'defines': [ },
'BINARY=BINARY_HOST_ME2ME', },
], }, # end of target 'remoting_me2me_host'
'dependencies': [
'remoting_core',
'remoting_windows_resources',
],
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/remoting/version.rc',
'host/win/entry_point.cc',
],
'msvs_settings': {
'VCManifestTool': {
'AdditionalManifestFiles': [
'host/win/dpi_aware.manifest',
],
},
'VCLinkerTool': {
'EntryPointSymbol': 'HostEntryPoint',
'IgnoreAllDefaultLibraries': 'true',
'OutputFile': '$(OutDir)\\remoting_host.exe',
'SubSystem': '2', # /SUBSYSTEM:WINDOWS
},
},
}, # end of target 'remoting_me2me_host'
{
'target_name': 'remoting_me2me_native_messaging_host',
'type': 'executable',
'product_name': 'remoting_native_messaging_host',
'variables': { 'enable_wexit_time_destructors': 1, },
'defines' : [
'BINARY=BINARY_NATIVE_MESSAGING_HOST',
],
'dependencies': [
'remoting_core',
'remoting_windows_resources',
],
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/remoting/version.rc',
'host/setup/me2me_native_messaging_host_entry_point.cc',
],
'msvs_settings': {
'VCLinkerTool': {
'IgnoreAllDefaultLibraries': 'true',
'SubSystem': '1', # /SUBSYSTEM:CONSOLE
},
},
}, # end of target 'remoting_me2me_native_messaging_host'
{
'target_name': 'remoting_it2me_native_messaging_host',
'type': 'executable',
'product_name': 'remote_assistance_host',
'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
'remoting_core',
'remoting_windows_resources',
],
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/remoting/version.rc',
'host/it2me/it2me_native_messaging_host_entry_point.cc',
],
'defines' : [
'BINARY=BINARY_REMOTE_ASSISTANCE_HOST',
],
'msvs_settings': {
'VCManifestTool': {
'EmbedManifest': 'true',
'AdditionalManifestFiles': [
'host/win/common-controls.manifest',
'host/win/dpi_aware.manifest',
],
},
'VCLinkerTool': {
'IgnoreAllDefaultLibraries': 'true',
'SubSystem': '1', # /SUBSYSTEM:CONSOLE
'AdditionalDependencies': [
'comctl32.lib',
],
},
},
}, # end of target 'remoting_it2me_native_messaging_host'
{
'target_name': 'remoting_host_messages',
'type': 'none',
'dependencies': [
'remoting_resources',
],
'hard_dependency': 1,
'direct_dependent_settings': {
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)',
],
},
'sources': [
'host/win/host_messages.mc.jinja2'
],
'rules': [
{ {
'rule_name': 'localize', 'target_name': 'remoting_me2me_native_messaging_host',
'extension': 'jinja2', 'type': 'executable',
'outputs': [ 'product_name': 'remoting_native_messaging_host',
'<(SHARED_INTERMEDIATE_DIR)/remoting/host/remoting_host_messages.mc', 'variables': { 'enable_wexit_time_destructors': 1, },
], 'defines' : [
'action': [ 'BINARY=BINARY_NATIVE_MESSAGING_HOST',
'python', '<(remoting_localize_path)', ],
'--locale_dir', '<(webapp_locale_dir)', 'dependencies': [
'--template', '<(RULE_INPUT_PATH)', 'remoting_core',
'--output', '<@(_outputs)', 'remoting_windows_resources',
'--encoding', 'utf-16', ],
'<@(remoting_locales)', 'sources': [
], '<(SHARED_INTERMEDIATE_DIR)/remoting/version.rc',
'message': 'Localizing the event log messages' 'host/setup/me2me_native_messaging_host_entry_point.cc',
}, ],
], 'msvs_settings': {
}, # end of target 'remoting_host_messages' 'VCLinkerTool': {
'IgnoreAllDefaultLibraries': 'true',
'SubSystem': '1', # /SUBSYSTEM:CONSOLE
},
},
}, # end of target 'remoting_me2me_native_messaging_host'
{
'target_name': 'remoting_it2me_native_messaging_host',
'type': 'executable',
'product_name': 'remote_assistance_host',
'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
'remoting_core',
'remoting_windows_resources',
],
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/remoting/version.rc',
'host/it2me/it2me_native_messaging_host_entry_point.cc',
],
'defines' : [
'BINARY=BINARY_REMOTE_ASSISTANCE_HOST',
],
'msvs_settings': {
'VCManifestTool': {
'EmbedManifest': 'true',
'AdditionalManifestFiles': [
'host/win/common-controls.manifest',
'host/win/dpi_aware.manifest',
],
},
'VCLinkerTool': {
'IgnoreAllDefaultLibraries': 'true',
'SubSystem': '1', # /SUBSYSTEM:CONSOLE
'AdditionalDependencies': [
'comctl32.lib',
],
},
},
}, # end of target 'remoting_it2me_native_messaging_host'
{
'target_name': 'remoting_host_messages',
'type': 'none',
'dependencies': [
'remoting_resources',
],
'hard_dependency': 1,
'direct_dependent_settings': {
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)',
],
},
'sources': [
'host/win/host_messages.mc.jinja2'
],
'rules': [
{
'rule_name': 'localize',
'extension': 'jinja2',
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/remoting/host/remoting_host_messages.mc',
],
'action': [
'python', '<(remoting_localize_path)',
'--locale_dir', '<(webapp_locale_dir)',
'--template', '<(RULE_INPUT_PATH)',
'--output', '<@(_outputs)',
'--encoding', 'utf-16',
'<@(remoting_locales)',
],
'message': 'Localizing the event log messages'
},
],
}, # end of target 'remoting_host_messages'
# Generates localized resources for the Windows binaries. # Generates localized resources for the Windows binaries.
# The substitution strings are taken from: # The substitution strings are taken from:
# - build/util/LASTCHANGE - the last source code revision. There is # - build/util/LASTCHANGE - the last source code revision. There is
# no explicit dependency on this file to avoid rebuilding the host # no explicit dependency on this file to avoid rebuilding the host
# after unrelated changes. # after unrelated changes.
# - chrome/VERSION - the major, build & patch versions. # - chrome/VERSION - the major, build & patch versions.
# - remoting/VERSION - the chromoting patch version (and overrides # - remoting/VERSION - the chromoting patch version (and overrides
# for chrome/VERSION). # for chrome/VERSION).
# - translated webapp strings # - translated webapp strings
{
'target_name': 'remoting_windows_resources',
'type': 'none',
'dependencies': [
'remoting_resources',
],
'hard_dependency': 1,
'direct_dependent_settings': {
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)',
],
},
'sources': [
'host/win/core.rc.jinja2',
'host/win/version.rc.jinja2',
],
'rules': [
{ {
'rule_name': 'version', 'target_name': 'remoting_windows_resources',
'extension': 'jinja2', 'type': 'none',
'variables': { 'dependencies': [
'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', 'remoting_resources',
],
'hard_dependency': 1,
'direct_dependent_settings': {
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)',
],
}, },
'inputs': [ 'sources': [
'<(chrome_version_path)', 'host/win/core.rc.jinja2',
'<(remoting_version_path)', 'host/win/version.rc.jinja2',
], ],
'outputs': [ 'rules': [
'<(SHARED_INTERMEDIATE_DIR)/remoting/<(RULE_INPUT_ROOT)', {
], 'rule_name': 'version',
'action': [ 'extension': 'jinja2',
'python', '<(remoting_localize_path)', 'variables': {
'--variables', '<(chrome_version_path)', 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
# |remoting_version_path| must be after |chrome_version_path| },
# because it can contain overrides for the version numbers. 'inputs': [
'--variables', '<(remoting_version_path)', '<(chrome_version_path)',
'--variables', '<(lastchange_path)', '<(remoting_version_path)',
'--locale_dir', '<(webapp_locale_dir)', ],
'--template', '<(RULE_INPUT_PATH)', 'outputs': [
'--output', '<@(_outputs)', '<(SHARED_INTERMEDIATE_DIR)/remoting/<(RULE_INPUT_ROOT)',
'--encoding', 'utf-16', ],
'<@(remoting_locales)', 'action': [
], 'python', '<(remoting_localize_path)',
'message': 'Localizing the version information' '--variables', '<(chrome_version_path)',
}, # |remoting_version_path| must be after |chrome_version_path|
], # because it can contain overrides for the version numbers.
}, # end of target 'remoting_windows_resources' '--variables', '<(remoting_version_path)',
], # end of 'targets' '--variables', '<(lastchange_path)',
'--locale_dir', '<(webapp_locale_dir)',
'--template', '<(RULE_INPUT_PATH)',
'--output', '<@(_outputs)',
'--encoding', 'utf-16',
'<@(remoting_locales)',
],
'message': 'Localizing the version information'
},
],
}, # end of target 'remoting_windows_resources'
], # end of 'targets'
}], # 'OS=="win"'
'conditions': [
# The host installation is generated only if WiX is available. If # The host installation is generated only if WiX is available. If
# component build is used the produced installation will not work due to # 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 # missing DLLs. We build it anyway to make sure the GYP scripts are executed
# by the bots. # by the bots.
['wix_exists == "True" and sas_dll_exists == "True"', { ['OS == "win" and wix_exists == "True" and sas_dll_exists == "True"', {
'targets': [ 'targets': [
{ {
'target_name': 'remoting_host_installation', 'target_name': 'remoting_host_installation',
...@@ -613,20 +615,7 @@ ...@@ -613,20 +615,7 @@
], # actions ], # actions
}, # end of target 'remoting_me2me_host_archive' }, # end of target 'remoting_me2me_host_archive'
], # end of 'targets' ], # end of 'targets'
}, { }], # '<(wix_path) != ""'
# Dummy targets for when Wix is not available.
'targets': [
{
'target_name': 'remoting_host_installation',
'type': 'none',
},
{
'target_name': 'remoting_me2me_host_archive',
'type': 'none',
},
], # end of 'targets'
}], # 'wix_exists == "True" and sas_dll_exists == "True"'
], # end of 'conditions' ], # end of 'conditions'
} }
remoting/remoting_test.gypi
View file @ c29be3bc
...@@ -265,7 +265,6 @@ ...@@ -265,7 +265,6 @@
'dependencies!': [ 'dependencies!': [
'remoting_host', 'remoting_host',
'remoting_host_setup_base', 'remoting_host_setup_base',
'remoting_it2me_host_static',
'remoting_native_messaging_base', 'remoting_native_messaging_base',
], ],
'sources/': [ 'sources/': [
...@@ -274,6 +273,14 @@ ...@@ -274,6 +273,14 @@
['exclude', '^base/resources_unittest\\.cc$'], ['exclude', '^base/resources_unittest\\.cc$'],
] ]
}], }],
['enable_it2me_host == 0', {
'dependencies!': [
'remoting_it2me_host_static',
],
'sources/': [
['exclude', '^host/it2me/'],
]
}],
[ 'OS == "linux" and use_allocator!="none"', { [ 'OS == "linux" and use_allocator!="none"', {
'dependencies': [ 'dependencies': [
'../base/allocator/allocator.gyp:allocator', '../base/allocator/allocator.gyp:allocator',
...@@ -292,7 +299,7 @@ ...@@ -292,7 +299,7 @@
'<@(remoting_webapp_js_browser_test_files)', '<@(remoting_webapp_js_browser_test_files)',
], ],
}, },
], # end of copies ], #end of copies
}, # end of target 'remoting_browser_test_resources' }, # end of target 'remoting_browser_test_resources'
{ {
'target_name': 'remoting_webapp_unittest', 'target_name': 'remoting_webapp_unittest',
...@@ -366,7 +373,7 @@ ...@@ -366,7 +373,7 @@
], ],
}, },
], ],
}, # end of target 'remoting_webapp_unittest' }, # end of target 'remoting_webapp_js_unittest'
], # end of targets ], # end of targets
'conditions': [ 'conditions': [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment