Diff
Modified: trunk/Source/WebKit/win/ChangeLog (138402 => 138403)
--- trunk/Source/WebKit/win/ChangeLog 2012-12-21 23:48:36 UTC (rev 138402)
+++ trunk/Source/WebKit/win/ChangeLog 2012-12-22 00:22:16 UTC (rev 138403)
@@ -1,3 +1,20 @@
+2012-12-21 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r138331.
+ http://trac.webkit.org/changeset/138331
+ https://bugs.webkit.org/show_bug.cgi?id=105668
+
+ Broke Windows clean builds; can't figure out how to fix it
+ (Requested by rniwa on #webkit).
+
+ * WebKit.vcproj/WebKit.sln:
+ * WebKit.vcproj/WebKit.vcproj:
+ * WebKit.vcproj/WebKitLibCommon.vsprops:
+ * WebKit.vcproj/WebKitLibDebug.vsprops:
+ * WebKit.vcproj/WebKitLibDebugAll.vsprops:
+ * WebKit.vcproj/WebKitLibProduction.vsprops:
+ * WebKit.vcproj/WebKitLibRelease.vsprops:
+
2012-12-20 Anders Carlsson <[email protected]>
Stop building WebKit2 for Windows
Modified: trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln (138402 => 138403)
--- trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln 2012-12-21 23:48:36 UTC (rev 138402)
+++ trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln 2012-12-22 00:22:16 UTC (rev 138403)
@@ -3,8 +3,8 @@
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_javascript_Core", "..\..\..\_javascript_Core\_javascript_Core.vcproj\_javascript_Core\_javascript_Core.vcproj", "{011D10F1-B656-4A1B-A0C3-3842F02122C5}"
ProjectSection(ProjectDependencies) = postProject
+ {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A} = {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}
{9221744B-5715-4F56-9590-42F7AB23DD8B} = {9221744B-5715-4F56-9590-42F7AB23DD8B}
- {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A} = {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCore", "..\..\..\WebCore\WebCore.vcproj\WebCore.vcproj", "{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}"
@@ -43,11 +43,28 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testapi", "..\..\..\_javascript_Core\_javascript_Core.vcproj\testapi\testapi.vcproj", "{1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}"
ProjectSection(ProjectDependencies) = postProject
+ {AAE88FEF-509E-4D49-870B-7357922C276F} = {AAE88FEF-509E-4D49-870B-7357922C276F}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit", "..\..\..\WebKit2\win\WebKit2.vcproj", "{2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}"
+ ProjectSection(ProjectDependencies) = postProject
+ {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB} = {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}
+ EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebKit2 Folder", "WebKit2 Folder", "{9AB9C96C-9039-4FA9-8F83-BBFC8F8B2182}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit2Generated", "..\..\..\WebKit2\win\WebKit2Generated.vcproj", "{2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}"
+ ProjectSection(ProjectDependencies) = postProject
{0662A8A9-82A3-4638-97D8-EC425D8D87C9} = {0662A8A9-82A3-4638-97D8-EC425D8D87C9}
EndProjectSection
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebKit Folder", "WebKit Folder", "{1D359ACC-BE10-45D7-938B-BC7E4B7AA6CA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit2WebProcess", "..\..\..\WebKit2\win\WebKit2WebProcess.vcproj", "{AAE88FEF-509E-4D49-870B-7357922C276F}"
+ ProjectSection(ProjectDependencies) = postProject
+ {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD} = {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}
+ EndProjectSection
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebKitCOM Folder", "WebKitCOM Folder", "{1D359ACC-BE10-45D7-938B-BC7E4B7AA6CA}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Interfaces", "Interfaces.vcproj", "{91762BE2-87EF-4F5A-A480-48B90EB3F406}"
ProjectSection(ProjectDependencies) = postProject
{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
@@ -136,9 +153,9 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLIntDesiredOffsets", "..\..\..\_javascript_Core\_javascript_Core.vcproj\LLIntDesiredOffsets\LLIntDesiredOffsets.vcproj", "{877150A0-41B3-4730-9D98-1B8298098B14}"
ProjectSection(ProjectDependencies) = postProject
+ {5AE5F5E4-782D-4F63-B4D7-3977B52B9950} = {5AE5F5E4-782D-4F63-B4D7-3977B52B9950}
+ {AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A} = {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}
- {AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
- {5AE5F5E4-782D-4F63-B4D7-3977B52B9950} = {5AE5F5E4-782D-4F63-B4D7-3977B52B9950}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLIntOffsetsExtractor", "..\..\..\_javascript_Core\_javascript_Core.vcproj\LLIntOffsetsExtractor\LLIntOffsetsExtractor.vcproj", "{D595E3F6-24F2-4C60-935C-95D50C6B3E96}"
@@ -260,6 +277,42 @@
{1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
{1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Release|Win32.ActiveCfg = Release|Win32
{1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Release|Win32.Build.0 = Release|Win32
+ {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
+ {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Debug_All|Win32.Build.0 = Debug_All|Win32
+ {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32
+ {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32
+ {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Debug|Win32.Build.0 = Debug|Win32
+ {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Production|Win32.ActiveCfg = Production|Win32
+ {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Production|Win32.Build.0 = Production|Win32
+ {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
+ {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
+ {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Release|Win32.ActiveCfg = Release|Win32
+ {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Release|Win32.Build.0 = Release|Win32
+ {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
+ {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug_All|Win32.Build.0 = Debug_All|Win32
+ {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32
+ {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32
+ {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug|Win32.Build.0 = Debug|Win32
+ {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Production|Win32.ActiveCfg = Production|Win32
+ {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Production|Win32.Build.0 = Production|Win32
+ {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
+ {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
+ {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release|Win32.ActiveCfg = Release|Win32
+ {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release|Win32.Build.0 = Release|Win32
+ {AAE88FEF-509E-4D49-870B-7357922C276F}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
+ {AAE88FEF-509E-4D49-870B-7357922C276F}.Debug_All|Win32.Build.0 = Debug_All|Win32
+ {AAE88FEF-509E-4D49-870B-7357922C276F}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32
+ {AAE88FEF-509E-4D49-870B-7357922C276F}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32
+ {AAE88FEF-509E-4D49-870B-7357922C276F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AAE88FEF-509E-4D49-870B-7357922C276F}.Debug|Win32.Build.0 = Debug|Win32
+ {AAE88FEF-509E-4D49-870B-7357922C276F}.Production|Win32.ActiveCfg = Production|Win32
+ {AAE88FEF-509E-4D49-870B-7357922C276F}.Production|Win32.Build.0 = Production|Win32
+ {AAE88FEF-509E-4D49-870B-7357922C276F}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
+ {AAE88FEF-509E-4D49-870B-7357922C276F}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
+ {AAE88FEF-509E-4D49-870B-7357922C276F}.Release|Win32.ActiveCfg = Release|Win32
+ {AAE88FEF-509E-4D49-870B-7357922C276F}.Release|Win32.Build.0 = Release|Win32
{91762BE2-87EF-4F5A-A480-48B90EB3F406}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
{91762BE2-87EF-4F5A-A480-48B90EB3F406}.Debug_All|Win32.Build.0 = Debug_All|Win32
{91762BE2-87EF-4F5A-A480-48B90EB3F406}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32
@@ -531,10 +584,13 @@
{83414B15-1C0D-490B-990E-03F4D49170E4} = {63FB6F8A-C601-43E3-BD16-A00A465C2CB6}
{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {A671AE22-FBCE-4C41-A723-82939FCA3E92}
{5AE5F5E4-782D-4F63-B4D7-3977B52B9950} = {A671AE22-FBCE-4C41-A723-82939FCA3E92}
+ {2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD} = {9AB9C96C-9039-4FA9-8F83-BBFC8F8B2182}
+ {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB} = {9AB9C96C-9039-4FA9-8F83-BBFC8F8B2182}
+ {AAE88FEF-509E-4D49-870B-7357922C276F} = {9AB9C96C-9039-4FA9-8F83-BBFC8F8B2182}
+ {BAE88FEF-509E-4D49-870B-7357922C276F} = {9AB9C96C-9039-4FA9-8F83-BBFC8F8B2182}
{91762BE2-87EF-4F5A-A480-48B90EB3F406} = {1D359ACC-BE10-45D7-938B-BC7E4B7AA6CA}
{0662A8A9-82A3-4638-97D8-EC425D8D87C9} = {1D359ACC-BE10-45D7-938B-BC7E4B7AA6CA}
{B8437A41-67BC-4769-9452-45203827F821} = {1D359ACC-BE10-45D7-938B-BC7E4B7AA6CA}
- {BAE88FEF-509E-4D49-870B-7357922C276F} = {1D359ACC-BE10-45D7-938B-BC7E4B7AA6CA}
{6567DFD4-D6DE-4CD5-825D-17E353D160E1} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}
{59CC0547-70AC-499C-9B19-EC01C6F61137} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}
{44B9C152-1870-4035-B94D-7B3285AA0C12} = {62DCDFE4-EAD2-48E1-A2BD-BD54AD3C7459}
Modified: trunk/Source/WebKit/win/WebKit.vcproj/WebKit.vcproj (138402 => 138403)
--- trunk/Source/WebKit/win/WebKit.vcproj/WebKit.vcproj 2012-12-21 23:48:36 UTC (rev 138402)
+++ trunk/Source/WebKit/win/WebKit.vcproj/WebKit.vcproj 2012-12-22 00:22:16 UTC (rev 138403)
@@ -17,7 +17,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- ConfigurationType="2"
+ ConfigurationType="4"
InheritedPropertySheets=".\WebKitLibDebug.vsprops"
CharacterSet="1"
>
@@ -49,15 +49,12 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
+ Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -67,18 +64,12 @@
Name="VCFxCopTool"
/>
<Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
- ConfigurationType="2"
+ ConfigurationType="4"
InheritedPropertySheets=".\WebKitLibRelease.vsprops"
CharacterSet="1"
>
@@ -110,15 +101,12 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
+ Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -128,18 +116,12 @@
Name="VCFxCopTool"
/>
<Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug_Cairo_CFLite|Win32"
- ConfigurationType="2"
+ ConfigurationType="4"
InheritedPropertySheets=".\WebKitLibDebugCairoCFLite.vsprops"
CharacterSet="1"
>
@@ -171,15 +153,12 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
+ Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -189,18 +168,12 @@
Name="VCFxCopTool"
/>
<Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release_Cairo_CFLite|Win32"
- ConfigurationType="2"
+ ConfigurationType="4"
InheritedPropertySheets=".\WebKitLibReleaseCairoCFLite.vsprops"
CharacterSet="1"
>
@@ -232,15 +205,12 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
+ Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -250,18 +220,12 @@
Name="VCFxCopTool"
/>
<Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug_All|Win32"
- ConfigurationType="2"
+ ConfigurationType="4"
InheritedPropertySheets=".\WebKitLibDebugAll.vsprops"
CharacterSet="1"
>
@@ -293,15 +257,12 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
+ Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -311,18 +272,12 @@
Name="VCFxCopTool"
/>
<Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Production|Win32"
- ConfigurationType="2"
+ ConfigurationType="4"
InheritedPropertySheets=".\WebKitLibProduction.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
@@ -355,15 +310,12 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
+ Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
- Name="VCManifestTool"
- />
- <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -373,12 +325,6 @@
Name="VCFxCopTool"
/>
<Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -1298,118 +1244,6 @@
>
</File>
</Filter>
- <Filter
- Name="Resources"
- >
- <File
- RelativePath=".\deleteButton.png"
- >
- </File>
- <File
- RelativePath=".\deleteButtonPressed.png"
- >
- </File>
- <File
- RelativePath=".\fsVideoAudioVolumeHigh.png"
- >
- </File>
- <File
- RelativePath=".\fsVideoAudioVolumeLow.png"
- >
- </File>
- <File
- RelativePath=".\fsVideoExitFullscreen.png"
- >
- </File>
- <File
- RelativePath=".\fsVideoPause.png"
- >
- </File>
- <File
- RelativePath=".\fsVideoPlay.png"
- >
- </File>
- <File
- RelativePath=".\missingImage.png"
- >
- </File>
- <File
- RelativePath=".\nullplugin.png"
- >
- </File>
- <File
- RelativePath=".\panEastCursor.png"
- >
- </File>
- <File
- RelativePath=".\panIcon.png"
- >
- </File>
- <File
- RelativePath=".\panNorthCursor.png"
- >
- </File>
- <File
- RelativePath=".\panNorthEastCursor.png"
- >
- </File>
- <File
- RelativePath=".\panNorthWestCursor.png"
- >
- </File>
- <File
- RelativePath=".\panSouthCursor.png"
- >
- </File>
- <File
- RelativePath=".\panSouthEastCursor.png"
- >
- </File>
- <File
- RelativePath=".\panSouthWestCursor.png"
- >
- </File>
- <File
- RelativePath=".\panWestCursor.png"
- >
- </File>
- <File
- RelativePath=".\searchCancel.png"
- >
- </File>
- <File
- RelativePath=".\searchCancelPressed.png"
- >
- </File>
- <File
- RelativePath=".\searchMagnifier.png"
- >
- </File>
- <File
- RelativePath=".\searchMagnifierResults.png"
- >
- </File>
- <File
- RelativePath=".\textAreaResizeCorner.png"
- >
- </File>
- <File
- RelativePath=".\verticalTextCursor.png"
- >
- </File>
- <File
- RelativePath=".\WebKit.rc"
- >
- </File>
- <File
- RelativePath=".\zoomInCursor.png"
- >
- </File>
- <File
- RelativePath=".\zoomOutCursor.png"
- >
- </File>
- </Filter>
<File
RelativePath="..\WebKitPrefix.cpp"
>
Modified: trunk/Source/WebKit/win/WebKit.vcproj/WebKitLibCommon.vsprops (138402 => 138403)
--- trunk/Source/WebKit/win/WebKit.vcproj/WebKitLibCommon.vsprops 2012-12-21 23:48:36 UTC (rev 138402)
+++ trunk/Source/WebKit/win/WebKit.vcproj/WebKitLibCommon.vsprops 2012-12-22 00:22:16 UTC (rev 138403)
@@ -3,6 +3,7 @@
ProjectType="Visual C++"
Version="8.00"
Name="WebKitLibCommon"
+ OutputDirectory="$(ConfigurationBuildDir)\lib"
>
<Tool
Name="VCCLCompilerTool"
@@ -14,12 +15,4 @@
DisableSpecificWarnings="4819"
ForcedIncludeFiles="WebKitPrefix.h;ICUVersion.h"
/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="delayimp.lib kernel32.lib user32.lib gdi32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib usp10.lib comctl32.lib version.lib shlwapi.lib libxml2$(LibraryConfigSuffix).lib libxslt$(LibraryConfigSuffix).lib libicuin$(LibraryConfigSuffix).lib libicuuc$(LibraryConfigSuffix).lib SQLite3$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib _javascript_Core$(WebKitDLLConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib msimg32.lib crypt32.lib iphlpapi.lib winmm.lib comsuppw.lib rpcrt4.lib zdll$(LibraryConfigSuffix).lib"
- OutputFile="$(OutDir)\WebKit$(WebKitDLLConfigSuffix).dll"
- AdditionalLibraryDirectories=""$(IntDir)\lib""
- ModuleDefinitionFile="$(ConfigurationBuildDir)\obj\WebKit2ExportGenerator\WebKit2.def"
- DelayLoadDLLs="usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;iphlpapi.dll"
- />
</VisualStudioPropertySheet>
Modified: trunk/Source/WebKit/win/WebKit.vcproj/WebKitLibDebug.vsprops (138402 => 138403)
--- trunk/Source/WebKit/win/WebKit.vcproj/WebKitLibDebug.vsprops 2012-12-21 23:48:36 UTC (rev 138402)
+++ trunk/Source/WebKit/win/WebKit.vcproj/WebKitLibDebug.vsprops 2012-12-22 00:22:16 UTC (rev 138403)
@@ -3,6 +3,6 @@
ProjectType="Visual C++"
Version="8.00"
Name="WebKitLibDebug"
- InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\WebKitLibCommon.vsprops;.\WebKitDirectX.vsprops;.\WebKitApple.vsprops"
+ InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\WebKitLibCommon.vsprops"
>
</VisualStudioPropertySheet>
Modified: trunk/Source/WebKit/win/WebKit.vcproj/WebKitLibDebugAll.vsprops (138402 => 138403)
--- trunk/Source/WebKit/win/WebKit.vcproj/WebKitLibDebugAll.vsprops 2012-12-21 23:48:36 UTC (rev 138402)
+++ trunk/Source/WebKit/win/WebKit.vcproj/WebKitLibDebugAll.vsprops 2012-12-22 00:22:16 UTC (rev 138403)
@@ -3,6 +3,6 @@
ProjectType="Visual C++"
Version="8.00"
Name="WebKitLibDebugAll"
- InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops;.\WebKitLibCommon.vsprops;.\WebKitDirectX.vsprops;.\WebKitApple.vsprops"
+ InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops;.\WebKitLibCommon.vsprops"
>
</VisualStudioPropertySheet>
Modified: trunk/Source/WebKit/win/WebKit.vcproj/WebKitLibProduction.vsprops (138402 => 138403)
--- trunk/Source/WebKit/win/WebKit.vcproj/WebKitLibProduction.vsprops 2012-12-21 23:48:36 UTC (rev 138402)
+++ trunk/Source/WebKit/win/WebKit.vcproj/WebKitLibProduction.vsprops 2012-12-22 00:22:16 UTC (rev 138403)
@@ -3,6 +3,6 @@
ProjectType="Visual C++"
Version="8.00"
Name="WebKitProduction"
- InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops;.\WebKitLibCommon.vsprops;.\WebKitDirectX.vsprops;.\WebKitApple.vsprops"
+ InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops;.\WebKitLibCommon.vsprops"
>
</VisualStudioPropertySheet>
Modified: trunk/Source/WebKit/win/WebKit.vcproj/WebKitLibRelease.vsprops (138402 => 138403)
--- trunk/Source/WebKit/win/WebKit.vcproj/WebKitLibRelease.vsprops 2012-12-21 23:48:36 UTC (rev 138402)
+++ trunk/Source/WebKit/win/WebKit.vcproj/WebKitLibRelease.vsprops 2012-12-22 00:22:16 UTC (rev 138403)
@@ -3,6 +3,6 @@
ProjectType="Visual C++"
Version="8.00"
Name="WebKitLibRelease"
- InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WebKitLibCommon.vsprops;.\WebKitDirectX.vsprops;.\WebKitApple.vsprops"
+ InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WebKitLibCommon.vsprops"
>
</VisualStudioPropertySheet>
Modified: trunk/Source/WebKit2/ChangeLog (138402 => 138403)
--- trunk/Source/WebKit2/ChangeLog 2012-12-21 23:48:36 UTC (rev 138402)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-22 00:22:16 UTC (rev 138403)
@@ -1,3 +1,14 @@
+2012-12-21 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r138331.
+ http://trac.webkit.org/changeset/138331
+ https://bugs.webkit.org/show_bug.cgi?id=105668
+
+ Broke Windows clean builds; can't figure out how to fix it
+ (Requested by rniwa on #webkit).
+
+ * win/WebKit2.def.in:
+
2012-12-21 Brady Eidson <[email protected]>
ASSERT in WebResourceLoadScheduler::scheduleLoad with a crashed NetworkProcess.
Modified: trunk/Source/WebKit2/win/WebKit2.def.in (138402 => 138403)
--- trunk/Source/WebKit2/win/WebKit2.def.in 2012-12-21 23:48:36 UTC (rev 138402)
+++ trunk/Source/WebKit2/win/WebKit2.def.in 2012-12-22 00:22:16 UTC (rev 138403)
@@ -283,6 +283,7 @@
?setMediaTypeOverride@Settings@WebCore@@QAEXABVString@WTF@@@Z
?settings@Document@WebCore@@QBEPAVSettings@2@XZ
?settings@Frame@WebCore@@QBEPAVSettings@2@XZ
+ ?setFixedElementsLayoutRelativeToFrame@Settings@WebCore@@QAEX_N@Z
?shadow@Element@WebCore@@QBEPAVElementShadow@2@XZ
?substring@String@WTF@@QBE?AV12@II@Z
?suggestedValue@HTMLInputElement@WebCore@@QBEABVString@WTF@@XZ
