Index: remoting/remoting.gyp |
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp |
index cdb3ca97d2a9bd7b8d426edc91901b691f95043e..7b765d1b6f7ccd47dd16996d2fce041f35e93f44 100644 |
--- a/remoting/remoting.gyp |
+++ b/remoting/remoting.gyp |
@@ -1161,10 +1161,44 @@ |
], |
'process_outputs_as_sources': 1, |
'message': 'Generating <@(_outputs)', |
- 'msvs_cygwin_shell': 1, |
+ 'msvs_cygwin_shell': 0, |
Wez
2013/02/27 07:01:40
nit: I don't think this is related to the CL as su
alexeypa (please no reviews)
2013/02/27 16:48:15
Done.
|
}, |
], |
}, # end of target 'remoting_controller_idl' |
+ |
+ # Regenerates 'elevated_controller.rc' every time |
+ # 'elevated_controller_idl.templ' changes. 'elevated_controller.tlb' |
+ # is embedded into remoting_core.dll's resources. This target makes |
+ # sure that when .tlb is updated the resources and the binary are |
+ # rebuilt as well. GYP alone is not smart enough to figure out this |
Wez
2013/02/27 07:01:40
The rule expresses a dependency on the .templ, but
alexeypa (please no reviews)
2013/02/27 16:48:15
The remoting_controller_idl builds .tlb out of .te
|
+ # dependency on it own. |
+ { |
+ 'target_name': 'remoting_controller_rc', |
+ 'type': 'none', |
+ 'sources': [ |
+ 'host/win/elevated_controller_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/elevated_controller.rc', |
+ ], |
+ 'action': [ |
+ 'echo 1 typelib "remoting/host/elevated_controller.tlb" > <@(_outputs)', |
Wez
2013/02/27 07:01:40
This writes the same single line to the file every
alexeypa (please no reviews)
2013/02/27 16:48:15
Yes. The contents of the file is important though.
Wez
2013/02/27 21:50:00
It's important to the build step, yes, but that's
alexeypa (please no reviews)
2013/02/27 22:06:59
Touching a source file is a bad idea because the s
|
+ ], |
+ 'message': 'Generating <@(_outputs)', |
+ 'msvs_cygwin_shell': 0, |
+ }, |
+ ], |
+ }, # end of target 'remoting_controller_rc' |
{ |
'target_name': 'remoting_configurer', |
'type': 'executable', |
@@ -1284,6 +1318,7 @@ |
'remoting_base', |
'remoting_breakpad', |
'remoting_controller_idl', |
+ 'remoting_controller_rc', |
'remoting_host', |
'remoting_host_event_logger', |
'remoting_host_logging', |
@@ -1292,6 +1327,7 @@ |
'remoting_version_resources', |
], |
'sources': [ |
+ '<(SHARED_INTERMEDIATE_DIR)/remoting/host/elevated_controller.rc', |
'<(SHARED_INTERMEDIATE_DIR)/remoting/host/remoting_host_messages.rc', |
'<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_core_version.rc', |
'base/scoped_sc_handle_win.h', |