remove libxslt_config.vcproj and add generate header script

It turns out that config.h is not used on windows so we don't need
to check it in.  There's a libxslt/xsltconfig.h that is generated
and used, but it's been checked into the tree since initial.commit.

I also added a libxslt.vsprops to make updating include paths easier.

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

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

12 files changed, 26 insertions, 221 deletions

diff --git a/chrome/chrome.sln b/chrome/chrome.sln
index 6d77632..7ec883c 100755
--- a/chrome/chrome.sln
+++ b/chrome/chrome.sln
@@ -67,7 +67,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCore", "..\webkit\build\
 	ProjectSection(ProjectDependencies) = postProject
 		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
 		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B} = {4BD929D4-494B-4EE8-91F6-FD0277A51D2B}
 		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
 	EndProjectSection
 EndProject
@@ -88,7 +87,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glue", "..\webkit\build\glu
 	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
 		{0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9}
-		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
 		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
 		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}
 		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
@@ -231,7 +229,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt", "..\third_party\l
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B} = {4BD929D4-494B-4EE8-91F6-FD0277A51D2B}
 		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
 	EndProjectSection
 EndProject
@@ -1102,18 +1099,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "activex_test_control", "tes
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libxslt projects", "libxslt projects", "{BC732CFC-DE0A-4CF5-B8AA-3269C2F6D399}"
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt_config", "..\third_party\libxslt\build\libxslt_config.vcproj", "{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}"
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "default_plugin", "..\webkit\default_plugin\default_plugin.vcproj", "{5916D37D-8C97-424F-A904-74E52594C2D6}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
@@ -2302,14 +2287,6 @@ Global
 		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Release|Win32.ActiveCfg = Release|Win32
 		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Release|Win32.Build.0 = Release|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Debug|Win32.Build.0 = Debug|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Release|Win32.ActiveCfg = Release|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Release|Win32.Build.0 = Release|Win32
 		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -3211,7 +3188,6 @@ Global
 		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA}
 		{4B60E8B8-416F-40B2-8A54-F75970A21992} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{4B6E199A-034A-49BD-AB93-458DD37E45B1} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B} = {BC732CFC-DE0A-4CF5-B8AA-3269C2F6D399}
 		{50B079C7-CD01-42D3-B8C4-9F8D9322E822} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
 		{5597AD47-3494-4750-A235-4F9C2F864700} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
 		{57823D8C-A317-4713-9125-2C91FDFD12D6} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
@@ -3273,7 +3249,6 @@ Global
 		{B92AE829-E1CD-4781-824A-DCB1603A1672} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
 		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
 		{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{BC732CFC-DE0A-4CF5-B8AA-3269C2F6D399} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{BE6D5659-A8D5-4890-A42C-090DD10EF62C} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
 		{BF4F447B-72B5-4059-BE1B-F94337B1F385} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
@@ -3320,7 +3295,7 @@ Global
 		{FA39524D-3067-4141-888D-28A86C66F2B9} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
 		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
 		{FA660037-EB40-4A43-AA9D-9653C57F2789} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {BC732CFC-DE0A-4CF5-B8AA-3269C2F6D399}
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {B6867423-23BD-4588-9321-2D500F128A3D}
 	EndGlobalSection
 EndGlobal
diff --git a/chrome/chrome_kjs.sln b/chrome/chrome_kjs.sln
index 5a147be..43adef8 100644
--- a/chrome/chrome_kjs.sln
+++ b/chrome/chrome_kjs.sln
@@ -68,7 +68,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCore", "..\webkit\build\
 	ProjectSection(ProjectDependencies) = postProject
 		{2BCD6193-D243-422C-BB1A-BC219BF147B3} = {2BCD6193-D243-422C-BB1A-BC219BF147B3}
 		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B} = {4BD929D4-494B-4EE8-91F6-FD0277A51D2B}
 		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
 	EndProjectSection
 EndProject
