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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: remoting/remoting.gyp

Issue 11970044: Merged all Chromoting Host code into remoting_core.dll (Windows). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: host_ui_resource.h has been deleted. Created 7 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/host/win/daemon_process_main.cc ('K') | « remoting/host/win/remoting_host.ver ('k') | remoting/version.rc.version » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 86a68e51f1f16c7c8052e349d805364c0ba5fd41..d2244059daf8f4322fcfbb40151ef211c0b1064c 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -541,20 +541,20 @@
}, # end of target 'remoting_host'
{
- 'target_name': 'remoting_me2me_host',
- 'type': 'executable',
+ 'target_name': 'remoting_me2me_host_static',
+ 'type': 'static_library',
'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
+ '../base/base.gyp:base',
+ '../base/base.gyp:base_i18n',
+ '../media/media.gyp:media',
+ '../net/net.gyp:net',
'remoting_base',
'remoting_breakpad',
'remoting_host',
'remoting_host_event_logger',
'remoting_host_logging',
'remoting_jingle_glue',
- '../base/base.gyp:base',
- '../base/base.gyp:base_i18n',
- '../media/media.gyp:media',
- '../net/net.gyp:net',
],
'defines': [
'VERSION=<(version_full)',
@@ -570,7 +570,6 @@
'host/curtain_mode_win.cc',
'host/posix/signal_handler.cc',
'host/posix/signal_handler.h',
- 'host/remoting_me2me_host.cc',
],
'conditions': [
['os_posix != 1', {
@@ -578,84 +577,8 @@
['exclude', '^host/posix/'],
],
}],
- ['OS=="mac"', {
- 'mac_bundle': 1,
- 'variables': {
- 'host_bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_HOST_BUNDLE_ID@")',
- },
- 'xcode_settings': {
- 'INFOPLIST_FILE': 'host/remoting_me2me_host-Info.plist',
- 'INFOPLIST_PREPROCESS': 'YES',
- 'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_ID="<(host_bundle_id)" COPYRIGHT_INFO="<(copyright_info)"',
- },
- 'mac_bundle_resources': [
- 'host/disconnect_window.xib',
- 'host/remoting_me2me_host.icns',
- 'host/remoting_me2me_host-Info.plist',
- ],
- 'mac_bundle_resources!': [
- 'host/remoting_me2me_host-Info.plist',
- ],
- 'conditions': [
- ['mac_breakpad==1', {
- 'variables': {
- # A real .dSYM is needed for dump_syms to operate on.
- 'mac_real_dsym': 1,
- },
- 'defines': ['MAC_BREAKPAD'],
- 'copies': [
- {
- 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Resources',
- 'files': [
- '<(PRODUCT_DIR)/crash_inspector',
- '<(PRODUCT_DIR)/crash_report_sender.app'
- ],
- },
- ],
- }], # mac_breakpad==1
- ], # conditions
- }], # OS=mac
- ['OS=="win"', {
- 'product_name': 'remoting_host',
- 'dependencies': [
- 'remoting_version_resources',
- ],
- 'sources': [
- '<(SHARED_INTERMEDIATE_DIR)/remoting/host/remoting_host_messages.rc',
- '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_host_me2me_version.rc',
- 'host/host_ui.rc',
- ],
- 'link_settings': {
- 'libraries': [
- '-lcomctl32.lib',
- ],
- },
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'AdditionalOptions': [
- "\"/manifestdependency:type='win32' "
- "name='Microsoft.Windows.Common-Controls' "
- "version='6.0.0.0' "
- "processorArchitecture='*' "
- "publicKeyToken='6595b64144ccf1df' language='*'\"",
- ],
- 'conditions': [
- ['buildtype == "Official" and remoting_multi_process == 0', {
- 'AdditionalOptions': [
- "\"/MANIFESTUAC:level='requireAdministrator' "
- "uiAccess='true'\"",
- ],
- }],
- ],
- 'ImportLibrary': '$(OutDir)\\lib\\remoting_host_exe.lib',
- 'OutputFile': '$(OutDir)\\remoting_host.exe',
- # 2 == /SUBSYSTEM:WINDOWS
- 'SubSystem': '2',
- },
- },
- }],
], # end of 'conditions'
- }, # end of target 'remoting_me2me_host'
+ }, # end of target 'remoting_me2me_host_static'
{
'target_name': 'remoting_host_keygen',
@@ -700,7 +623,7 @@
['OS=="win"', {
'dependencies': [
'../google_update/google_update.gyp:google_update',
- 'remoting_elevated_controller',
+ 'remoting_controller_idl',
],
}],
],
@@ -724,7 +647,7 @@
],
'sources': [
'base/dispatch_win.h',
- 'host/host_ui_resource.h',
+ 'host/win/core_resource.h',
'host/plugin/host_log_handler.cc',
'host/plugin/host_log_handler.h',
'host/plugin/host_plugin.cc',
@@ -769,7 +692,7 @@
}], # OS=="mac"
[ 'OS=="win"', {
'dependencies': [
- 'remoting_elevated_controller',
+ 'remoting_controller_idl',
'remoting_version_resources',
],
'include_dirs': [
@@ -777,78 +700,86 @@
],
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_host_plugin_version.rc',
- 'host/host_ui.rc',
+ 'host/win/core.rc',
'host/plugin/host_plugin.def',
],
}],
],
}, # end of target 'remoting_host_plugin'
+ ], # end of 'targets'
+ }], # 'enable_remoting_host==1'
+
+ ['OS!="win" and enable_remoting_host==1', {
+ 'targets': [
{
- 'target_name': 'remoting_desktop',
+ 'target_name': 'remoting_me2me_host',
'type': 'executable',
'variables': { 'enable_wexit_time_destructors': 1, },
- 'defines': [
- 'REMOTING_MULTI_PROCESS',
- ],
'dependencies': [
+ '../base/base.gyp:base',
+ '../base/base.gyp:base_i18n',
+ '../media/media.gyp:media',
+ '../net/net.gyp:net',
'remoting_base',
'remoting_breakpad',
'remoting_host',
+ 'remoting_host_event_logger',
'remoting_host_logging',
- '../base/base.gyp:base',
- '../ipc/ipc.gyp:ipc',
+ 'remoting_jingle_glue',
+ 'remoting_me2me_host_static',
+ ],
+ 'defines': [
+ 'VERSION=<(version_full)',
],
'sources': [
- 'host/desktop_process.cc',
- 'host/desktop_process.h',
- 'host/desktop_process_main.cc',
- 'host/desktop_session_agent.cc',
- 'host/desktop_session_agent.h',
- 'host/desktop_session_agent_posix.cc',
- 'host/desktop_session_agent_win.cc',
+ 'host/remoting_me2me_host.cc',
+ 'host/remoting_me2me_host.h',
],
'conditions': [
- ['OS=="win"', {
- 'dependencies': [
- 'remoting_version_resources',
+ ['OS=="mac"', {
+ 'mac_bundle': 1,
+ 'variables': {
+ 'host_bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_HOST_BUNDLE_ID@")',
+ },
+ 'xcode_settings': {
+ 'INFOPLIST_FILE': 'host/remoting_me2me_host-Info.plist',
+ 'INFOPLIST_PREPROCESS': 'YES',
+ 'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_ID="<(host_bundle_id)" COPYRIGHT_INFO="<(copyright_info)"',
+ },
+ 'mac_bundle_resources': [
+ 'host/disconnect_window.xib',
+ 'host/remoting_me2me_host.icns',
+ 'host/remoting_me2me_host-Info.plist',
],
- 'sources': [
- 'host/host_ui.rc',
- '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_desktop_version.rc',
+ 'mac_bundle_resources!': [
+ 'host/remoting_me2me_host-Info.plist',
],
- 'link_settings': {
- 'libraries': [
- '-lcomctl32.lib',
- ],
- },
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'AdditionalOptions': [
- "\"/manifestdependency:type='win32' "
- "name='Microsoft.Windows.Common-Controls' "
- "version='6.0.0.0' "
- "processorArchitecture='*' "
- "publicKeyToken='6595b64144ccf1df' language='*'\"",
- ],
- 'conditions': [
- ['buildtype == "Official"', {
- 'AdditionalOptions': [
- "\"/MANIFESTUAC:level='requireAdministrator' "
- "uiAccess='true'\"",
+ 'conditions': [
+ ['mac_breakpad==1', {
+ 'variables': {
+ # A real .dSYM is needed for dump_syms to operate on.
+ 'mac_real_dsym': 1,
+ },
+ 'defines': ['MAC_BREAKPAD'],
+ 'copies': [
+ {
+ 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Resources',
+ 'files': [
+ '<(PRODUCT_DIR)/crash_inspector',
+ '<(PRODUCT_DIR)/crash_report_sender.app'
],
- }],
+ },
],
- # 2 == /SUBSYSTEM:WINDOWS
- 'SubSystem': '2',
- },
- },
- }],
- ],
- }, # end of target 'remoting_desktop'
+ }], # mac_breakpad==1
+ ], # conditions
+ }], # OS=mac
+ ], # end of 'conditions'
+ }, # end of target 'remoting_me2me_host'
], # end of 'targets'
- }], # 'enable_remoting_host==1'
+ }], # 'OS!="win" and enable_remoting_host==1'
+
['OS=="linux" and chromeos==0', {
'targets': [
@@ -1110,7 +1041,7 @@
'type': 'none',
'dependencies': [
'../breakpad/breakpad.gyp:dump_syms',
- 'remoting_me2me_host',
+ 'remoting_me2me_host',
],
'actions': [
{
@@ -1151,7 +1082,7 @@
],
}, # end of target 'remoting_breakpad_tester'
{
- 'target_name': 'remoting_elevated_controller',
+ 'target_name': 'remoting_controller_idl',
'type': 'static_library',
'sources': [
'host/win/elevated_controller_idl.templ',
@@ -1191,7 +1122,7 @@
'msvs_cygwin_shell': 1,
},
],
- }, # end of target 'remoting_elevated_controller'
+ }, # end of target 'remoting_controller_idl'
{
'target_name': 'remoting_configurer',
'type': 'executable',
@@ -1228,78 +1159,37 @@
},
}, # end of target 'remoting_configurer'
{
- 'target_name': 'remoting_controller',
- 'type': 'executable',
+ 'target_name': 'remoting_core',
+ 'type': 'shared_library',
'variables': { 'enable_wexit_time_destructors': 1, },
'defines' : [
'_ATL_APARTMENT_THREADED',
'_ATL_NO_AUTOMATIC_NAMESPACE',
'_ATL_CSTRING_EXPLICIT_CONSTRUCTORS',
+ 'HOST_IMPLEMENTATION',
'STRICT',
'DAEMON_CONTROLLER_CLSID="{<(daemon_controller_clsid)}"',
- ],
- 'include_dirs': [
- '<(INTERMEDIATE_DIR)',
+ 'VERSION=<(version_full)',
],
'dependencies': [
'../base/base.gyp:base',
- 'remoting_breakpad',
- 'remoting_elevated_controller',
- 'remoting_host',
- 'remoting_host_logging',
- 'remoting_protocol',
- 'remoting_version_resources',
- ],
- 'sources': [
- '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_controller_version.rc',
- 'host/pin_hash.cc',
- 'host/pin_hash.h',
- 'host/verify_config_window_win.cc',
- 'host/verify_config_window_win.h',
- 'host/win/elevated_controller.cc',
- 'host/win/elevated_controller.h',
- 'host/win/elevated_controller.rc',
- 'host/win/elevated_controller_module.cc',
- 'host/win/omaha.cc',
- 'host/win/omaha.h',
- ],
- 'link_settings': {
- 'libraries': [
- '-lcomctl32.lib',
- ],
- },
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'AdditionalOptions': [
- "\"/manifestdependency:type='win32' "
- "name='Microsoft.Windows.Common-Controls' "
- "version='6.0.0.0' "
- "processorArchitecture='*' "
- "publicKeyToken='6595b64144ccf1df' language='*'\"",
- ],
- # 2 == /SUBSYSTEM:WINDOWS
- 'SubSystem': '2',
- },
- },
- }, # end of target 'remoting_controller'
- {
- 'target_name': 'remoting_daemon',
- 'type': 'executable',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- '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',
'remoting_base',
'remoting_breakpad',
+ 'remoting_controller_idl',
'remoting_host',
+ 'remoting_host_event_logger',
'remoting_host_logging',
+ 'remoting_me2me_host_static',
+ 'remoting_protocol',
'remoting_version_resources',
],
'sources': [
- '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_daemon_version.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/remoting/host/remoting_host_messages.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_core_version.rc',
'base/scoped_sc_handle_win.h',
'capturer/win/desktop.cc',
'capturer/win/desktop.h',
@@ -1312,19 +1202,37 @@
'host/daemon_process.cc',
'host/daemon_process.h',
'host/daemon_process_win.cc',
+ 'host/desktop_process.cc',
+ 'host/desktop_process.h',
+ 'host/desktop_process_entry.cc',
+ 'host/desktop_process_entry.h',
'host/desktop_session.cc',
'host/desktop_session.h',
+ 'host/desktop_session_agent.cc',
+ 'host/desktop_session_agent.h',
+ 'host/desktop_session_agent_posix.cc',
+ 'host/desktop_session_agent_win.cc',
'host/desktop_session_win.cc',
'host/desktop_session_win.h',
'host/host_exit_codes.h',
+ 'host/host_export.h',
'host/ipc_constants.cc',
'host/ipc_constants.h',
+ 'host/remoting_me2me_host.cc',
+ 'host/remoting_me2me_host.h',
'host/sas_injector.h',
'host/sas_injector_win.cc',
+ 'host/verify_config_window_win.cc',
+ 'host/verify_config_window_win.h',
+ 'host/win/core.cc',
+ 'host/win/core.rc',
+ 'host/win/core_resource.h',
+ 'host/win/elevated_controller.cc',
+ 'host/win/elevated_controller.h',
+ 'host/win/elevated_controller_module.cc',
+ 'host/win/elevated_controller_module.h',
'host/win/host_service.cc',
'host/win/host_service.h',
- 'host/win/host_service.rc',
- 'host/win/host_service_resource.h',
'host/win/omaha.cc',
'host/win/omaha.h',
'host/win/unprivileged_process_delegate.cc',
@@ -1342,14 +1250,121 @@
'msvs_settings': {
'VCLinkerTool': {
'AdditionalDependencies': [
+ 'comctl32.lib',
'wtsapi32.lib',
],
- # 2 == /SUBSYSTEM:WINDOWS
- 'SubSystem': '2',
+ 'AdditionalOptions': [
+ "\"/manifestdependency:type='win32' "
+ "name='Microsoft.Windows.Common-Controls' "
+ "version='6.0.0.0' "
+ "processorArchitecture='*' "
+ "publicKeyToken='6595b64144ccf1df' language='*'\"",
+ ],
+ },
+ },
+ }, # end of target 'remoting_controller_static'
+ {
+ 'target_name': 'remoting_controller',
+ 'type': 'executable',
+ 'variables': { 'enable_wexit_time_destructors': 1, },
+ 'dependencies': [
+ 'remoting_core',
+ 'remoting_version_resources',
+ ],
+ 'sources': [
+ '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_controller_version.rc',
+ 'host/win/elevated_controller_main.cc',
+ ],
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'EntryPointSymbol': 'ElevatedControllerMain',
Sergey Ulanov 2013/01/18 21:14:55 Do we need this? can we use main() instead? On mac
alexeypa (please no reviews) 2013/01/18 22:06:10 Getting rid of CRT saves us about 116KB. Technical
+ 'IgnoreAllDefaultLibraries': 'true',
+ 'SubSystem': '2', # /SUBSYSTEM:WINDOWS
+ },
+ },
+ }, # end of target 'remoting_controller'
+ {
+ 'target_name': 'remoting_daemon',
+ 'type': 'executable',
+ 'variables': { 'enable_wexit_time_destructors': 1, },
+ 'dependencies': [
+ 'remoting_core',
+ 'remoting_version_resources',
+ ],
+ 'sources': [
+ '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_daemon_version.rc',
+ 'host/win/daemon_process_main.cc',
+ ],
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'EntryPointSymbol': 'DaemonProcessMain',
+ 'IgnoreAllDefaultLibraries': 'true',
+ 'SubSystem': '2', # /SUBSYSTEM:WINDOWS
},
},
}, # end of target 'remoting_daemon'
+ {
+ 'target_name': 'remoting_desktop',
+ 'type': 'executable',
+ 'variables': { 'enable_wexit_time_destructors': 1, },
+ 'dependencies': [
+ 'remoting_core',
+ 'remoting_version_resources',
+ ],
+ 'sources': [
+ '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_desktop_version.rc',
+ 'host/win/desktop_process_main.cc',
+ ],
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'conditions': [
+ ['buildtype == "Official"', {
+ 'AdditionalOptions': [
+ "\"/MANIFESTUAC:level='requireAdministrator' "
+ "uiAccess='true'\"",
+ ],
+ }],
+ ],
+ 'EntryPointSymbol': 'DesktopProcessMain',
+ 'IgnoreAllDefaultLibraries': 'true',
+ 'SubSystem': '2', # /SUBSYSTEM:WINDOWS
+ },
+ },
+ }, # end of target 'remoting_desktop'
+
+ {
+ 'target_name': 'remoting_host_exe',
+ 'product_name': 'remoting_host',
+ 'type': 'executable',
+ 'variables': { 'enable_wexit_time_destructors': 1, },
+ 'dependencies': [
+ 'remoting_core',
+ 'remoting_version_resources',
+ ],
+ 'sources': [
+ '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_host_version.rc',
+ 'host/win/host_process_main.cc',
+ ],
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'conditions': [
+ ['buildtype == "Official" and remoting_multi_process == 0', {
+ 'AdditionalOptions': [
+ "\"/MANIFESTUAC:level='requireAdministrator' "
+ "uiAccess='true'\"",
+ ],
+ }],
+ ],
+ 'EntryPointSymbol': 'HostProcessMain',
+ 'IgnoreAllDefaultLibraries': 'true',
+ 'ImportLibrary': '$(OutDir)\\lib\\remoting_host_exe.lib',
+ 'OutputFile': '$(OutDir)\\remoting_host.exe',
+ 'SubSystem': '2', # /SUBSYSTEM:WINDOWS
+ },
+ },
+ }, # end of target 'remoting_host_exe'
+
# Generates the version information resources for the Windows binaries.
# The .RC files are generated from the "version.rc.version" template and
# placed in the "<(SHARED_INTERMEDIATE_DIR)/remoting" folder.
@@ -1378,10 +1393,11 @@
},
'sources': [
'host/plugin/remoting_host_plugin.ver',
- 'host/remoting_desktop.ver',
- 'host/remoting_host_me2me.ver',
'host/win/remoting_controller.ver',
+ 'host/win/remoting_core.ver',
'host/win/remoting_daemon.ver',
+ 'host/win/remoting_desktop.ver',
+ 'host/win/remoting_host.ver',
],
'rules': [
{
@@ -1468,16 +1484,19 @@
'type': 'none',
'dependencies': [
'remoting_controller',
+ 'remoting_core',
'remoting_daemon',
- 'remoting_me2me_host',
+ 'remoting_host_exe',
],
'compiled_inputs': [
'<(PRODUCT_DIR)/remoting_controller.exe',
+ '<(PRODUCT_DIR)/remoting_core.dll',
'<(PRODUCT_DIR)/remoting_daemon.exe',
'<(PRODUCT_DIR)/remoting_host.exe',
],
'compiled_inputs_dst': [
'files/remoting_controller.exe',
+ 'files/remoting_core.dll',
'files/remoting_daemon.exe',
'files/remoting_host.exe',
],
« remoting/host/win/daemon_process_main.cc ('K') | « remoting/host/win/remoting_host.ver ('k') | remoting/version.rc.version » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698