Remove the build time generation of config.h and xmlversion.h.

This adds a bat file which will generate config.h and xmlversion.h
into the win32 directory.  I updated include paths and everything
seems to build.

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

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

16 files changed, 562 insertions, 266 deletions

diff --git a/chrome/chrome.sln b/chrome/chrome.sln
index 9542642..6d77632 100755
--- a/chrome/chrome.sln
+++ b/chrome/chrome.sln
@@ -18,7 +18,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser", "browser\browser.
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
 		{4052059A-D72B-4183-B5C2-9D1B099E9E35} = {4052059A-D72B-4183-B5C2-9D1B099E9E35}
 		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
@@ -51,7 +50,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common\common.vcp
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
 	EndProjectSection
 EndProject
@@ -69,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}
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
 		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B} = {4BD929D4-494B-4EE8-91F6-FD0277A51D2B}
 		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
 	EndProjectSection
@@ -221,9 +218,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml", "..\third_party\li
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-	ProjectSection(ProjectDependencies) = postProject
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hunspell", "third_party\hunspell\hunspell.vcproj", "{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -1108,18 +1102,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "activex_test_control", "tes
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libxml projects", "libxml projects", "{032541FB-1E7C-4423-B657-4A71FE180C8A}"
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml_config", "..\third_party\libxml\build\libxml_config.vcproj", "{31D88CBF-DC28-47A8-8838-BF81D528EE74}"
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		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"
@@ -1138,7 +1120,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "default_plugin", "..\webkit
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
 		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
@@ -1182,7 +1163,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "automated_ui_tests", "test\
 	ProjectSection(ProjectDependencies) = postProject
 		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
 		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
 		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
 		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
 		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
@@ -1823,7 +1803,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser_views", "browser\vi
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
 		{4052059A-D72B-4183-B5C2-9D1B099E9E35} = {4052059A-D72B-4183-B5C2-9D1B099E9E35}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
 	EndProjectSection
@@ -2198,14 +2177,6 @@ Global
 		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Release|Win32.ActiveCfg = Release|Win32
 		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Release|Win32.Build.0 = Release|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Debug|Win32.ActiveCfg = Debug|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Debug|Win32.Build.0 = Debug|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Release|Win32.ActiveCfg = Release|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Release|Win32.Build.0 = Release|Win32
 		{32167995-4014-4E4C-983B-F7E17C24EB25}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{32167995-4014-4E4C-983B-F7E17C24EB25}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{32167995-4014-4E4C-983B-F7E17C24EB25}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -3195,7 +3166,6 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{0026A376-C4F1-4575-A1BA-578C69F07013} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
 		{018D4F38-6272-448F-A864-976DA09F05D0} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{032541FB-1E7C-4423-B657-4A71FE180C8A} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{0B469837-3D46-484A-AFB3-C5A6C68730B9} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
@@ -3225,7 +3195,6 @@ Global
 		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
 		{2F914112-2657-49EC-8EA6-3BA63340DE27} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{300C6A09-663E-48B6-8E07-A0D50CAF8F25} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {032541FB-1E7C-4423-B657-4A71FE180C8A}
 		{32167995-4014-4E4C-983B-F7E17C24EB25} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{326E9795-E760-410A-B69A-3F79DB3F5243} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{34231B28-C51C-4C1C-AF07-C763668B1404} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
@@ -3347,7 +3316,7 @@ Global
 		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
 		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{F7790A54-4078-4E4A-8231-818BE9FB1F94} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {032541FB-1E7C-4423-B657-4A71FE180C8A}
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{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}
diff --git a/chrome/chrome_kjs.sln b/chrome/chrome_kjs.sln
index 29fe95c..5a147be 100644
--- a/chrome/chrome_kjs.sln
+++ b/chrome/chrome_kjs.sln
@@ -18,7 +18,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser", "browser\browser.
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
 		{4052059A-D72B-4183-B5C2-9D1B099E9E35} = {4052059A-D72B-4183-B5C2-9D1B099E9E35}
 		{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
@@ -69,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}
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
 		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B} = {4BD929D4-494B-4EE8-91F6-FD0277A51D2B}
 		{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}
 	EndProjectSection
@@ -93,7 +91,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}
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
 		{4BD929D4-494B-4EE8-91F6-FD0277A51D2B} = {4BD929D4-494B-4EE8-91F6-FD0277A51D2B}
 		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
