Some more GRIT refactoring.

Moved the grit .vsprops file from chrome/tools/build/win/ to
/tools/grit/build and renamed to using_generated_resources.vsprops.
Updated non-chrome projects to use the this new vsprops file.

Created a new .rules file and renamed the old one.  Now there are
grit_resources.rules and grit_localized_resources.rules.  The latter
is what we use now, but I'll be adding some grd files that use the
former in a follow up change.

This is just vsprops reshuffling for now.  I'll also add a
using_generated_resources.scons in a follow up change.

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

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

15 files changed, 39 insertions, 19 deletions

diff --git a/chrome/app/chrome_binaries.vsprops b/chrome/app/chrome_binaries.vsprops
index 00216a7..2768582 100644
--- a/chrome/app/chrome_binaries.vsprops
+++ b/chrome/app/chrome_binaries.vsprops
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="chrome_binaries"
-	InheritedPropertySheets="$(SolutionDir)..\breakpad\using_breakpad.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\libxslt\build\using_libxslt.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;..\tools\build\win\using_generated_strings.vsprops;$(SolutionDir)third_party\wtl\using_wtl.vsprops"
+	InheritedPropertySheets="$(SolutionDir)..\breakpad\using_breakpad.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\libxslt\build\using_libxslt.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\tools\grit\build\using_generated_resources.vsprops;$(SolutionDir)third_party\wtl\using_wtl.vsprops"
 	>
 	<Tool
 		Name="VCLinkerTool"
diff --git a/chrome/app/generated_resources.vcproj b/chrome/app/generated_resources.vcproj
index e9c96fde..bc39fd6 100644
--- a/chrome/app/generated_resources.vcproj
+++ b/chrome/app/generated_resources.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\..\tools\grit\build\grit_resource_file.rules"
+			RelativePath="..\..\tools\grit\build\grit_localized_resources.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
diff --git a/chrome/browser/browser.vsprops b/chrome/browser/browser.vsprops
index b978e89..a6fa777 100644
--- a/chrome/browser/browser.vsprops
+++ b/chrome/browser/browser.vsprops
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="browser"
-	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\breakpad\using_breakpad.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;..\tools\build\win\using_generated_strings.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)third_party\wtl\using_wtl.vsprops;..\third_party\hunspell\using_hunspell.vsprops;$(SolutionDir)..\google_update\using_google_update.vsprops"
+	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\breakpad\using_breakpad.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\tools\grit\build\using_generated_resources.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)third_party\wtl\using_wtl.vsprops;..\third_party\hunspell\using_hunspell.vsprops;$(SolutionDir)..\google_update\using_google_update.vsprops"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
diff --git a/chrome/browser/debugger/debugger.vsprops b/chrome/browser/debugger/debugger.vsprops
index 4d941fc..342fffc 100644
--- a/chrome/browser/debugger/debugger.vsprops
+++ b/chrome/browser/debugger/debugger.vsprops
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="debugger"
-	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\breakpad\using_breakpad.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)\tools\build\win\using_generated_strings.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)third_party\wtl\using_wtl.vsprops"
+	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\breakpad\using_breakpad.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\tools\grit\build\using_generated_resources.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)third_party\wtl\using_wtl.vsprops"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
diff --git a/chrome/common/common.vsprops b/chrome/common/common.vsprops
index 7225cbc..3e611fc 100644
--- a/chrome/common/common.vsprops
+++ b/chrome/common/common.vsprops
@@ -3,6 +3,6 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="common (chrome)"
-	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\third_party\libjpeg\using_libjpeg.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;..\tools\build\win\using_generated_strings.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)..\chrome\third_party\wtl\using_wtl.vsprops"
+	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\third_party\libjpeg\using_libjpeg.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\tools\grit\build\using_generated_resources.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)..\chrome\third_party\wtl\using_wtl.vsprops"
 	>
 </VisualStudioPropertySheet>