@@ -91,7 +90,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glue", "..\webkit\build\glu
 		{0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9}
 		{2BCD6193-D243-422C-BB1A-BC219BF147B3} = {2BCD6193-D243-422C-BB1A-BC219BF147B3}
 		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B} = {4BD929D4-494B-4EE8-91F6-FD0277A51D2B}
 		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
@@ -232,7 +230,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt", "..\third_party\l
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B} = {4BD929D4-494B-4EE8-91F6-FD0277A51D2B}
 		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
 	EndProjectSection
 EndProject
@@ -1095,18 +1092,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "activex_test_control", "tes
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libxslt projects", "libxslt projects", "{2A3885E6-15C7-4B66-88FF-5D05058B27A0}"
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt_config", "..\third_party\libxslt\build\libxslt_config.vcproj", "{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}"
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "default_plugin", "..\webkit\default_plugin\default_plugin.vcproj", "{5916D37D-8C97-424F-A904-74E52594C2D6}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
@@ -2141,16 +2126,6 @@ Global
 		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Release|Win32.ActiveCfg = Release|Win32
 		{4B6E199A-034A-49BD-AB93-458DD37E45B1}.Release|Win32.Build.0 = Release|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Debug|Win32.Build.0 = Debug|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Release|Any CPU.ActiveCfg = Release|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Release|Win32.ActiveCfg = Release|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Release|Win32.Build.0 = Release|Win32
 		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Debug|Mixed Platforms.Build.0 = Debug|Win32
@@ -3119,7 +3094,6 @@ Global
 		{24A5AC7C-280B-4899-9153-6BA570A081E7} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
 		{275F2993-EE9B-4E00-9C85-10A182FD423A} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{27A30967-4BBA-48D1-8522-CDE95F7B1CEC} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{2A3885E6-15C7-4B66-88FF-5D05058B27A0} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{2BCD6193-D243-422C-BB1A-BC219BF147B3} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
 		{2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357} = {846901FD-A619-4BD5-A303-38174730CDD6}
@@ -3139,7 +3113,6 @@ Global
 		{494E414B-1655-48CE-996D-6413ECFB7829} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
 		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA}
 		{4B6E199A-034A-49BD-AB93-458DD37E45B1} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B} = {2A3885E6-15C7-4B66-88FF-5D05058B27A0}
 		{50B079C7-CD01-42D3-B8C4-9F8D9322E822} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
 		{5597AD47-3494-4750-A235-4F9C2F864700} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
 		{5916D37D-8C97-424F-A904-74E52594C2D6} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
@@ -3234,7 +3207,7 @@ Global
 		{FA39524D-3067-4141-888D-28A86C66F2B9} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
 		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
 		{FA660037-EB40-4A43-AA9D-9653C57F2789} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {2A3885E6-15C7-4B66-88FF-5D05058B27A0}
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D} = {B6867423-23BD-4588-9321-2D500F128A3D}
 	EndGlobalSection
 EndGlobal
diff --git a/third_party/libxslt/README.google b/third_party/libxslt/README.google
index 3a3ccfe..792f0f0 100644
--- a/third_party/libxslt/README.google
+++ b/third_party/libxslt/README.google
@@ -12,7 +12,8 @@ To import a new snapshot of libxslt:
   distribution.
 - Copy the files into this directory, omitting files which have been omitted
   here.
-- Remove libxslt/xsltconfig.h and libexslt/exsltconfig.h.
+- Run build/generate-win32-headers.bat to re-generate the configuration
+  headers.
 - 'cd linux && sh ../configure --with-libxml-src=../../libxml/linux/' to
   re-generate configuration headers.
 - Perform the modification above.
