Add using_generated_resources.scons to the build. This

is the same as using_generated_resources.vsprops.
Replace existing paths with this scons file if the SConscript
file has already been converted to the using_ format.

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


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

6 files changed, 20 insertions, 4 deletions

diff --git a/build/SConscript.main b/build/SConscript.main
index 172feac..fa4483a 100644
--- a/build/SConscript.main
+++ b/build/SConscript.main
@@ -137,6 +137,7 @@ root_env = Environment(
     THIRD_PARTY_WEBKIT_DIR = '$THIRD_PARTY_DIR/WebKit',
 
     GTK_CLIP_DUMP_DIR     = '$TOOLS_DIR/gtk_clipboard_dump',
+    GRIT_DIR              = '$TOOLS_DIR/grit',
 
     PYTHON=sys.executable,
 
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index ad274c4..3e78f23 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -10,6 +10,7 @@ env.SConscript([
     '$CHROME_DIR/third_party/hunspell/using_hunspell.scons',
     '$CHROME_DIR/third_party/wtl/using_wtl.scons',
     '$GOOGLE_UPDATE_DIR/using_google_update.scons',
+    '$GRIT_DIR/build/using_generated_resources.scons',
     '$GTEST_DIR/../using_gtest.scons',
     '$ICU38_DIR/using_icu38.scons',
     '$LIBPNG_DIR/using_libpng.scons',
@@ -21,7 +22,6 @@ env.SConscript([
 
 env.Prepend(
     CPPPATH = [
-        '$TARGET_ROOT/grit_derived_sources',
         '$CHROME_DIR/app',
         '$CHROME_SRC_DIR',
         # To get the #include of history_indexer.h,
diff --git a/chrome/browser/debugger/debugger.scons b/chrome/browser/debugger/debugger.scons
index 3c974f8..22c62d8 100644
--- a/chrome/browser/debugger/debugger.scons
+++ b/chrome/browser/debugger/debugger.scons
@@ -9,6 +9,7 @@ env = env.Clone()
 env.SConscript([
     '$BREAKPAD_DIR/using_breakpad.scons',
     '$CHROME_DIR/third_party/wtl/using_wtl.scons',
+    '$GRIT_DIR/build/using_generated_resources.scons',
     '$ICU38_DIR/using_icu38.scons',
     '$LIBPNG_DIR/using_libpng.scons',
     '$LIBXML_DIR/using_libxml.scons',
@@ -19,7 +20,6 @@ env.SConscript([
 
 env.Prepend(
     CPPPATH = [
-        '$TARGET_ROOT/grit_derived_sources',
         '$CHROME_DIR/app',
         '$CHROME_SRC_DIR',
     ],
diff --git a/chrome/common/common.scons b/chrome/common/common.scons
index e72ed47..c3f00ee 100644
--- a/chrome/common/common.scons
+++ b/chrome/common/common.scons
@@ -9,6 +9,7 @@ env = env.Clone()
 env.SConscript([
     '$BREAKPAD_DIR/using_breakpad.scons',
     '$CHROME_DIR/third_party/wtl/using_wtl.scons',
+    '$GRIT_DIR/build/using_generated_resources.scons',
     '$ICU38_DIR/using_icu38.scons',
     '$LIBJPEG_DIR/using_libjpeg.scons',
     '$LIBPNG_DIR/using_libpng.scons',
@@ -20,7 +21,6 @@ env.SConscript([
 
 env.Prepend(
     CPPPATH = [
-        '$TARGET_ROOT/grit_derived_sources',
         '$CHROME_DIR/app',
         '$CHROME_SRC_DIR',
     ],
diff --git a/chrome/renderer/renderer.scons b/chrome/renderer/renderer.scons
index d0639ba..b50c25f 100644
--- a/chrome/renderer/renderer.scons
+++ b/chrome/renderer/renderer.scons
@@ -8,6 +8,7 @@ env = env.Clone()
 
 env.SConscript([
     '$CHROME_DIR/third_party/wtl/using_wtl.scons',
+    '$GRIT_DIR/build/using_generated_resources.scons',
     '$ICU38_DIR/using_icu38.scons',
     '$NPAPI_DIR/using_npapi.scons',
     '$SKIA_DIR/using_skia.scons',
@@ -15,7 +16,6 @@ env.SConscript([
 
 env.Prepend(
     CPPPATH = [
-        '$TARGET_ROOT/grit_derived_sources',
         '$CHROME_SRC_DIR',
     ],
 )
diff --git a/tools/grit/build/using_generated_resources.scons b/tools/grit/build/using_generated_resources.scons
new file mode 100644
index 0000000..1a2f673
--- /dev/null
+++ b/tools/grit/build/using_generated_resources.scons
@@ -0,0 +1,15 @@
+# Copyright (c) 2006-2008 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.
+
+__doc__ = """
+Settings for other components using resources generated by GRIT.
+"""
+
+Import("env")
+
+env.Append(
+    CPPPATH = [
+        '$TARGET_ROOT/grit_derived_sources',
+    ],
+)