Standardize grit invokes

build/grit_target.gypi

Index: build/grit_target.gypi
===================================================================
--- build/grit_target.gypi	(revision 0)
+++ build/grit_target.gypi	(revision 0)
@@ -0,0 +1,30 @@
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This file is meant to be included into an target that will be one or

[Mark Mentovai, 2011/03/25 18:22:07]

an target -> a target

[Mark Mentovai, 2011/03/25 18:22:07]

will be is wrong, what did you mean?

[TVL, 2011/03/25 18:33:30]

Done.

[TVL, 2011/03/25 18:33:30]

Done.

+# more uses of grit_action.gypi. To use this the following variables need to
+# be defined:
+#   grit_out_dir: string: the output directory path
+#

[Mark Mentovai, 2011/03/25 18:22:07]

Remove this line.

[TVL, 2011/03/25 18:33:30]

Done.

+
+# NOTE: This file is optional, not all targets that use grit include it, some
+# do their own custom directives instead.
+{
+  'direct_dependent_settings': {

[Mark Mentovai, 2011/03/25 17:48:55]

Really? I guess this means that you’re expecting all users of this to be
none-type targets and to have all of the real compiling done in dependents?

This is wrong if the action winds up living in a non-none-type target, like a
static_library.

[TVL, 2011/03/25 18:15:53]

Yea, I'm torn on this one.  It was in every place we've used this because we
always made a target for these and didn't directly hang them on other targets. 
So in the effort to cut down common code I did this.

[Mark Mentovai, 2011/03/25 18:22:07]

TVL wrote:
Have you considered putting this inside a target_conditions? If _type is none,
do what you’ve got here. Otherwise, bring include_dirs directly into the target,
no direct_dependent_settings. Then we can start transitioning these to happen
directly in targets where that makes sense.

[TVL, 2011/03/25 18:33:30]

makes sense, i'll take a shot at that next.

+    'include_dirs': [
+      '<(grit_out_dir)',
+    ],
+  },
+  'conditions': [
+    ['OS=="win"', {
+      'dependencies': ['<(DEPTH)/build/win/system.gyp:cygwin'],
+    }],
+  ],
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2:
Property changes on: build/grit_target.gypi
___________________________________________________________________
Added: svn:eol-style
   + LF