diff options
| author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-28 03:39:52 +0000 |
|---|---|---|
| committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-28 03:39:52 +0000 |
| commit | ffb845f529c4570ee6ea8dd0ac35cd65305c3077 (patch) | |
| tree | 0db05ccb68b486a1a09d7cf09877c0ec1a374419 /remoting | |
| parent | ccbd5612c7b8105b196cf9be94d6aa069155d6d9 (diff) | |
| download | chromium_src-ffb845f529c4570ee6ea8dd0ac35cd65305c3077.zip chromium_src-ffb845f529c4570ee6ea8dd0ac35cd65305c3077.tar.gz chromium_src-ffb845f529c4570ee6ea8dd0ac35cd65305c3077.tar.bz2 | |
Make sure .RC file including elevated_controller.tlb is rebuilt every time .TLB is updated.
Also cleaned up an unnecessary use of Cygwin while generating elevated_controller.idl.
BUG=178633
Review URL: https://chromiumcodereview.appspot.com/12315122
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185132 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/win/core.rc | 3 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 38 |
2 files changed, 37 insertions, 4 deletions
diff --git a/remoting/host/win/core.rc b/remoting/host/win/core.rc index ac7ca69..1bec0ba 100644 --- a/remoting/host/win/core.rc +++ b/remoting/host/win/core.rc @@ -21,9 +21,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) #endif //_WIN32 -// Embedded type library. -1 typelib "remoting/host/elevated_controller.tlb" - ///////////////////////////////////////////////////////////////////////////// // // String Table diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index cdb3ca9..d6baa72 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, }, ], }, # end of target 'remoting_controller_idl' + + # Regenerates 'elevated_controller.rc' (used to embed + # 'elevated_controller.tlb' into remoting_core.dll's resources) every + # time 'elevated_controller_idl.templ' changes. Making remoting_core + # depend on both this and 'remoting_controller_idl' targets ensures that + # the resorces are rebuilt every time the type library is updated. GYP + # alone is not smart enough to figure out this dependency on its 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)', + ], + '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', |