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

Unified Diff: chrome/installer/installer.gyp

Issue 196046: Fix installer_util_strings project with incredibuild.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 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
« no previous file with comments | « no previous file | chrome/installer/util/prebuild/create_string_rc.bat » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/installer.gyp
===================================================================
--- chrome/installer/installer.gyp (revision 25620)
+++ chrome/installer/installer.gyp (working copy)
@@ -175,38 +175,32 @@
},
{
'target_name': 'installer_util_strings',
- 'type': 'dummy_executable',
'msvs_guid': '0026A376-C4F1-4575-A1BA-578C69F07013',
- 'actions': [
+ # See hack in chrome.gyp:chrome_strings
+ 'type': 'dummy_executable',
bradn 2009/09/08 21:14:37 Can this turn into 'none' after this change?
+ 'rules': [
{
- # TODO(sgk): Clean this up so that we pass in the
- # file names to the script instead of having it hard-code
- # matching path names internally.
- 'action_name': 'installer_util_strings',
+ 'rule_name': 'installer_util_strings',
+ 'extension': 'grd',
'inputs': [
- 'util/prebuild/create_string_rc.py',
+ # Hardcoded for now.
'../app/generated_resources.grd',
],
'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.rc',
- '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.h',
+ '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/<(RULE_INPUT_ROOT).h',
],
- 'action': [
- # The create_string_rc.py script requires the checked-in
- # python.exe that has google modules installed, and
- # a PYTHONPATH pointing to grit so it can import FP.
- # TODO: clean this up
- 'set PYTHONPATH=../../tools/grit/grit/extern', '&&',
- '../../third_party/python_24/python.exe',
- 'util/prebuild/create_string_rc.py',
- '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings'
- ],
- 'msvs_cygwin_shell': 0,
+ 'action': ['../../third_party/python_24/python.exe',
bradn 2009/09/08 21:14:37 without msvs_cygwin_shell:0, you should be able to
+ 'util/prebuild/create_string_rc.py',
+ '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings'],
+ 'message': 'Generating resources from <(RULE_INPUT_PATH)',
},
],
+ 'sources': [
+ '../app/generated_resources.grd',
+ ],
'direct_dependent_settings': {
'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings',
+ '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings',
],
},
},
« no previous file with comments | « no previous file | chrome/installer/util/prebuild/create_string_rc.bat » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698