Add a --depfile flag that explicitly names the generated depfile.

grit/tool/build.py

Index: grit/tool/build.py
===================================================================
--- grit/tool/build.py	(revision 141)
+++ grit/tool/build.py	(working copy)
@@ -98,8 +98,9 @@
     first_ids_file = None
     whitelist_filenames = []
     target_platform = None
-    dep_dir = None
-    (own_opts, args) = getopt.getopt(args, 'o:D:E:f:w:t:', ('dep-dir=',))
+    depfile = None
+    depdir = None
+    (own_opts, args) = getopt.getopt(args, 'o:D:E:f:w:t:', ('depdir=','depfile='))
     for (key, val) in own_opts:
       if key == '-o':
         self.output_directory = val
@@ -118,8 +119,10 @@
         whitelist_filenames.append(val)
       elif key == '-t':
         target_platform = val
-      elif key == '--dep-dir':
-        dep_dir = val
+      elif key == '--depdir':

[Jói, 2014/01/02 10:45:12]

You're changing this flag from --dep-dir to --depdir; I'm assuming this is
intentional and that you intend to update Chrome's usage of the flag at the same
time as you roll the GRIT revision.

[Nico, 2014/01/06 17:48:50]

Yes, it's intentional (to match "depfile"). I think Chrome doesn't use this yet
so changing it should be safe.

+        depdir = val
+      elif key == '--depfile':
+        depfile = val
 
     if len(args):
       print 'This tool takes no tool-specific arguments.'
@@ -151,8 +154,8 @@
     self.res.RunGatherers()
     self.Process()
 
-    if dep_dir:
-      self.GenerateDepfile(opts.input, dep_dir)
+    if depfile:
+      self.GenerateDepfile(opts.input, depfile, depdir)

[Jói, 2014/01/02 10:45:12]

Perhaps assert that if depfile is set, depdir is also set?

Alternatively I guess you could default depdir to the directory enclosing
depfile.

[Nico, 2014/01/06 17:48:50]

Changed this to `if depfile and depdir`

 
     return 0
 
@@ -310,11 +313,10 @@
       print self.res.UberClique().missing_translations_
       sys.exit(-1)
 
-  def GenerateDepfile(self, input_filename, dep_dir):
+  def GenerateDepfile(self, input_filename, depfile, depdir):
     '''Generate a depfile that contains the imlicit dependencies of the input
     grd. The depfile will be in the same format as a makefile, and will contain
-    references to files relative to |dep_dir|. It will be put in the same
-    directory as the generated outputs.
+    references to files relative to |depdir|. It will be put in depfile.

[koz (OOO until 15th September), 2014/01/05 23:21:58]

nit: depfile -> |depfile|

[Nico, 2014/01/06 17:48:50]

Done.

 
     For example, supposing we have three files in a directory src/
 
@@ -325,23 +327,21 @@
 
     and we run
 
-      grit -i blah.grd -o ../out/gen --dep-dir ../out
+      grit -i blah.grd -o ../out/gen --depdir ../out --depfile ../out/gen/blah.rd.d
 
     from the directory src/ we will generate a depfile ../out/gen/blah.grd.d
     that has the contents
 
       gen/blah.grd.d: ../src/input1.xtb ../src/input2.xtb
 
-    Note that all paths in the depfile are relative to ../out, the dep-dir.
+    Note that all paths in the depfile are relative to ../out, the depdir.
     '''
-    depsfile_basename = os.path.basename(input_filename + '.d')
-    depfile = os.path.abspath(
-        os.path.join(self.output_directory, depsfile_basename))
-    dep_dir = os.path.abspath(dep_dir)
+    depfile = os.path.abspath(depfile)
+    depdir = os.path.abspath(depdir)
     # The path prefix to prepend to dependencies in the depfile.
-    prefix = os.path.relpath(os.getcwd(), dep_dir)
+    prefix = os.path.relpath(os.getcwd(), depdir)
     # The path that the depfile refers to itself by.
-    self_ref_depfile = os.path.relpath(depfile, dep_dir)
+    self_ref_depfile = os.path.relpath(depfile, depdir)
     infiles = self.res.GetInputFiles()
     deps_text = ' '.join([os.path.join(prefix, i) for i in infiles])
     depfile_contents = self_ref_depfile + ': ' + deps_text