Fix grit include dependencies in the scons build.

Re-enable the scons code that walks a grd file and adds its dependencies as
build dependencies.  This requires that all our dependencies are files in our
source tree (which is what motivated getting rid of the tld data as a
generated resource).  I had to fix up the terms of service for this.

Also remove some code that disabled .pak file generation on windows which was
broken because it couldn't find the tld data.

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


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

2 files changed, 4 insertions, 14 deletions

diff --git a/tools/grit/grit/scons.py b/tools/grit/grit/scons.py
index 9a88216..849e537 100644
--- a/tools/grit/grit/scons.py
+++ b/tools/grit/grit/scons.py
@@ -138,17 +138,16 @@ def _Scanner(file_node, env, path):
   # line to get this to work with Repository() directories.
   # Get this functionality folded back into the upstream grit tool.
   #grd = grd_reader.Parse(str(file_node)), debug=_IsDebugEnabled())
-  grd = grd_reader.Parse(str(file_node.rfile()), debug=_IsDebugEnabled())
+  grd = grd_reader.Parse(os.path.abspath(_SourceToFile(file_node)),
+                         debug=_IsDebugEnabled())
   files = []
   for node in grd:
     if (node.name == 'structure' or node.name == 'skeleton' or
         (node.name == 'file' and node.parent and
          node.parent.name == 'translations')):
       files.append(os.path.abspath(node.GetFilePath()))
-    elif node.name == 'include' and node.attrs['filenameonly'] == 'false':
-      # TODO(tc): This doesn't work because the path is often relative to 
-      #files.append(node.FilenameToOpen())
-      pass
+    elif node.name == 'include':
+      files.append(node.FilenameToOpen())
 
   # Add in the grit source files.  If one of these change, we want to re-run
   # grit.
diff --git a/tools/grit/grit/tool/build.py b/tools/grit/grit/tool/build.py
index fa064fc..a8488e8 100644
--- a/tools/grit/grit/tool/build.py
+++ b/tools/grit/grit/tool/build.py
@@ -157,15 +157,6 @@ are exported to translation interchange files (e.g. XMB files), etc.
     for output in self.res.GetOutputFiles():
       self.VerboseOut('Creating %s...' % output.GetFilename())
 
-      # Don't build data package files on windows because it's not used and
-      # there are project dependency issues.  We still need to create the file
-      # to satisfy build dependencies.
-      linux_or_mac = (sys.platform == 'linux2' or sys.platform == 'darwin')
-      if output.GetType() == 'data_package' and not linux_or_mac:
-        f = open(output.GetOutputFilename(), 'wb')
-        f.close()
-        continue
-
       # Microsoft's RC compiler can only deal with single-byte or double-byte
       # files (no UTF-8), so we make all RC files UTF-16 to support all
       # character sets.