diff --git a/third_party/libxslt/build/generate-win32-headers.bat b/third_party/libxslt/build/generate-win32-headers.bat
new file mode 100755
index 0000000..efa8acf
--- /dev/null
+++ b/third_party/libxslt/build/generate-win32-headers.bat
@@ -0,0 +1,6 @@
+REM Generate libxslt/xsltconfig.h.
+REM We don't need config.h on windows, so we delete that file.
+
+cd %~dp0\..\win32
+cscript //E:jscript configure.js compiler=msvc
+del ..\config.h
diff --git a/third_party/libxslt/build/libxslt.vcproj b/third_party/libxslt/build/libxslt.vcproj
index 123b8b1..f9fbee4 100644
--- a/third_party/libxslt/build/libxslt.vcproj
+++ b/third_party/libxslt/build/libxslt.vcproj
@@ -16,7 +16,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;$(SolutionDir)..\third_party\libxslt\build\using_libxslt.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\build\external_code.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops"
+			InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\libxslt.vsprops"
 			>
 			<Tool
 				Name="VCLibrarianTool"
@@ -28,7 +28,7 @@
 		<Configuration
 			Name="Release|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops;$(SolutionDir)..\third_party\libxslt\build\using_libxslt.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\build\external_code.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops"
+			InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\libxslt.vsprops"
 			>
 			<Tool
 				Name="VCLibrarianTool"
diff --git a/third_party/libxslt/build/libxslt.vsprops b/third_party/libxslt/build/libxslt.vsprops
new file mode 100644
index 0000000..4a41281
--- /dev/null
+++ b/third_party/libxslt/build/libxslt.vsprops
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="libxslt"
+	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\libxslt\build\using_libxslt.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\build\external_code.vsprops"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+	/>
+</VisualStudioPropertySheet>
diff --git a/third_party/libxslt/build/libxslt_config.bat b/third_party/libxslt/build/libxslt_config.bat
deleted file mode 100644
index 00c4ff9..0000000
--- a/third_party/libxslt/build/libxslt_config.bat
+++ /dev/null
@@ -1,13 +0,0 @@
-:: %1 is the input file js file
-:: %2 is the solution directory
-
-:: Change to the directory of the input file
-cd %~p1
-
-:: Make config.h
-cscript //E:jscript %1 compiler=msvc
-if errorlevel 1 echo %1: error: The javascript file failed to run.
-
-:: Make sure the timestamp on config.h is current.
-%2..\third_party\cygwin\bin\touch.exe ..\config.h
-
diff --git a/third_party/libxslt/build/libxslt_config.rules b/third_party/libxslt/build/libxslt_config.rules
deleted file mode 100644
index d603893..0000000
--- a/third_party/libxslt/build/libxslt_config.rules
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<VisualStudioToolFile
-	Name="libxslt config file"
-	Version="8.00"
-	>
-	<Rules>
-		<CustomBuildRule
-			Name="libxslt config file"
-			DisplayName="libxslt config file"
-			CommandLine=".\libxslt_config.bat [inputs] $(SolutionDir)"
-			Outputs="$(ProjectDir)..\config.h"
-			FileExtensions="*.js"
-			ExecutionDescription="Generating config.h..."
-			>
-		</CustomBuildRule>
-	</Rules>
-</VisualStudioToolFile>
diff --git a/third_party/libxslt/build/libxslt_config.vcproj b/third_party/libxslt/build/libxslt_config.vcproj
deleted file mode 100644
index a208228..0000000
--- a/third_party/libxslt/build/libxslt_config.vcproj
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="libxslt_config"
-	ProjectGUID="{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}"
-	RootNamespace="libxslt_config"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-		<ToolFile
-			RelativePath=".\libxslt_config.rules"
-		/>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="10"
-			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="libxslt config file"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="10"
-			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="libxslt config file"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\win32\configure.js"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/webkit/webkit.sln b/webkit/webkit.sln
index 542b703..91dd31f 100644
--- a/webkit/webkit.sln
+++ b/webkit/webkit.sln
@@ -245,7 +245,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt", "..\third_party\l
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B} = {4BD929D4-494B-4EE8-91F6-FD0277A51D2B}
 		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
 	EndProjectSection
 EndProject