@@ -222,9 +219,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml", "..\third_party\li
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-	ProjectSection(ProjectDependencies) = postProject
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hunspell", "third_party\hunspell\hunspell.vcproj", "{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -1101,24 +1095,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "activex_test_control", "tes
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libxml projects", "libxml projects", "{BBD3C9B1-AC02-41F4-AB89-D01B70009795}"
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		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}") = "libxml_config", "..\third_party\libxml\build\libxml_config.vcproj", "{31D88CBF-DC28-47A8-8838-BF81D528EE74}"
-	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"
@@ -1131,7 +1113,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "default_plugin", "..\webkit
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
 		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
@@ -1175,7 +1156,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "automated_ui_tests", "test\
 	ProjectSection(ProjectDependencies) = postProject
 		{1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}
 		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
 		{326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243}
 		{5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA}
 		{7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D}
@@ -1679,7 +1659,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser_views", "browser\vi
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
 		{4052059A-D72B-4183-B5C2-9D1B099E9E35} = {4052059A-D72B-4183-B5C2-9D1B099E9E35}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
 	EndProjectSection
@@ -2032,16 +2011,6 @@ Global
 		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Release|Win32.ActiveCfg = Release|Win32
 		{300C6A09-663E-48B6-8E07-A0D50CAF8F25}.Release|Win32.Build.0 = Release|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Debug|Win32.ActiveCfg = Debug|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Debug|Win32.Build.0 = Debug|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Release|Any CPU.ActiveCfg = Release|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Release|Win32.ActiveCfg = Release|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Release|Win32.Build.0 = Release|Win32
 		{32167995-4014-4E4C-983B-F7E17C24EB25}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{32167995-4014-4E4C-983B-F7E17C24EB25}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{32167995-4014-4E4C-983B-F7E17C24EB25}.Debug|Mixed Platforms.Build.0 = Debug|Win32
@@ -3157,7 +3126,6 @@ Global
 		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA}
 		{2F914112-2657-49EC-8EA6-3BA63340DE27} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{300C6A09-663E-48B6-8E07-A0D50CAF8F25} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {BBD3C9B1-AC02-41F4-AB89-D01B70009795}
 		{32167995-4014-4E4C-983B-F7E17C24EB25} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
 		{326E9795-E760-410A-B69A-3F79DB3F5243} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{34231B28-C51C-4C1C-AF07-C763668B1404} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
