From 5672ff7f860a08676c5f54f6bd10470b18dafd9a Mon Sep 17 00:00:00 2001
From: "tony@chromium.org"
 <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 29 Jul 2011 23:19:55 +0000
Subject: Fix some grit related dependencies.

1) Use grit_action.gypi for devtools_frontend_resources.  The grd file
is not generated so we should use the gypi.

2) Have devtools_resources depend on the grit source files. This grd
file is generated, so we can't run grit_info.py on it at gyp time.
I've modified grit_info.py --inputs to take no arguments to just list
out all the grit source files.  This will at least cause us to rebuild
properly if there is a change to grit.

BUG=none
TEST=Compile resources.pak and make sure there are no spurious rebuilds.
Touch a grit source file and make sure that devtools_frontend_resources
and devtools_resources rebuild.


Review URL: http://codereview.chromium.org/7493084

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94792 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/chrome.gyp | 37 +++++++++----------------------------
 1 file changed, 9 insertions(+), 28 deletions(-)

(limited to 'chrome/chrome.gyp')

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 4b62f52..e6004ec 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -345,6 +345,14 @@
           'includes': [ '../build/grit_action.gypi' ],
         },
         {
+          'action_name': 'devtools_frontend_resources',
+          'variables': {
+            'grit_grd_file':
+               'browser/debugger/frontend/devtools_frontend_resources.grd',
+          },
+          'includes': [ '../build/grit_action.gypi' ]
+        },
+        {
           'action_name': 'devtools_resources',
           # This can't use ../build/grit_action.gypi because the grd file
           # is generated a build time, so the trick of using grit_info to get
@@ -355,6 +363,7 @@
           },
           'inputs': [
             '<(grit_grd_file)',
+            '<!@pymod_do_main(grit_info --inputs)',
           ],
           'outputs': [
             '<(grit_out_dir)/grit/devtools_resources.h',
@@ -369,34 +378,6 @@
                      '<@(grit_defines)' ],
           'message': 'Generating resources from <(grit_grd_file)',
         },
-        {
-          'action_name': 'devtools_frontend_resources',
-          # This can't use ../build/grit_action.gypi because the grd file
-          # is generated a build time, so the trick of using grit_info to get
-          # the real inputs/outputs at GYP time isn't possible.
-          'variables': {
-            'grit_cmd': ['python', '../tools/grit/grit.py'],
-            'frontend_folder': 'browser/debugger/frontend',
-            'grit_grd_file':
-               '<(frontend_folder)/devtools_frontend_resources.grd',
-          },
-          'inputs': [
-            '<(grit_grd_file)',
-            '<(frontend_folder)/devtools_frontend.html',
-          ],
-          'outputs': [
-            '<(grit_out_dir)/grit/devtools_frontend_resources.h',
-            '<(grit_out_dir)/devtools_frontend_resources.pak',
-            '<(grit_out_dir)/grit/devtools_frontend_resources_map.cc',
-            '<(grit_out_dir)/grit/devtools_frontend_resources_map.h',
-          ],
-          'action': ['<@(grit_cmd)',
-                     '-i', '<(grit_grd_file)', 'build',
-                     '-o', '<(grit_out_dir)',
-                     '-D', 'SHARED_INTERMEDIATE_DIR=<(SHARED_INTERMEDIATE_DIR)',
-                     '<@(grit_defines)' ],
-          'message': 'Generating resources from <(grit_grd_file)',
-        },
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },
-- 
cgit v1.1