diff --git a/chrome/renderer/renderer.vsprops b/chrome/renderer/renderer.vsprops
index 19eda36..a0699cc 100644
--- a/chrome/renderer/renderer.vsprops
+++ b/chrome/renderer/renderer.vsprops
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="renderer"
-	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;..\tools\build\win\using_generated_strings.vsprops;..\..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)third_party\wtl\using_wtl.vsprops"
+	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)..\tools\grit\build\using_generated_resources.vsprops;..\..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)third_party\wtl\using_wtl.vsprops"
 	>
 	<Tool
 		Name="VCResourceCompilerTool"
diff --git a/chrome/tools/build/win/unit_test.vsprops b/chrome/tools/build/win/unit_test.vsprops
index 61bb8ae..fdfbd83 100644
--- a/chrome/tools/build/win/unit_test.vsprops
+++ b/chrome/tools/build/win/unit_test.vsprops
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="unit_test"
-	InheritedPropertySheets="$(SolutionDir)third_party\wtl\using_wtl.vsprops;.\using_generated_strings.vsprops"
+	InheritedPropertySheets="$(SolutionDir)third_party\wtl\using_wtl.vsprops;$(SolutionDir)..\tools\grit\build\using_generated_resources.vsprops"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
diff --git a/chrome/views/views.vsprops b/chrome/views/views.vsprops
index 8f1625a..72a6e0d 100644
--- a/chrome/views/views.vsprops
+++ b/chrome/views/views.vsprops
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="views"
-        InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)third_party\wtl\using_wtl.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;..\tools\build\win\using_generated_strings.vsprops"
+        InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)third_party\wtl\using_wtl.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\tools\grit\build\using_generated_resources.vsprops"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
diff --git a/tools/grit/build/grit_resource_file.rules b/tools/grit/build/grit_localized_resources.rules
index 2f9e7f9..9c3a53b 100644
--- a/tools/grit/build/grit_resource_file.rules
+++ b/tools/grit/build/grit_localized_resources.rules
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VisualStudioToolFile
-	Name="GRIT resource data file"
+	Name="GRIT localized resources"
 	Version="8.00"
 	>
 	<Rules>
 		<CustomBuildRule
-			Name="GRIT Generated Resources"
-			DisplayName="GRIT Generated Resources"
+			Name="GRIT Generated Localized Resources"
+			DisplayName="GRIT Generated Localized Resources"
 			CommandLine="$(SolutionDir)..\tools\grit\build\grit_resource_file.bat [inputs] &quot;$(SolutionDir)&quot; &quot;$(OutDir)\grit_derived_sources&quot;"
 			Outputs="$(OutDir)\grit_derived_sources\$(InputName).h;
 			  $(OutDir)\grit_derived_sources\$(InputName)_ar.rc;