@@ -3226,7 +3194,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}
-		{BBD3C9B1-AC02-41F4-AB89-D01B70009795} = {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}
@@ -3263,7 +3230,7 @@ Global
 		{F4F4BCAA-EA59-445C-A119-3E6C29647A51} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
 		{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{F7790A54-4078-4E4A-8231-818BE9FB1F94} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
-		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {BBD3C9B1-AC02-41F4-AB89-D01B70009795}
+		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{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}
diff --git a/third_party/libxml/README.google b/third_party/libxml/README.google
index 8d2b1d6..f97a7a6 100644
--- a/third_party/libxml/README.google
+++ b/third_party/libxml/README.google
@@ -31,4 +31,6 @@ To import a new snapshot of libxml:
 - Update google.patch
 - 'cd linux && sh ../configure --without-iconv' to re-generate config.h and
   include/libxml/xmlversion.h.
+- run build/generate-win32-headers.bat to re-generate config.h and
+  include/libxml/xmlversion.h for the windows build
 - Update this README to reflect the new version number.
diff --git a/third_party/libxml/build/generate-win32-headers.bat b/third_party/libxml/build/generate-win32-headers.bat
new file mode 100755
index 0000000..1d0f85d
--- /dev/null
+++ b/third_party/libxml/build/generate-win32-headers.bat
@@ -0,0 +1,9 @@
+REM Generate config.h and xmlversion.h.  We put the generated files in
+REM win32 so they don't get included on other platforms.
+
+cd %~dp0\..\win32
+cscript //E:jscript configure.js compiler=msvc iconv=no icu=yes
+move ..\config.h .
+
+md include\libxml
+move ..\include\libxml\xmlversion.h include\libxml\
diff --git a/third_party/libxml/build/libxml.vsprops b/third_party/libxml/build/libxml.vsprops
index 9f01fdf..a8392e2c 100644
--- a/third_party/libxml/build/libxml.vsprops
+++ b/third_party/libxml/build/libxml.vsprops
@@ -8,5 +8,6 @@
 	<Tool
 		Name="VCCLCompilerTool"
 		DisableSpecificWarnings="4101;4133"
+		AdditionalIncludeDirectories="&quot;$(SolutionDir)..\third_party\libxml\win32&quot;;&quot;$(SolutionDir)..\third_party\libxml\win32\include&quot;"
 	/>
 </VisualStudioPropertySheet>
diff --git a/third_party/libxml/build/libxml_config.bat b/third_party/libxml/build/libxml_config.bat
deleted file mode 100644
index b0ec1e2..0000000
--- a/third_party/libxml/build/libxml_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 iconv=no icu=yes
-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/libxml/build/libxml_config.rules b/third_party/libxml/build/libxml_config.rules
deleted file mode 100644
index 46967cc..0000000
--- a/third_party/libxml/build/libxml_config.rules
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<VisualStudioToolFile
-	Name="libxml config file"
-	Version="8.00"
-	>
-	<Rules>
-		<CustomBuildRule
-			Name="libxml config file"
-			DisplayName="libxml config file"
-			CommandLine=".\libxml_config.bat [inputs] $(SolutionDir)"
-			Outputs="$(ProjectDir)..\config.h"
-			FileExtensions="*.js"
-			ExecutionDescription="Generating config.h..."
-			>
-		</CustomBuildRule>
-	</Rules>
-</VisualStudioToolFile>
diff --git a/third_party/libxml/build/libxml_config.vcproj b/third_party/libxml/build/libxml_config.vcproj
deleted file mode 100644
index a635f1b..0000000
--- a/third_party/libxml/build/libxml_config.vcproj
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="libxml_config"
-	ProjectGUID="{31D88CBF-DC28-47A8-8838-BF81D528EE74}"
-	RootNamespace="libxml_config"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-		<ToolFile
-			RelativePath=".\libxml_config.rules"
-		/>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="10"
-			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="libxml 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="libxml 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/third_party/libxml/build/using_libxml.vsprops b/third_party/libxml/build/using_libxml.vsprops
index 7900ced..0c7311c 100644
--- a/third_party/libxml/build/using_libxml.vsprops
+++ b/third_party/libxml/build/using_libxml.vsprops
@@ -6,7 +6,7 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;$(SolutionDir)..\third_party\libxml\include&quot;"
+		AdditionalIncludeDirectories="&quot;$(SolutionDir)..\third_party\libxml\include&quot;;&quot;$(SolutionDir)..\third_party\libxml\win32\include&quot;"
 		PreprocessorDefinitions="LIBXML_STATIC"
 	/>
 	<Tool
diff --git a/third_party/libxml/libxml.scons b/third_party/libxml/libxml.scons
index d7f05fa..438e3fd 100644
--- a/third_party/libxml/libxml.scons
+++ b/third_party/libxml/libxml.scons
@@ -127,34 +127,12 @@ env.ChromeMSVSProject('$LIBXML_DIR/build/libxml_config.vcproj',
 
 if env.Bit('windows'):
   config_files = [
-      # The configure.js script must be first in this list; the
-      # env.Command() call below executes the first list element.
-
-      'win32/configure.js',
-      'win32/Makefile.msvc',
-
-      'config.h.in',
-      'configure.in',
-      'libxml-2.0-uninstalled.pc.in',
-      'libxml-2.0.pc.in',
-      'libxml.spec.in',
-      'xml2-config.in',
-      'xml2Conf.sh.in',
-
-      'include/libxml/xmlversion.h.in',
-      'include/win32config.h',
+      'config.h',
+      'include/libxml/xmlversion.h',
   ]
-
-  copied_files = []
   for cf in config_files:
-    result = env.Command('DerivedSources/' + cf, cf, Copy('$TARGET', '$SOURCE'))
-    copied_files.extend(result)
-
-  env.Command(['DerivedSources/config.h',
-               'DerivedSources/include/libxml/xmlversion.h'],
-              copied_files,
-              'cd ${SOURCE.dir} && $CSCRIPT ${SOURCE.file} $CONFIG_OPTIONS',
-              CONFIG_OPTIONS='compiler=msvc iconv=no icu=yes')
+    result = env.Command('DerivedSources/' + cf, 'win32/' + cf,
+                         Copy('$TARGET', '$SOURCE'))
 elif env.Bit('linux'):
   config_files = [
       'config.h',
diff --git a/third_party/libxml/win32/config.h b/third_party/libxml/win32/config.h
new file mode 100755
index 0000000..3fc9be5
--- /dev/null
+++ b/third_party/libxml/win32/config.h
@@ -0,0 +1,124 @@
+#ifndef __LIBXML_WIN32_CONFIG__
+#define __LIBXML_WIN32_CONFIG__
+
+#define HAVE_CTYPE_H
+#define HAVE_STDARG_H
+#define HAVE_MALLOC_H
+#define HAVE_ERRNO_H
+
+#if defined(_WIN32_WCE)
+#undef HAVE_ERRNO_H
+#include <windows.h>
+#include "wincecompat.h"
+#else
+#define HAVE_SYS_STAT_H
+#define HAVE__STAT
+#define HAVE_STAT
+#define HAVE_STDLIB_H
+#define HAVE_TIME_H
+#define HAVE_FCNTL_H
+#include <io.h>
+#include <direct.h>
+#endif
+
+#include <libxml/xmlversion.h>
+
+#ifndef ICONV_CONST
+#define ICONV_CONST const
+#endif
+
+#ifdef NEED_SOCKETS
+#include <wsockcompat.h>
+#endif
+
+/*
+ * Windows platforms may define except 
+ */
+#undef except
+
+#define HAVE_ISINF
+#define HAVE_ISNAN
+#include <math.h>
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+/* MS C-runtime has functions which can be used in order to determine if
+   a given floating-point variable contains NaN, (+-)INF. These are 
+   preferred, because floating-point technology is considered propriatary
+   by MS and we can assume that their functions know more about their 
+   oddities than we do. */
+#include <float.h>
+/* Bjorn Reese figured a quite nice construct for isinf() using the _fpclass
+   function. */
+#ifndef isinf
+#define isinf(d) ((_fpclass(d) == _FPCLASS_PINF) ? 1 \
+	: ((_fpclass(d) == _FPCLASS_NINF) ? -1 : 0))
+#endif
+/* _isnan(x) returns nonzero if (x == NaN) and zero otherwise. */
+#ifndef isnan
+#define isnan(d) (_isnan(d))
+#endif
+#else /* _MSC_VER */
+#ifndef isinf
+static int isinf (double d) {
+    int expon = 0;
+    double val = frexp (d, &expon);
+    if (expon == 1025) {
+        if (val == 0.5) {
+            return 1;
+        } else if (val == -0.5) {
+            return -1;
+        } else {
+            return 0;
+        }
+    } else {
+        return 0;
+    }
+}
+#endif
+#ifndef isnan
+static int isnan (double d) {
+    int expon = 0;
+    double val = frexp (d, &expon);
+    if (expon == 1025) {
+        if (val == 0.5) {
+            return 0;
+        } else if (val == -0.5) {
+            return 0;
+        } else {
+            return 1;
+        }
+    } else {
+        return 0;
+    }
+}
+#endif
+#endif /* _MSC_VER */
+
+#if defined(_MSC_VER)
+#define mkdir(p,m) _mkdir(p)
+#define snprintf _snprintf
+#if _MSC_VER < 1500
+#define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
+#endif
+#elif defined(__MINGW32__)
+#define mkdir(p,m) _mkdir(p)
+#endif
+
+/* Threading API to use should be specified here for compatibility reasons.
+   This is however best specified on the compiler's command-line. */
+#if defined(LIBXML_THREAD_ENABLED)
+#if !defined(HAVE_PTHREAD_H) && !defined(HAVE_WIN32_THREADS) && !defined(_WIN32_WCE)
+#define HAVE_WIN32_THREADS
+#endif
+#endif
+
+/* Some third-party libraries far from our control assume the following
+   is defined, which it is not if we don't include windows.h. */
+#if !defined(FALSE)
+#define FALSE 0
+#endif
+#if !defined(TRUE)
+#define TRUE (!(FALSE))
+#endif
+
+#endif /* __LIBXML_WIN32_CONFIG__ */
+
diff --git a/third_party/libxml/win32/include/libxml/xmlversion.h b/third_party/libxml/win32/include/libxml/xmlversion.h
new file mode 100755
index 0000000..6763c10
--- /dev/null
+++ b/third_party/libxml/win32/include/libxml/xmlversion.h
@@ -0,0 +1,415 @@
+/*

+ * Summary: compile-time version informations

+ * Description: compile-time version informations for the XML library

+ *

+ * Copy: See Copyright for the status of this software.

+ *

+ * Author: Daniel Veillard

+ */

+

+#ifndef __XML_VERSION_H__

+#define __XML_VERSION_H__

+

+#include <libxml/xmlexports.h>

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+/*

+ * use those to be sure nothing nasty will happen if

+ * your library and includes mismatch

+ */

+#ifndef LIBXML2_COMPILING_MSCCDEF

+XMLPUBFUN void XMLCALL xmlCheckVersion(int version);

+#endif /* LIBXML2_COMPILING_MSCCDEF */

+

+/**

+ * LIBXML_DOTTED_VERSION:

+ *

+ * the version string like "1.2.3"

+ */

+#define LIBXML_DOTTED_VERSION "2.6.32"

+

+/**

+ * LIBXML_VERSION:

+ *

+ * the version number: 1.2.3 value is 10203

+ */

+#define LIBXML_VERSION 20632

+

+/**

+ * LIBXML_VERSION_STRING:

+ *

+ * the version number string, 1.2.3 value is "10203"

+ */

+#define LIBXML_VERSION_STRING "20632"

+

+/**

+ * LIBXML_VERSION_EXTRA:

+ *

+ * extra version information, used to show a CVS compilation

+ */

+#define LIBXML_VERSION_EXTRA ""

+

+/**

+ * LIBXML_TEST_VERSION:

+ *

+ * Macro to check that the libxml version in use is compatible with

+ * the version the software has been compiled against

+ */

+#define LIBXML_TEST_VERSION xmlCheckVersion(20632);

+

+#ifndef VMS

+#if 0

+/**

+ * WITH_TRIO:

+ *

+ * defined if the trio support need to be configured in

+ */

+#define WITH_TRIO

+#else

+/**

+ * WITHOUT_TRIO:

+ *

+ * defined if the trio support should not be configured in

+ */

+#define WITHOUT_TRIO

+#endif

+#else /* VMS */

+/**

+ * WITH_TRIO:

+ *

+ * defined if the trio support need to be configured in

+ */

+#define WITH_TRIO 1

+#endif /* VMS */

+

+/**

+ * LIBXML_THREAD_ENABLED:

+ *

+ * Whether the thread support is configured in

+ */

+#if 1

+#if defined(_REENTRANT) || defined(__MT__) || \

+    (defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE - 0 >= 199506L))

+#define LIBXML_THREAD_ENABLED

+#endif

+#endif

+

+/**

+ * LIBXML_TREE_ENABLED:

+ *

+ * Whether the DOM like tree manipulation API support is configured in

+ */

+#if 1

+#define LIBXML_TREE_ENABLED

+#endif

+

+/**

+ * LIBXML_OUTPUT_ENABLED:

+ *

+ * Whether the serialization/saving support is configured in

+ */

+#if 1

+#define LIBXML_OUTPUT_ENABLED

+#endif

+

+/**

+ * LIBXML_PUSH_ENABLED:

+ *

+ * Whether the push parsing interfaces are configured in

+ */

+#if 1

+#define LIBXML_PUSH_ENABLED

+#endif

+

+/**

+ * LIBXML_READER_ENABLED:

+ *

+ * Whether the xmlReader parsing interface is configured in

+ */

+#if 1

+#define LIBXML_READER_ENABLED

+#endif

+

+/**

+ * LIBXML_PATTERN_ENABLED:

+ *

+ * Whether the xmlPattern node selection interface is configured in

+ */

+#if 1

+#define LIBXML_PATTERN_ENABLED

+#endif

+

+/**

+ * LIBXML_WRITER_ENABLED:

+ *

+ * Whether the xmlWriter saving interface is configured in

+ */

+#if 1

+#define LIBXML_WRITER_ENABLED

+#endif

+

+/**

+ * LIBXML_SAX1_ENABLED:

+ *

+ * Whether the older SAX1 interface is configured in

+ */

+#if 1

+#define LIBXML_SAX1_ENABLED

+#endif

+

+/**

+ * LIBXML_FTP_ENABLED:

+ *

+ * Whether the FTP support is configured in

+ */

+#if 1

+#define LIBXML_FTP_ENABLED

+#endif

+

+/**

+ * LIBXML_HTTP_ENABLED:

+ *

+ * Whether the HTTP support is configured in

+ */

+#if 1

+#define LIBXML_HTTP_ENABLED

+#endif

+

+/**

+ * LIBXML_VALID_ENABLED:

+ *

+ * Whether the DTD validation support is configured in

+ */

+#if 1

+#define LIBXML_VALID_ENABLED

+#endif

+

+/**

+ * LIBXML_HTML_ENABLED:

+ *

+ * Whether the HTML support is configured in

+ */

+#if 1

+#define LIBXML_HTML_ENABLED

+#endif

+

+/**

+ * LIBXML_LEGACY_ENABLED:

+ *

+ * Whether the deprecated APIs are compiled in for compatibility

+ */

+#if 1

+#define LIBXML_LEGACY_ENABLED

+#endif

+

+/**

+ * LIBXML_C14N_ENABLED:

+ *

+ * Whether the Canonicalization support is configured in

+ */

+#if 1

+#define LIBXML_C14N_ENABLED

+#endif

+

+/**

+ * LIBXML_CATALOG_ENABLED:

+ *

+ * Whether the Catalog support is configured in

+ */

+#if 1

+#define LIBXML_CATALOG_ENABLED

+#endif

+

+/**

+ * LIBXML_DOCB_ENABLED:

+ *

+ * Whether the SGML Docbook support is configured in

+ */

+#if 1

+#define LIBXML_DOCB_ENABLED

+#endif

+

+/**

+ * LIBXML_XPATH_ENABLED:

+ *

+ * Whether XPath is configured in

+ */

+#if 1

+#define LIBXML_XPATH_ENABLED

+#endif

+

+/**

+ * LIBXML_XPTR_ENABLED:

+ *

+ * Whether XPointer is configured in

+ */

+#if 1

+#define LIBXML_XPTR_ENABLED

+#endif

+

+/**

+ * LIBXML_XINCLUDE_ENABLED:

+ *

+ * Whether XInclude is configured in

+ */

+#if 1

+#define LIBXML_XINCLUDE_ENABLED

+#endif

+

+/**

+ * LIBXML_ICONV_ENABLED:

+ *

+ * Whether iconv support is available

+ */

+#if 0

+#define LIBXML_ICONV_ENABLED

+#endif

+

+/**

+ * LIBXML_ICU_ENABLED:

+ *

+ * Whether icu support is available

+ */

+#if 1

+#define LIBXML_ICU_ENABLED

+#endif

+

+/**

+ * LIBXML_ISO8859X_ENABLED:

+ *

+ * Whether ISO-8859-* support is made available in case iconv is not

+ */

+#if 0

+#define LIBXML_ISO8859X_ENABLED

+#endif

+

+/**

+ * LIBXML_DEBUG_ENABLED:

+ *

+ * Whether Debugging module is configured in

+ */

+#if 1

+#define LIBXML_DEBUG_ENABLED

+#endif

+

+/**

+ * DEBUG_MEMORY_LOCATION:

+ *

+ * Whether the memory debugging is configured in

+ */

+#if 0

+#define DEBUG_MEMORY_LOCATION

+#endif

+

+/**

+ * LIBXML_DEBUG_RUNTIME:

+ *

+ * Whether the runtime debugging is configured in

+ */

+#if 0

+#define LIBXML_DEBUG_RUNTIME

+#endif

+

+/**

+ * LIBXML_UNICODE_ENABLED:

+ *

+ * Whether the Unicode related interfaces are compiled in

+ */

+#if 1

+#define LIBXML_UNICODE_ENABLED

+#endif

+

+/**

+ * LIBXML_REGEXP_ENABLED:

+ *

+ * Whether the regular expressions interfaces are compiled in

+ */

+#if 1

+#define LIBXML_REGEXP_ENABLED

+#endif

+

+/**

+ * LIBXML_AUTOMATA_ENABLED:

+ *

+ * Whether the automata interfaces are compiled in

+ */

+#if 1

+#define LIBXML_AUTOMATA_ENABLED

+#endif

+

+/**

+ * LIBXML_EXPR_ENABLED:

+ *

+ * Whether the formal expressions interfaces are compiled in

+ */

+#if 1

+#define LIBXML_EXPR_ENABLED

+#endif

+

+/**

+ * LIBXML_SCHEMAS_ENABLED:

+ *

+ * Whether the Schemas validation interfaces are compiled in

+ */

+#if 1

+#define LIBXML_SCHEMAS_ENABLED

+#endif

+

+/**

+ * LIBXML_SCHEMATRON_ENABLED:

+ *

+ * Whether the Schematron validation interfaces are compiled in

+ */

+#if 1

+#define LIBXML_SCHEMATRON_ENABLED

+#endif

+

+/**

+ * LIBXML_MODULES_ENABLED:

+ *

+ * Whether the module interfaces are compiled in

+ */

+#if 1

+#define LIBXML_MODULES_ENABLED

+/**

+ * LIBXML_MODULE_EXTENSION:

+ *

+ * the string suffix used by dynamic modules (usually shared libraries)

+ */

+#define LIBXML_MODULE_EXTENSION ".dll" 

+#endif

+

+/**

+ * LIBXML_ZLIB_ENABLED:

+ *

+ * Whether the Zlib support is compiled in

+ */

+#if 0

+#define LIBXML_ZLIB_ENABLED

+#endif

+

+/**

+ * ATTRIBUTE_UNUSED:

+ *

+ * Macro used to signal to GCC unused function parameters

+ */

+#ifdef __GNUC__

+#ifdef HAVE_ANSIDECL_H

+#include <ansidecl.h>

+#endif

+#ifndef ATTRIBUTE_UNUSED

+#define ATTRIBUTE_UNUSED __attribute__((unused))

+#endif

+#else

+#define ATTRIBUTE_UNUSED

+#endif

+

+#ifdef __cplusplus

+}