@@ -315,18 +314,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "activex_shim_dll", "activex
 		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libxslt projects", "libxslt projects", "{0655DC38-C685-436C-8D99-7CF64CB2CC35}"
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt_config", "..\third_party\libxslt\build\libxslt_config.vcproj", "{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}"
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "default_plugin", "default_plugin\default_plugin.vcproj", "{5916D37D-8C97-424F-A904-74E52594C2D6}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
@@ -470,10 +457,6 @@ Global
 		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Debug|Win32.Build.0 = Debug|Win32
 		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Release|Win32.ActiveCfg = Release|Win32
 		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Release|Win32.Build.0 = Release|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Debug|Win32.Build.0 = Debug|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Release|Win32.ActiveCfg = Release|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Release|Win32.Build.0 = Release|Win32
 		{5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Win32.Build.0 = Debug|Win32
 		{5597AD47-3494-4750-A235-4F9C2F864700}.Release|Win32.ActiveCfg = Release|Win32
@@ -599,7 +582,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{0655DC38-C685-436C-8D99-7CF64CB2CC35} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{0B469837-3D46-484A-AFB3-C5A6C68730B9} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
 		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {4A249B49-19FB-4BD1-B017-718E7A4448EF}
 		{0E5474AC-5996-4B13-87C0-4AE931EE0815} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
@@ -613,7 +595,6 @@ Global
 		{326E9795-E760-410A-B69A-3F79DB3F5243} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{494E414B-1655-48CE-996D-6413ECFB7829} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
 		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {1DFD10B5-A673-4C3A-BA1D-3546FC4B7740}
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B} = {0655DC38-C685-436C-8D99-7CF64CB2CC35}
 		{5597AD47-3494-4750-A235-4F9C2F864700} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
 		{5916D37D-8C97-424F-A904-74E52594C2D6} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
 		{60B43839-95E6-4526-A661-209F16335E0E} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
@@ -643,6 +624,6 @@ Global
 		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{FA39524D-3067-4141-888D-28A86C66F2B9} = {4A249B49-19FB-4BD1-B017-718E7A4448EF}
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {0655DC38-C685-436C-8D99-7CF64CB2CC35}
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 	EndGlobalSection
 EndGlobal
diff --git a/webkit/webkit_armu.sln b/webkit/webkit_armu.sln
index 11e70a2..4c67fd6 100644
--- a/webkit/webkit_armu.sln
+++ b/webkit/webkit_armu.sln
@@ -238,7 +238,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt", "..\third_party\l
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B} = {4BD929D4-494B-4EE8-91F6-FD0277A51D2B}
 		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
 	EndProjectSection
 EndProject
