Remove net_resources.rc and net_resources.h and replace it

with a grd file that generates the same thing.  We want to do
this so on linux, we will have grit generate the .h file and
a platform specific resource file.

There's some munging going on to be able to get the
effective_tld_names_clean.dat file included in the rc.

This works in visual studio and scons.  I need to update
chrome_kjs.sln and the webkit*.sln files and the mac build before committing.

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

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

7 files changed, 39 insertions, 4 deletions

diff --git a/webkit/build/localized_strings/SConscript b/webkit/build/localized_strings/SConscript
index 39af769..5de0337 100644
--- a/webkit/build/localized_strings/SConscript
+++ b/webkit/build/localized_strings/SConscript
@@ -23,7 +23,6 @@ if env_res.Bit('windows'):
       ],
   )
 
-import os
 import sys
 sys.path.append(env.Dir('$CHROME_SRC_DIR/tools/grit').abspath)
 env_grd = env.Clone()
diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript
index f41ee88..4a81850 100644
--- a/webkit/tools/test_shell/SConscript
+++ b/webkit/tools/test_shell/SConscript
@@ -178,7 +178,7 @@ if env.Bit('windows'):
   # TODO(port): figure out what to do with resources.
   resources = [
       env_res.RES('resources/test_shell.rc'),
-      '$NET_DIR/net_resources.res',
+      '$TARGET_ROOT/grit_derived_sources/net_resources.res',
       '$TARGET_ROOT/grit_derived_sources/webkit_strings_en-US.res',
   ]
 
diff --git a/webkit/tools/test_shell/test_shell.vcproj b/webkit/tools/test_shell/test_shell.vcproj
index 86f1f39..9b55748 100644
--- a/webkit/tools/test_shell/test_shell.vcproj
+++ b/webkit/tools/test_shell/test_shell.vcproj
@@ -145,7 +145,7 @@
 			Name="resources"
 			>
 			<File
-				RelativePath="..\..\..\net\base\net_resources.rc"
+				RelativePath="$(OutDir)\grit_derived_sources\net_resources.rc"
 				>
 			</File>
 			<File
diff --git a/webkit/tools/test_shell/test_shell_tests.vcproj b/webkit/tools/test_shell/test_shell_tests.vcproj
index cb579d5..ff0a6b2 100644
--- a/webkit/tools/test_shell/test_shell_tests.vcproj
+++ b/webkit/tools/test_shell/test_shell_tests.vcproj
@@ -183,7 +183,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\net\base\net_resources.rc"
+				RelativePath="$(OutDir)\grit_derived_sources\net_resources.rc"
 				>
 			</File>
 			<File
diff --git a/webkit/webkit.sln b/webkit/webkit.sln
index 52c99fb..58d59dd 100644
--- a/webkit/webkit.sln
+++ b/webkit/webkit.sln
@@ -112,6 +112,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "..\net\build\net.vcp
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
 		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41} = {E13045CD-7E1F-4A41-9B18-8D288B2E7B41}
 	EndProjectSection
 EndProject
@@ -414,6 +415,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "..\third_party\sq
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net_resources", "..\net\build\net_resources.vcproj", "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -512,6 +519,10 @@ Global
 		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Debug|Win32.Build.0 = Debug|Win32
 		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Release|Win32.ActiveCfg = Release|Win32
 		{865575D0-37E2-405E-8CBA-5F6C485B5A26}.Release|Win32.Build.0 = Release|Win32
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Win32.Build.0 = Debug|Win32
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|Win32.ActiveCfg = Release|Win32
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|Win32.Build.0 = Release|Win32
 		{8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Win32.Build.0 = Debug|Win32
 		{8C27D792-2648-4F5E-9ED0-374276327308}.Release|Win32.ActiveCfg = Release|Win32
@@ -621,6 +632,7 @@ Global
 		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{865575D0-37E2-405E-8CBA-5F6C485B5A26} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{8C27D792-2648-4F5E-9ED0-374276327308} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{A0D94973-D355-47A5-A1E2-3456F321F010} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
diff --git a/webkit/webkit_armu.sln b/webkit/webkit_armu.sln
index 79a0c9b..99a7e0b 100644
--- a/webkit/webkit_armu.sln
+++ b/webkit/webkit_armu.sln
@@ -113,6 +113,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "..\net\build\net.vcp
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
 		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41} = {E13045CD-7E1F-4A41-9B18-8D288B2E7B41}
 	EndProjectSection
 EndProject
@@ -388,6 +389,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "..\third_party\sq
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net_resources", "..\net\build\net_resources.vcproj", "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -478,6 +485,10 @@ Global
 		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Debug|Win32.Build.0 = Debug|Win32
 		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Release|Win32.ActiveCfg = Release|Win32
 		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}.Release|Win32.Build.0 = Release|Win32
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Win32.Build.0 = Debug|Win32
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|Win32.ActiveCfg = Release|Win32
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|Win32.Build.0 = Release|Win32
 		{8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Win32.Build.0 = Debug|Win32
 		{8C27D792-2648-4F5E-9ED0-374276327308}.Release|Win32.ActiveCfg = Release|Win32
@@ -581,6 +592,7 @@ Global
 		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{8C27D792-2648-4F5E-9ED0-374276327308} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{A0D94973-D355-47A5-A1E2-3456F321F010} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
diff --git a/webkit/webkit_kjs.sln b/webkit/webkit_kjs.sln
index 6e340f1..c9603cb 100644
--- a/webkit/webkit_kjs.sln
+++ b/webkit/webkit_kjs.sln
@@ -96,6 +96,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "..\net\build\net.vcp
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
 		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41} = {E13045CD-7E1F-4A41-9B18-8D288B2E7B41}
 	EndProjectSection
 EndProject
@@ -399,6 +400,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "..\third_party\sq
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net_resources", "..\net\build\net_resources.vcproj", "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -493,6 +500,10 @@ Global
 		{867F64C9-D631-41A9-B467-13D6378A72AA}.Debug|Win32.Build.0 = Debug|Win32
 		{867F64C9-D631-41A9-B467-13D6378A72AA}.Release|Win32.ActiveCfg = Release|Win32
 		{867F64C9-D631-41A9-B467-13D6378A72AA}.Release|Win32.Build.0 = Release|Win32
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Win32.Build.0 = Debug|Win32
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|Win32.ActiveCfg = Release|Win32
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|Win32.Build.0 = Release|Win32
 		{8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8C27D792-2648-4F5E-9ED0-374276327308}.Debug|Win32.Build.0 = Debug|Win32
 		{8C27D792-2648-4F5E-9ED0-374276327308}.Release|Win32.ActiveCfg = Release|Win32
@@ -597,6 +608,7 @@ Global
 		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{867F64C9-D631-41A9-B467-13D6378A72AA} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
+		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{8C27D792-2648-4F5E-9ED0-374276327308} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{A0D94973-D355-47A5-A1E2-3456F321F010} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}