+#endif /* __cplusplus */

+#endif

+

+

diff --git a/webkit/build/JavaScriptCore/JavaScriptCore.vcproj b/webkit/build/JavaScriptCore/JavaScriptCore.vcproj
index f9fcfe2..6d9af07 100644
--- a/webkit/build/JavaScriptCore/JavaScriptCore.vcproj
+++ b/webkit/build/JavaScriptCore/JavaScriptCore.vcproj
@@ -419,6 +419,7 @@
 			<File
 				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSByteArray.h"
 				>
+      </File>
 			<File
 				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSCell.cpp"
 				>
diff --git a/webkit/webkit.sln b/webkit/webkit.sln
index f072ee0..542b703 100644
--- a/webkit/webkit.sln
+++ b/webkit/webkit.sln
@@ -238,9 +238,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml", "..\third_party\li
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-	ProjectSection(ProjectDependencies) = postProject
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt", "..\third_party\libxslt\build\libxslt.vcproj", "{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -318,18 +315,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}") = "libxml projects", "libxml projects", "{B5EEDCC4-877F-4537-AD0E-A3FA070522DF}"
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml_config", "..\third_party\libxml\build\libxml_config.vcproj", "{31D88CBF-DC28-47A8-8838-BF81D528EE74}"
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libxslt projects", "libxslt projects", "{0655DC38-C685-436C-8D99-7CF64CB2CC35}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
@@ -348,7 +333,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "default_plugin", "default_p
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
 		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