diff --git a/tools/grit/build/grit_resources.rules b/tools/grit/build/grit_resources.rules
new file mode 100644
index 0000000..0f1614c
--- /dev/null
+++ b/tools/grit/build/grit_resources.rules
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<VisualStudioToolFile
+	Name="GRIT resources"
+	Version="8.00"
+	>
+	<Rules>
+		<CustomBuildRule
+			Name="GRIT Generated Resources"
+			DisplayName="GRIT Generated Resources"
+			CommandLine="$(SolutionDir)..\tools\grit\build\grit_resource_file.bat [inputs] &quot;$(SolutionDir)&quot; &quot;$(OutDir)\grit_derived_sources&quot;"
+			Outputs="$(OutDir)\grit_derived_sources\$(InputName).h"
+			AdditionalDependencies="$(SolutionDir)..\tools\grit\build\grit_resource_file.bat;$(SolutionDir)..\tools\grit\grit.py"
+			FileExtensions="*.grd"
+			ExecutionDescription="Generating resources..."
+			>
+			<Properties>
+			</Properties>
+		</CustomBuildRule>
+	</Rules>
+</VisualStudioToolFile>
diff --git a/chrome/tools/build/win/using_generated_strings.vsprops b/tools/grit/build/using_generated_resources.vsprops
index a92594bcd..4295061 100644
--- a/chrome/tools/build/win/using_generated_strings.vsprops
+++ b/tools/grit/build/using_generated_resources.vsprops
@@ -2,7 +2,7 @@
 <VisualStudioPropertySheet
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="using_generated_strings"
+	Name="using_generated_resources"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
diff --git a/webkit/build/glue/glue.vsprops b/webkit/build/glue/glue.vsprops
index 29633cf..f120d30 100644
--- a/webkit/build/glue/glue.vsprops
+++ b/webkit/build/glue/glue.vsprops
@@ -3,11 +3,11 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="glue"
-	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;..\webkit_common.vsprops"
+	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;..\webkit_common.vsprops;$(SolutionDir)..\tools\grit\build\using_generated_resources.vsprops"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\..\glue;&quot;$(OutDir)&quot;;&quot;$(OutDir)\grit_derived_sources&quot;;"
+		AdditionalIncludeDirectories="..\..\glue;&quot;$(OutDir)&quot;"
 		PreprocessorDefinitions="_SCL_SECURE_NO_DEPRECATE;_HAS_EXCEPTIONS=1"
 		WarnAsError="true"
 	/>
diff --git a/webkit/build/localized_strings/localized_strings.vcproj b/webkit/build/localized_strings/localized_strings.vcproj
index 5d5ba15..c0d3add 100644
--- a/webkit/build/localized_strings/localized_strings.vcproj
+++ b/webkit/build/localized_strings/localized_strings.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\..\..\tools\grit\build\grit_resource_file.rules"
+			RelativePath="..\..\..\tools\grit\build\grit_localized_resources.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
diff --git a/webkit/default_plugin/default_plugin.vsprops b/webkit/default_plugin/default_plugin.vsprops
index cb111c8..00f05c7 100644
--- a/webkit/default_plugin/default_plugin.vsprops
+++ b/webkit/default_plugin/default_plugin.vsprops
@@ -3,10 +3,10 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="default plugin"
-	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops"
+	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\tools\grit\build\using_generated_resources.vsprops"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="$(OutDir)\grit_derived_sources"
+		AdditionalIncludeDirectories=""
 	/>
 </VisualStudioPropertySheet>
diff --git a/webkit/tools/test_shell/test_shell.vsprops b/webkit/tools/test_shell/test_shell.vsprops
index 442c4f4..5e6d0c8 100644
--- a/webkit/tools/test_shell/test_shell.vsprops
+++ b/webkit/tools/test_shell/test_shell.vsprops
@@ -3,11 +3,11 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="test_shell"
-	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\webkit\build\webkit_common_includes.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\breakpad\using_breakpad.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)..\skia\using_skia.vsprops"
+	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\webkit\build\webkit_common_includes.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\breakpad\using_breakpad.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\tools\grit\build\using_generated_resources.vsprops"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;$(OutDir)\WebKit&quot;;&quot;$(SolutionDir)&quot;;&quot;$(OutDir)\grit_derived_sources&quot;;&quot;$(SolutionDir)webkit\port\bridge&quot;;&quot;$(SolutionDir)webkit\port\platform&quot;;&quot;$(SolutionDir)webkit\port\platform\network&quot;;&quot;$(SolutionDir)webkit\glue&quot;;&quot;$(SolutionDir)third_party\webkit\src\&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders&quot;;&quot;$(OutDir)&quot;"
+		AdditionalIncludeDirectories="&quot;$(OutDir)\WebKit&quot;;&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)webkit\port\bridge&quot;;&quot;$(SolutionDir)webkit\port\platform&quot;;&quot;$(SolutionDir)webkit\port\platform\network&quot;;&quot;$(SolutionDir)webkit\glue&quot;;&quot;$(SolutionDir)third_party\webkit\src\&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders&quot;;&quot;$(OutDir)&quot;"
 		PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
 	/>
 	<Tool