Fix installer_util_strings project with incredibuild.

It was failing to generate $(OutDir)\obj\global_intermediate\installer_util_strings\installer_util_strings.*

TEST=none
BUG=none
Review URL: http://codereview.chromium.org/196046

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25694 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 18 insertions, 31 deletions

diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp
index b7ab828..3c6e1f7 100644
--- a/chrome/installer/installer.gyp
+++ b/chrome/installer/installer.gyp
@@ -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',
+          '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',
+                         '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',
             ],
           },
         },
diff --git a/chrome/installer/util/prebuild/create_string_rc.bat b/chrome/installer/util/prebuild/create_string_rc.bat
deleted file mode 100644
index 51d1c39..0000000
--- a/chrome/installer/util/prebuild/create_string_rc.bat
+++ /dev/null
@@ -1,10 +0,0 @@
-:: A wrapper file for running create_string_rc.py from visual studio.
-
-setlocal
-set OUTFILE=%~1
-set PYTHON=%~dp0..\..\..\..\third_party\python_24\python.exe
-
-:: Add grit to the python path so we can import FP.py.
-set PYTHONPATH=%~dp0..\..\..\..\tools\grit\grit\extern
-
-%PYTHON% create_string_rc.py %OUTFILE%
diff --git a/chrome/installer/util/prebuild/create_string_rc.py b/chrome/installer/util/prebuild/create_string_rc.py
index 3c2bda2..daf6690 100755
--- a/chrome/installer/util/prebuild/create_string_rc.py
+++ b/chrome/installer/util/prebuild/create_string_rc.py
@@ -29,8 +29,11 @@ import os
 import sys
 from xml.dom import minidom
 
+# We are expected to use ../../../../third_party/python_24/python.exe
 from google import path_utils
 
+# Quick hack to fix the path.
+sys.path.append(os.path.abspath('../../tools/grit/grit/extern'))
 import FP
 
 # The IDs of strings we want to import from generated_resources.grd and include