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

Side by Side Diff: remoting/remoting.gyp

Issue 12315122: Make sure .RC file including elevated_controller.tlb is rebuilt every time .TLB is updated. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « remoting/host/win/core.rc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 # TODO(dmaclach): can we pick this up some other way? Right now it's 7 # TODO(dmaclach): can we pick this up some other way? Right now it's
8 # duplicated from chrome.gyp 8 # duplicated from chrome.gyp
9 'chromium_code': 1, 9 'chromium_code': 1,
10 10
(...skipping 1143 matching lines...) Expand 10 before | Expand all | Expand 10 after
1154 ], 1154 ],
1155 'action': [ 1155 'action': [
1156 'python', 1156 'python',
1157 '<(version_py_path)', 1157 '<(version_py_path)',
1158 '-e', 'DAEMON_CONTROLLER_CLSID="<(daemon_controller_clsid)"', 1158 '-e', 'DAEMON_CONTROLLER_CLSID="<(daemon_controller_clsid)"',
1159 '<(RULE_INPUT_PATH)', 1159 '<(RULE_INPUT_PATH)',
1160 '<@(_outputs)', 1160 '<@(_outputs)',
1161 ], 1161 ],
1162 'process_outputs_as_sources': 1, 1162 'process_outputs_as_sources': 1,
1163 'message': 'Generating <@(_outputs)', 1163 'message': 'Generating <@(_outputs)',
1164 'msvs_cygwin_shell': 1, 1164 '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.
1165 }, 1165 },
1166 ], 1166 ],
1167 }, # end of target 'remoting_controller_idl' 1167 }, # end of target 'remoting_controller_idl'
1168
1169 # Regenerates 'elevated_controller.rc' every time
1170 # 'elevated_controller_idl.templ' changes. 'elevated_controller.tlb'
1171 # is embedded into remoting_core.dll's resources. This target makes
1172 # sure that when .tlb is updated the resources and the binary are
1173 # 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
1174 # dependency on it own.
1175 {
1176 'target_name': 'remoting_controller_rc',
1177 'type': 'none',
1178 'sources': [
1179 'host/win/elevated_controller_idl.templ',
1180 ],
1181 'hard_dependency': 1,
1182 'direct_dependent_settings': {
1183 'include_dirs': [
1184 '<(SHARED_INTERMEDIATE_DIR)',
1185 ],
1186 },
1187 'rules': [
1188 {
1189 'rule_name': 'generate_rc',
1190 'extension': 'templ',
1191 'outputs': [
1192 '<(SHARED_INTERMEDIATE_DIR)/remoting/host/elevated_controller.rc ',
1193 ],
1194 'action': [
1195 'echo 1 typelib "remoting/host/elevated_controller.tlb" > <@(_ou tputs)',
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
1196 ],
1197 'message': 'Generating <@(_outputs)',
1198 'msvs_cygwin_shell': 0,
1199 },
1200 ],
1201 }, # end of target 'remoting_controller_rc'
1168 { 1202 {
1169 'target_name': 'remoting_configurer', 1203 'target_name': 'remoting_configurer',
1170 'type': 'executable', 1204 'type': 'executable',
1171 'defines': [ 1205 'defines': [
1172 '_ATL_NO_EXCEPTIONS', 1206 '_ATL_NO_EXCEPTIONS',
1173 ], 1207 ],
1174 'dependencies': [ 1208 'dependencies': [
1175 '../base/base.gyp:base', 1209 '../base/base.gyp:base',
1176 '../crypto/crypto.gyp:crypto', 1210 '../crypto/crypto.gyp:crypto',
1177 'remoting_host', 1211 'remoting_host',
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
1277 'dependencies': [ 1311 'dependencies': [
1278 '../base/base.gyp:base', 1312 '../base/base.gyp:base',
1279 '../base/base.gyp:base_static', 1313 '../base/base.gyp:base_static',
1280 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations', 1314 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations',
1281 '../ipc/ipc.gyp:ipc', 1315 '../ipc/ipc.gyp:ipc',
1282 '../media/media.gyp:media', 1316 '../media/media.gyp:media',
1283 '../net/net.gyp:net', 1317 '../net/net.gyp:net',
1284 'remoting_base', 1318 'remoting_base',
1285 'remoting_breakpad', 1319 'remoting_breakpad',
1286 'remoting_controller_idl', 1320 'remoting_controller_idl',
1321 'remoting_controller_rc',
1287 'remoting_host', 1322 'remoting_host',
1288 'remoting_host_event_logger', 1323 'remoting_host_event_logger',
1289 'remoting_host_logging', 1324 'remoting_host_logging',
1290 'remoting_me2me_host_static', 1325 'remoting_me2me_host_static',
1291 'remoting_protocol', 1326 'remoting_protocol',
1292 'remoting_version_resources', 1327 'remoting_version_resources',
1293 ], 1328 ],
1294 'sources': [ 1329 'sources': [
1330 '<(SHARED_INTERMEDIATE_DIR)/remoting/host/elevated_controller.rc',
1295 '<(SHARED_INTERMEDIATE_DIR)/remoting/host/remoting_host_messages.rc' , 1331 '<(SHARED_INTERMEDIATE_DIR)/remoting/host/remoting_host_messages.rc' ,
1296 '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_core_version.rc', 1332 '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_core_version.rc',
1297 'base/scoped_sc_handle_win.h', 1333 'base/scoped_sc_handle_win.h',
1298 'host/chromoting_messages.cc', 1334 'host/chromoting_messages.cc',
1299 'host/chromoting_messages.h', 1335 'host/chromoting_messages.h',
1300 'host/config_file_watcher.cc', 1336 'host/config_file_watcher.cc',
1301 'host/config_file_watcher.h', 1337 'host/config_file_watcher.h',
1302 'host/daemon_process.cc', 1338 'host/daemon_process.cc',
1303 'host/daemon_process.h', 1339 'host/daemon_process.h',
1304 'host/daemon_process_win.cc', 1340 'host/daemon_process_win.cc',
(...skipping 1263 matching lines...) Expand 10 before | Expand all | Expand 10 after
2568 '../base/allocator/allocator.gyp:allocator', 2604 '../base/allocator/allocator.gyp:allocator',
2569 ], 2605 ],
2570 }, 2606 },
2571 ], 2607 ],
2572 ], 2608 ],
2573 }], # end of 'toolkit_uses_gtk == 1' 2609 }], # end of 'toolkit_uses_gtk == 1'
2574 ], # end of 'conditions' 2610 ], # end of 'conditions'
2575 }, # end of target 'remoting_unittests' 2611 }, # end of target 'remoting_unittests'
2576 ], # end of targets 2612 ], # end of targets
2577 } 2613 }
OLDNEW
« no previous file with comments | « remoting/host/win/core.rc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698