@@ -308,18 +307,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "activex_shim_dll", "activex
 		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libxslt projects", "libxslt projects", "{0655DC38-C685-436C-8D99-7CF64CB2CC35}"
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt_config", "..\third_party\libxslt\build\libxslt_config.vcproj", "{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}"
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "default_plugin", "default_plugin\default_plugin.vcproj", "{5916D37D-8C97-424F-A904-74E52594C2D6}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
@@ -444,10 +431,6 @@ Global
 		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Debug|Win32.Build.0 = Debug|Win32
 		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Release|Win32.ActiveCfg = Release|Win32
 		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Release|Win32.Build.0 = Release|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Debug|Win32.Build.0 = Debug|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Release|Win32.ActiveCfg = Release|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Release|Win32.Build.0 = Release|Win32
 		{5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Win32.Build.0 = Debug|Win32
 		{5597AD47-3494-4750-A235-4F9C2F864700}.Release|Win32.ActiveCfg = Release|Win32
@@ -561,7 +544,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{0655DC38-C685-436C-8D99-7CF64CB2CC35} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{0B469837-3D46-484A-AFB3-C5A6C68730B9} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
 		{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {4A249B49-19FB-4BD1-B017-718E7A4448EF}
 		{0E5474AC-5996-4B13-87C0-4AE931EE0815} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
@@ -575,7 +557,6 @@ Global
 		{326E9795-E760-410A-B69A-3F79DB3F5243} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{494E414B-1655-48CE-996D-6413ECFB7829} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
 		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {1DFD10B5-A673-4C3A-BA1D-3546FC4B7740}
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B} = {0655DC38-C685-436C-8D99-7CF64CB2CC35}
 		{5597AD47-3494-4750-A235-4F9C2F864700} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
 		{5916D37D-8C97-424F-A904-74E52594C2D6} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
 		{60B43839-95E6-4526-A661-209F16335E0E} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
@@ -602,6 +583,6 @@ Global
 		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{FA39524D-3067-4141-888D-28A86C66F2B9} = {4A249B49-19FB-4BD1-B017-718E7A4448EF}
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {0655DC38-C685-436C-8D99-7CF64CB2CC35}
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 	EndGlobalSection
 EndGlobal
diff --git a/webkit/webkit_kjs.sln b/webkit/webkit_kjs.sln
index 8e25d7b..09ee937 100644
--- a/webkit/webkit_kjs.sln
+++ b/webkit/webkit_kjs.sln
@@ -229,7 +229,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt", "..\third_party\l
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B} = {4BD929D4-494B-4EE8-91F6-FD0277A51D2B}
 		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
 	EndProjectSection
 EndProject
@@ -322,18 +321,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "activex_shim_dll", "activex
 		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {F4F4BCAA-EA59-445C-A119-3E6C29647A51}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libxslt projects", "libxslt projects", "{EB5D0A31-311A-44B8-A414-91B2D756B82A}"
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt_config", "..\third_party\libxslt\build\libxslt_config.vcproj", "{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}"
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "default_plugin", "default_plugin\default_plugin.vcproj", "{5916D37D-8C97-424F-A904-74E52594C2D6}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
@@ -455,10 +442,6 @@ Global
 		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Debug|Win32.Build.0 = Debug|Win32
 		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Release|Win32.ActiveCfg = Release|Win32
 		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}.Release|Win32.Build.0 = Release|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Debug|Win32.Build.0 = Debug|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Release|Win32.ActiveCfg = Release|Win32
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}.Release|Win32.Build.0 = Release|Win32
 		{5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Win32.Build.0 = Debug|Win32
 		{5597AD47-3494-4750-A235-4F9C2F864700}.Release|Win32.ActiveCfg = Release|Win32
@@ -589,7 +572,6 @@ Global
 		{326E9795-E760-410A-B69A-3F79DB3F5243} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{494E414B-1655-48CE-996D-6413ECFB7829} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
 		{49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {1DFD10B5-A673-4C3A-BA1D-3546FC4B7740}
-		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B} = {EB5D0A31-311A-44B8-A414-91B2D756B82A}
 		{5597AD47-3494-4750-A235-4F9C2F864700} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
 		{5916D37D-8C97-424F-A904-74E52594C2D6} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
 		{60B43839-95E6-4526-A661-209F16335E0E} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
@@ -612,12 +594,11 @@ Global
 		{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{E13045CD-7E1F-4A41-9B18-8D288B2E7B41} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{E6766F81-1FCD-4CD7-BC16-E36964A14867} = {4A249B49-19FB-4BD1-B017-718E7A4448EF}
-		{EB5D0A31-311A-44B8-A414-91B2D756B82A} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{EF5E94AB-B646-4E5B-A058-52EF07B8351C} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
 		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{FA39524D-3067-4141-888D-28A86C66F2B9} = {4A249B49-19FB-4BD1-B017-718E7A4448EF}
-		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {EB5D0A31-311A-44B8-A414-91B2D756B82A}
+		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 	EndGlobalSection
 EndGlobal