@@ -474,10 +458,6 @@ Global
 		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Debug|Win32.Build.0 = Debug|Win32
 		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Win32.ActiveCfg = Release|Win32
 		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Win32.Build.0 = Release|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Debug|Win32.ActiveCfg = Debug|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Debug|Win32.Build.0 = Debug|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Release|Win32.ActiveCfg = Release|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Release|Win32.Build.0 = Release|Win32
 		{326E9795-E760-410A-B69A-3F79DB3F5243}.Debug|Win32.ActiveCfg = Debug|Win32
 		{326E9795-E760-410A-B69A-3F79DB3F5243}.Debug|Win32.Build.0 = Debug|Win32
 		{326E9795-E760-410A-B69A-3F79DB3F5243}.Release|Win32.ActiveCfg = Release|Win32
@@ -630,7 +610,6 @@ Global
 		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {1DFD10B5-A673-4C3A-BA1D-3546FC4B7740}
 		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {B5EEDCC4-877F-4537-AD0E-A3FA070522DF}
 		{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}
@@ -650,7 +629,6 @@ Global
 		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {1DFD10B5-A673-4C3A-BA1D-3546FC4B7740}
 		{B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
-		{B5EEDCC4-877F-4537-AD0E-A3FA070522DF} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{BE6D5659-A8D5-4890-A42C-090DD10EF62C} = {4A249B49-19FB-4BD1-B017-718E7A4448EF}
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{C0334F9A-1168-4101-9DD8-C30FB252D435} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
@@ -663,7 +641,7 @@ Global
 		{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} = {B5EEDCC4-877F-4537-AD0E-A3FA070522DF}
+		{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}
 	EndGlobalSection
diff --git a/webkit/webkit_armu.sln b/webkit/webkit_armu.sln
index 3148efa..11e70a2 100644
--- a/webkit/webkit_armu.sln
+++ b/webkit/webkit_armu.sln
@@ -231,9 +231,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml", "..\third_party\li
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-	ProjectSection(ProjectDependencies) = postProject
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt", "..\third_party\libxslt\build\libxslt.vcproj", "{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -311,18 +308,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}") = "libxml projects", "libxml projects", "{B5EEDCC4-877F-4537-AD0E-A3FA070522DF}"
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml_config", "..\third_party\libxml\build\libxml_config.vcproj", "{31D88CBF-DC28-47A8-8838-BF81D528EE74}"
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libxslt projects", "libxslt projects", "{0655DC38-C685-436C-8D99-7CF64CB2CC35}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
@@ -341,7 +326,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "default_plugin", "default_p
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
 		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
@@ -448,10 +432,6 @@ Global
 		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Debug|Win32.Build.0 = Debug|Win32
 		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Win32.ActiveCfg = Release|Win32
 		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Win32.Build.0 = Release|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Debug|Win32.ActiveCfg = Debug|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Debug|Win32.Build.0 = Debug|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Release|Win32.ActiveCfg = Release|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Release|Win32.Build.0 = Release|Win32
 		{326E9795-E760-410A-B69A-3F79DB3F5243}.Debug|Win32.ActiveCfg = Debug|Win32
 		{326E9795-E760-410A-B69A-3F79DB3F5243}.Debug|Win32.Build.0 = Debug|Win32
 		{326E9795-E760-410A-B69A-3F79DB3F5243}.Release|Win32.ActiveCfg = Release|Win32
@@ -592,7 +572,6 @@ Global
 		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {1DFD10B5-A673-4C3A-BA1D-3546FC4B7740}
 		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {B5EEDCC4-877F-4537-AD0E-A3FA070522DF}
 		{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}
@@ -610,7 +589,6 @@ Global
 		{A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {1DFD10B5-A673-4C3A-BA1D-3546FC4B7740}
 		{B55CA863-B374-4BAF-95AC-539E4FA4C90C} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
-		{B5EEDCC4-877F-4537-AD0E-A3FA070522DF} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{BE6D5659-A8D5-4890-A42C-090DD10EF62C} = {4A249B49-19FB-4BD1-B017-718E7A4448EF}
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
@@ -622,7 +600,7 @@ Global
 		{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} = {B5EEDCC4-877F-4537-AD0E-A3FA070522DF}
+		{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}
 	EndGlobalSection
diff --git a/webkit/webkit_kjs.sln b/webkit/webkit_kjs.sln
index 9653c0f..8e25d7b 100644
--- a/webkit/webkit_kjs.sln
+++ b/webkit/webkit_kjs.sln
@@ -222,9 +222,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml", "..\third_party\li
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-	ProjectSection(ProjectDependencies) = postProject
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt", "..\third_party\libxslt\build\libxslt.vcproj", "{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -325,24 +322,12 @@ 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}") = "libxml projects", "libxml projects", "{3C58CBE5-21EE-4A88-99BC-4924CB3EAA95}"
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	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}") = "libxml_config", "..\third_party\libxml\build\libxml_config.vcproj", "{31D88CBF-DC28-47A8-8838-BF81D528EE74}"
-	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"
@@ -355,7 +340,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "default_plugin", "default_p
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 	ProjectSection(ProjectDependencies) = postProject
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
 		{60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E}
 	EndProjectSection
 EndProject
@@ -459,10 +443,6 @@ Global
 		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Debug|Win32.Build.0 = Debug|Win32
 		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Win32.ActiveCfg = Release|Win32
 		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Win32.Build.0 = Release|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Debug|Win32.ActiveCfg = Debug|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Debug|Win32.Build.0 = Debug|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Release|Win32.ActiveCfg = Release|Win32
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74}.Release|Win32.Build.0 = Release|Win32
 		{326E9795-E760-410A-B69A-3F79DB3F5243}.Debug|Win32.ActiveCfg = Debug|Win32
 		{326E9795-E760-410A-B69A-3F79DB3F5243}.Debug|Win32.Build.0 = Debug|Win32
 		{326E9795-E760-410A-B69A-3F79DB3F5243}.Release|Win32.ActiveCfg = Release|Win32
@@ -606,9 +586,7 @@ Global
 		{2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
 		{2BCD6193-D243-422C-BB1A-BC219BF147B3} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
 		{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
-		{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {3C58CBE5-21EE-4A88-99BC-4924CB3EAA95}
 		{326E9795-E760-410A-B69A-3F79DB3F5243} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
-		{3C58CBE5-21EE-4A88-99BC-4924CB3EAA95} = {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}
@@ -638,7 +616,7 @@ Global
 		{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} = {3C58CBE5-21EE-4A88-99BC-4924CB3EAA95}
+		{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}
 	EndGlobalSection