diff options
author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/WebCore.vcproj | |
parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/WebCore.vcproj')
-rw-r--r-- | Source/WebCore/WebCore.vcproj/QTMovieWinProduction.vsprops | 2 | ||||
-rw-r--r-- | Source/WebCore/WebCore.vcproj/QTMovieWinRelease.vsprops | 1 | ||||
-rw-r--r-- | Source/WebCore/WebCore.vcproj/QTMovieWinReleaseCairoCFLite.vsprops | 1 | ||||
-rwxr-xr-x | Source/WebCore/WebCore.vcproj/WebCore.vcproj | 1144 | ||||
-rw-r--r-- | Source/WebCore/WebCore.vcproj/WebCoreGenerated.vcproj | 2 | ||||
-rw-r--r-- | Source/WebCore/WebCore.vcproj/WebCoreGeneratedCairo.vsprops | 4 | ||||
-rw-r--r-- | Source/WebCore/WebCore.vcproj/WebCoreGeneratedCommon.vsprops | 4 | ||||
-rw-r--r-- | Source/WebCore/WebCore.vcproj/WebCorePreBuild.cmd | 4 | ||||
-rw-r--r-- | Source/WebCore/WebCore.vcproj/WebCoreProduction.vsprops | 2 | ||||
-rw-r--r-- | Source/WebCore/WebCore.vcproj/WebCoreRelease.vsprops | 1 | ||||
-rw-r--r-- | Source/WebCore/WebCore.vcproj/WebCoreReleaseCairoCFLite.vsprops | 1 | ||||
-rwxr-xr-x | Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd | 5 | ||||
-rwxr-xr-x | Source/WebCore/WebCore.vcproj/copyWebCoreResourceFiles.cmd (renamed from Source/WebCore/WebCore.vcproj/copyInspectorFiles.cmd) | 1 |
13 files changed, 802 insertions, 370 deletions
diff --git a/Source/WebCore/WebCore.vcproj/QTMovieWinProduction.vsprops b/Source/WebCore/WebCore.vcproj/QTMovieWinProduction.vsprops index 5001f2b..023eae9 100644 --- a/Source/WebCore/WebCore.vcproj/QTMovieWinProduction.vsprops +++ b/Source/WebCore/WebCore.vcproj/QTMovieWinProduction.vsprops @@ -6,7 +6,7 @@ InheritedPropertySheets=" $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; - $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops; .\QTMovieWinCommon.vsprops" > diff --git a/Source/WebCore/WebCore.vcproj/QTMovieWinRelease.vsprops b/Source/WebCore/WebCore.vcproj/QTMovieWinRelease.vsprops index aab50d9..7e7f87f 100644 --- a/Source/WebCore/WebCore.vcproj/QTMovieWinRelease.vsprops +++ b/Source/WebCore/WebCore.vcproj/QTMovieWinRelease.vsprops @@ -6,6 +6,7 @@ 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; .\QTMovieWinCommon.vsprops" > diff --git a/Source/WebCore/WebCore.vcproj/QTMovieWinReleaseCairoCFLite.vsprops b/Source/WebCore/WebCore.vcproj/QTMovieWinReleaseCairoCFLite.vsprops index df313d2..d0c85a3 100644 --- a/Source/WebCore/WebCore.vcproj/QTMovieWinReleaseCairoCFLite.vsprops +++ b/Source/WebCore/WebCore.vcproj/QTMovieWinReleaseCairoCFLite.vsprops @@ -6,6 +6,7 @@ InheritedPropertySheets=" $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops; .\QTMovieWinCommon.vsprops" diff --git a/Source/WebCore/WebCore.vcproj/WebCore.vcproj b/Source/WebCore/WebCore.vcproj/WebCore.vcproj index f00a591..676949c 100755 --- a/Source/WebCore/WebCore.vcproj/WebCore.vcproj +++ b/Source/WebCore/WebCore.vcproj/WebCore.vcproj @@ -914,62 +914,6 @@ > </File> <File - RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSBlobBuilder.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug_Cairo_CFLite|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release_Cairo_CFLite|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug_All|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Production|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSBlobBuilder.h" - > - </File> - <File RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSCanvasGradient.cpp" > <FileConfiguration @@ -5486,7 +5430,7 @@ > </File> <File - RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSFlags.cpp" + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitFlags.cpp" > <FileConfiguration Name="Debug|Win32" @@ -5538,7 +5482,7 @@ </FileConfiguration> </File> <File - RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSFlags.h" + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitFlags.h" > </File> <File @@ -11878,6 +11822,174 @@ > </File> <File + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSNavigatorUserMediaError.cpp" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_All|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Production|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSNavigatorUserMediaError.h" + > + </File> + <File + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSNavigatorUserMediaErrorCallback.cpp" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_All|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Production|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSNavigatorUserMediaErrorCallback.h" + > + </File> + <File + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSNavigatorUserMediaSuccessCallback.cpp" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_All|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Production|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSNavigatorUserMediaSuccessCallback.h" + > + </File> + <File RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSNode.cpp" > <FileConfiguration @@ -13558,6 +13670,30 @@ > </File> <File + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStorageInfo.cpp" + > + </File> + <File + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStorageInfo.h" + > + </File> + <File + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStorageInfoErrorCallback.cpp" + > + </File> + <File + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStorageInfoErrorCallback.h" + > + </File> + <File + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStorageInfoUsageCallback.cpp" + > + </File> + <File + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStorageInfoUsageCallback.h" + > + </File> + <File RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSStringCallback.cpp" > <FileConfiguration @@ -21854,6 +21990,62 @@ > </File> <File + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitBlobBuilder.cpp" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_All|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Production|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitBlobBuilder.h" + > + </File> + <File RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitCSSKeyframeRule.cpp" > <FileConfiguration @@ -23318,7 +23510,11 @@ > </File> <File - RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\XMLViewerXSL.h" + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\XMLViewerCSS.h" + > + </File> + <File + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\XMLViewerJS.h" > </File> <File @@ -24878,6 +25074,18 @@ > </File> <File + RelativePath="..\page\NavigatorUserMediaError.h" + > + </File> + <File + RelativePath="..\page\NavigatorUserMediaErrorCallback.h" + > + </File> + <File + RelativePath="..\page\NavigatorUserMediaSuccessCallback.h" + > + </File> + <File RelativePath="..\page\OriginAccessEntry.cpp" > </File> @@ -25062,6 +25270,14 @@ > </File> <File + RelativePath="..\fileapi\WebKitBlobBuilder.cpp" + > + </File> + <File + RelativePath="..\fileapi\WebKitBlobBuilder.h" + > + </File> + <File RelativePath="..\page\WebKitPoint.h" > </File> @@ -25782,19 +25998,19 @@ > </File> <File - RelativePath="..\platform\DragData.cpp" + RelativePath="..\platform\DefaultLocalizationStrategy.cpp" > </File> <File - RelativePath="..\platform\DragData.h" + RelativePath="..\platform\DefaultLocalizationStrategy.h" > </File> <File - RelativePath="..\platform\DefaultLocalizationStrategy.cpp" + RelativePath="..\platform\DragData.cpp" > </File> <File - RelativePath="..\platform\DefaultLocalizationStrategy.h" + RelativePath="..\platform\DragData.h" > </File> <File @@ -25994,6 +26210,14 @@ > </File> <File + RelativePath="..\platform\RuntimeApplicationChecks.cpp" + > + </File> + <File + RelativePath="..\platform\RuntimeApplicationChecks.h" + > + </File> + <File RelativePath="..\platform\SchemeRegistry.cpp" > </File> @@ -26564,6 +26788,10 @@ RelativePath="..\platform\win\WindowMessageListener.h" > </File> + <File + RelativePath="..\platform\win\WindowsTouch.h" + > + </File> </Filter> <Filter Name="cf" @@ -26739,54 +26967,6 @@ <File RelativePath="..\platform\graphics\Font.cpp" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="$(AnalyzeWithLargeStack)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="$(AnalyzeWithLargeStack)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug_Cairo_CFLite|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="$(AnalyzeWithLargeStack)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release_Cairo_CFLite|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="$(AnalyzeWithLargeStack)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug_All|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="$(AnalyzeWithLargeStack)" - /> - </FileConfiguration> - <FileConfiguration - Name="Production|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="$(AnalyzeWithLargeStack)" - /> - </FileConfiguration> </File> <File RelativePath="..\platform\graphics\Font.h" @@ -26953,6 +27133,10 @@ > </File> <File + RelativePath="..\platform\graphics\ImageBufferData.h" + > + </File> + <File RelativePath="..\platform\graphics\ImageObserver.h" > </File> @@ -27100,6 +27284,14 @@ Name="win" > <File + RelativePath="..\platform\graphics\win\DIBPixelData.cpp" + > + </File> + <File + RelativePath="..\platform\graphics\win\DIBPixelData.h" + > + </File> + <File RelativePath="..\platform\graphics\win\FontCacheWin.cpp" > </File> @@ -27246,54 +27438,6 @@ <File RelativePath="..\platform\graphics\win\FontWin.cpp" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="$(AnalyzeWithLargeStack)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="$(AnalyzeWithLargeStack)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug_Cairo_CFLite|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="$(AnalyzeWithLargeStack)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release_Cairo_CFLite|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="$(AnalyzeWithLargeStack)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug_All|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="$(AnalyzeWithLargeStack)" - /> - </FileConfiguration> - <FileConfiguration - Name="Production|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="$(AnalyzeWithLargeStack)" - /> - </FileConfiguration> </File> <File RelativePath="..\platform\graphics\win\GlyphPageTreeNodeCairoWin.cpp" @@ -27928,6 +28072,26 @@ </FileConfiguration> </File> <File + RelativePath="..\platform\graphics\cg\ImageBufferDataCG.cpp" + > + <FileConfiguration + Name="Debug_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + </File> + <File RelativePath="..\platform\graphics\cg\ImageCG.cpp" > <FileConfiguration @@ -28712,6 +28876,114 @@ </FileConfiguration> </File> <File + RelativePath="..\platform\graphics\cairo\PlatformContextCairo.cpp" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_All|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Production|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\platform\graphics\cairo\PlatformPathCairo.cpp" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_All|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Production|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\platform\graphics\cairo\PlatformPathCairo.h" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_All|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Production|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + </File> + <File RelativePath="..\platform\graphics\cairo\RefPtrCairo.cpp" > <FileConfiguration @@ -29135,6 +29407,10 @@ Name="win" > <File + RelativePath="..\platform\graphics\ca\win\AbstractCACFLayerTreeHost.h" + > + </File> + <File RelativePath="..\platform\graphics\ca\win\CACFLayerTreeHost.cpp" > <FileConfiguration @@ -30465,6 +30741,10 @@ > </File> <File + RelativePath="..\platform\text\BidiRunList.h" + > + </File> + <File RelativePath="..\platform\text\Hyphenation.h" > </File> @@ -30529,6 +30809,10 @@ > </File> <File + RelativePath="..\platform\text\StringWithDirection.h" + > + </File> + <File RelativePath="..\platform\text\SuffixTree.h" > </File> @@ -30575,54 +30859,6 @@ <File RelativePath="..\platform\text\TextCodecICU.cpp" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="$(AnalyzeWithLargeStack)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="$(AnalyzeWithLargeStack)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug_Cairo_CFLite|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="$(AnalyzeWithLargeStack)" - /> - </FileConfiguration> - <FileConfiguration - Name="Release_Cairo_CFLite|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="$(AnalyzeWithLargeStack)" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug_All|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="$(AnalyzeWithLargeStack)" - /> - </FileConfiguration> - <FileConfiguration - Name="Production|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="$(AnalyzeWithLargeStack)" - /> - </FileConfiguration> </File> <File RelativePath="..\platform\text\TextCodecICU.h" @@ -30697,6 +30933,10 @@ > </File> <File + RelativePath="..\platform\text\UnicodeBidi.h" + > + </File> + <File RelativePath="..\platform\text\UnicodeRange.cpp" > </File> @@ -32818,62 +33058,6 @@ > </File> <File - RelativePath="..\rendering\MediaControlElements.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug_Cairo_CFLite|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release_Cairo_CFLite|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug_All|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Production|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\rendering\MediaControlElements.h" - > - </File> - <File RelativePath="..\rendering\PaintInfo.h" > </File> @@ -34390,62 +34574,6 @@ > </File> <File - RelativePath="..\rendering\RenderIndicator.cpp" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug_Cairo_CFLite|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Release_Cairo_CFLite|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug_All|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - <FileConfiguration - Name="Production|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\rendering\RenderIndicator.h" - > - </File> - <File RelativePath="..\rendering\RenderingAllInOne.cpp" > </File> @@ -44409,6 +44537,14 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug_All|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration Name="Production|Win32" ExcludedFromBuild="true" > @@ -46514,6 +46650,62 @@ > </File> <File + RelativePath="..\dom\ShadowRoot.cpp" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_All|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Production|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\dom\ShadowRoot.h" + > + </File> + <File RelativePath="..\dom\SpaceSplitString.cpp" > <FileConfiguration @@ -47190,6 +47382,62 @@ </FileConfiguration> </File> <File + RelativePath="..\dom\TreeScope.cpp" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_All|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Production|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\dom\TreeScope.h" + > + </File> + <File RelativePath="..\dom\TreeWalker.h" > </File> @@ -50250,6 +50498,62 @@ > </File> <File + RelativePath="..\editing\SpellingCorrectionController.cpp" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_All|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release_LTCG|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\editing\SpellingCorrectionController.h" + > + </File> + <File RelativePath="..\editing\SplitElementCommand.cpp" > <FileConfiguration @@ -50950,14 +51254,6 @@ > </File> <File - RelativePath="..\fileapi\BlobBuilder.cpp" - > - </File> - <File - RelativePath="..\fileapi\BlobBuilder.h" - > - </File> - <File RelativePath="..\fileapi\BlobURL.cpp" > </File> @@ -51426,7 +51722,7 @@ > </File> <File - RelativePath="..\fileapi\Flags.h" + RelativePath="..\fileapi\WebKitFlags.h" > </File> <File @@ -56405,6 +56701,14 @@ Name="shadow" > <File + RelativePath="..\html\shadow\DetailsMarkerControl.cpp" + > + </File> + <File + RelativePath="..\html\shadow\DetailsMarkerControl.h" + > + </File> + <File RelativePath="..\html\shadow\MediaControls.cpp" > </File> @@ -56413,10 +56717,42 @@ > </File> <File + RelativePath="..\html\shadow\MediaControlElements.cpp" + > + </File> + <File + RelativePath="..\html\shadow\MediaControlElements.h" + > + </File> + <File + RelativePath="..\html\shadow\MediaControlRootElement.cpp" + > + </File> + <File + RelativePath="..\html\shadow\MediaControlRootElement.h" + > + </File> + <File RelativePath="..\html\shadow\ProgressBarValueElement.h" > </File> <File + RelativePath="..\html\shadow\MeterShadowElement.cpp" + > + </File> + <File + RelativePath="..\html\shadow\MeterShadowElement.h" + > + </File> + <File + RelativePath="..\html\shadow\ProgressShadowElement.cpp" + > + </File> + <File + RelativePath="..\html\shadow\ProgressShadowElement.h" + > + </File> + <File RelativePath="..\html\shadow\SliderThumbElement.cpp" > </File> @@ -56493,6 +56829,62 @@ > </File> <File + RelativePath="..\bindings\js\CallbackFunction.cpp" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release_Cairo_CFLite|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_All|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Production|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\bindings\js\CallbackFunction.h" + > + </File> + <File RelativePath="..\bindings\js\DOMObjectHashTableMap.cpp" > <FileConfiguration @@ -63185,6 +63577,10 @@ > </File> <File + RelativePath="..\bindings\js\PageScriptDebugServer.h" + > + </File> + <File RelativePath="..\bindings\js\ScheduledAction.cpp" > <FileConfiguration @@ -64016,10 +64412,6 @@ /> </FileConfiguration> </File> - <File - RelativePath="..\bindings\js\PageScriptDebugServer.h" - > - </File> </Filter> <Filter Name="scripts" @@ -65622,16 +66014,12 @@ </File> </Filter> <Filter - Name="collector" + Name="heap" > - <Filter - Name="handles" - > - <File - RelativePath="..\ForwardingHeaders\collector\handles\Global.h" - > - </File> - </Filter> + <File + RelativePath="..\ForwardingHeaders\heap\Strong.h" + > + </File> </Filter> </Filter> <Filter @@ -66106,6 +66494,26 @@ > </File> <File + RelativePath="..\storage\StorageInfo.cpp" + > + </File> + <File + RelativePath="..\storage\StorageInfo.h" + > + </File> + <File + RelativePath="..\storage\StorageInfoErrorCallback.h" + > + </File> + <File + RelativePath="..\storage\StorageInfoQuotaCallback.h" + > + </File> + <File + RelativePath="..\storage\StorageInfoUsageCallback.h" + > + </File> + <File RelativePath="..\storage\StorageMap.cpp" > </File> @@ -66306,6 +66714,14 @@ > </File> <File + RelativePath="..\inspector\EventsCollector.cpp" + > + </File> + <File + RelativePath="..\inspector\EventsCollector.h" + > + </File> + <File RelativePath="..\inspector\DOMNodeHighlighter.cpp" > </File> @@ -66450,6 +66866,10 @@ > </File> <File + RelativePath="..\inspector\InspectorFrontendChannel.h" + > + </File> + <File RelativePath="..\inspector\InspectorFrontendClient.h" > </File> @@ -66470,15 +66890,19 @@ > </File> <File - RelativePath="..\inspector\InspectorInstrumentation.cpp" + RelativePath="..\inspector\InspectorFrontendProxy.cpp" > </File> <File - RelativePath="..\inspector\InspectorInstrumentation.h" + RelativePath="..\inspector\InspectorFrontendProxy.h" > </File> <File - RelativePath="..\inspector\InspectorProfilerAgent.cpp" + RelativePath="..\inspector\InspectorInstrumentation.cpp" + > + </File> + <File + RelativePath="..\inspector\InspectorInstrumentation.h" > </File> <File @@ -66490,6 +66914,10 @@ > </File> <File + RelativePath="..\inspector\InspectorProfilerAgent.cpp" + > + </File> + <File RelativePath="..\inspector\InspectorProfilerAgent.h" > </File> @@ -66605,6 +67033,14 @@ RelativePath="..\inspector\WorkerDebuggerAgent.h" > </File> + <File + RelativePath="..\inspector\WorkerInspectorController.cpp" + > + </File> + <File + RelativePath="..\inspector\WorkerInspectorController.h" + > + </File> <Filter Name="front-end" > @@ -66645,14 +67081,6 @@ > </File> <File - RelativePath="..\inspector\front-end\Breakpoint.js" - > - </File> - <File - RelativePath="..\inspector\front-end\BreakpointManager.js" - > - </File> - <File RelativePath="..\inspector\front-end\BreakpointsSidebarPane.js" > </File> @@ -66745,6 +67173,10 @@ > </File> <File + RelativePath="..\inspector\front-end\DOMBreakpointsSidebarPane.js" + > + </File> + <File RelativePath="..\inspector\front-end\DOMStorage.js" > </File> @@ -66821,6 +67253,10 @@ > </File> <File + RelativePath="..\inspector\front-end\HeapSnapshotProxy.js" + > + </File> + <File RelativePath="..\inspector\front-end\HeapSnapshotView.js" > </File> @@ -67037,10 +67473,6 @@ > </File> <File - RelativePath="..\inspector\front-end\SourceFrameContent.js" - > - </File> - <File RelativePath="..\inspector\front-end\SourceHTMLTokenizer.js" > </File> diff --git a/Source/WebCore/WebCore.vcproj/WebCoreGenerated.vcproj b/Source/WebCore/WebCore.vcproj/WebCoreGenerated.vcproj index 23bedfb..a07eccd 100644 --- a/Source/WebCore/WebCore.vcproj/WebCoreGenerated.vcproj +++ b/Source/WebCore/WebCore.vcproj/WebCoreGenerated.vcproj @@ -81,7 +81,7 @@ > </File> <File - RelativePath=".\copyInspectorFiles.cmd" + RelativePath=".\copyWebCoreResourceFiles.cmd" > </File> <File diff --git a/Source/WebCore/WebCore.vcproj/WebCoreGeneratedCairo.vsprops b/Source/WebCore/WebCore.vcproj/WebCoreGeneratedCairo.vsprops index 544b179..a4eb98c 100644 --- a/Source/WebCore/WebCore.vcproj/WebCoreGeneratedCairo.vsprops +++ b/Source/WebCore/WebCore.vcproj/WebCoreGeneratedCairo.vsprops @@ -7,8 +7,8 @@ > <Tool Name="VCNMakeTool" - BuildCommandLine="%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
if exist "$(ConfigurationBuildDir)\buildfailed" grep XX$(ProjectName)XX "$(ConfigurationBuildDir)\buildfailed"
if errorlevel 1 exit 1
echo XX$(ProjectName)XX > "$(ConfigurationBuildDir)\buildfailed"

set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
bash build-generated-files.sh "$(ConfigurationBuildDir)" "$(WebKitLibrariesDir)" "$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win" cairo
bash migrate-scripts.sh "$(ConfigurationBuildDir)/obj/WebCore/scripts"
cmd /C copyForwardingHeaders.cmd cairo curl
cmd /C copyInspectorFiles.cmd

if exist "$(ConfigurationBuildDir)\buildfailed" del "$(ConfigurationBuildDir)\buildfailed"
" - ReBuildCommandLine="echo XX$(ProjectName)XX > "$(ConfigurationBuildDir)\buildfailed"

del /s /q "$(ConfigurationBuildDir)\obj\WebCore\DerivedSources"
del /s /q "$(ConfigurationBuildDir)\obj\WebCore\scripts"
%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
bash build-generated-files.sh "$(ConfigurationBuildDir)" "$(WebKitLibrariesDir)" "$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win" cairo
bash migrate-scripts.sh "$(ConfigurationBuildDir)/obj/WebCore/scripts"
cmd /C copyForwardingHeaders.cmd cairo curl
cmd /C copyInspectorFiles.cmd

if exist "$(ConfigurationBuildDir)\buildfailed" del "$(ConfigurationBuildDir)\buildfailed"
" + BuildCommandLine="%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
if exist "$(ConfigurationBuildDir)\buildfailed" grep XX$(ProjectName)XX "$(ConfigurationBuildDir)\buildfailed"
if errorlevel 1 exit 1
echo XX$(ProjectName)XX > "$(ConfigurationBuildDir)\buildfailed"

set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
bash build-generated-files.sh "$(ConfigurationBuildDir)" "$(WebKitLibrariesDir)" "$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win" cairo
bash migrate-scripts.sh "$(ConfigurationBuildDir)/obj/WebCore/scripts"
cmd /C copyForwardingHeaders.cmd cairo curl
cmd /C copyWebCoreResourceFiles.cmd

if exist "$(ConfigurationBuildDir)\buildfailed" del "$(ConfigurationBuildDir)\buildfailed"
" + ReBuildCommandLine="echo XX$(ProjectName)XX > "$(ConfigurationBuildDir)\buildfailed"

del /s /q "$(ConfigurationBuildDir)\obj\WebCore\DerivedSources"
del /s /q "$(ConfigurationBuildDir)\obj\WebCore\scripts"
%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
bash build-generated-files.sh "$(ConfigurationBuildDir)" "$(WebKitLibrariesDir)" "$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win" cairo
bash migrate-scripts.sh "$(ConfigurationBuildDir)/obj/WebCore/scripts"
cmd /C copyForwardingHeaders.cmd cairo curl
cmd /C copyWebCoreResourceFiles.cmd

if exist "$(ConfigurationBuildDir)\buildfailed" del "$(ConfigurationBuildDir)\buildfailed"
" CleanCommandLine="del /s /q "$(ConfigurationBuildDir)\obj\WebCore\DerivedSources"
del /s /q "$(ConfigurationBuildDir)\obj\WebCore\scripts"
if exist "$(ConfigurationBuildDir)\buildfailed" del "$(ConfigurationBuildDir)\buildfailed"
" /> </VisualStudioPropertySheet> diff --git a/Source/WebCore/WebCore.vcproj/WebCoreGeneratedCommon.vsprops b/Source/WebCore/WebCore.vcproj/WebCoreGeneratedCommon.vsprops index 4bd0f6a..5f12834 100644 --- a/Source/WebCore/WebCore.vcproj/WebCoreGeneratedCommon.vsprops +++ b/Source/WebCore/WebCore.vcproj/WebCoreGeneratedCommon.vsprops @@ -8,8 +8,8 @@ > <Tool Name="VCNMakeTool" - BuildCommandLine="%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
if exist "$(ConfigurationBuildDir)\buildfailed" grep XX$(ProjectName)XX "$(ConfigurationBuildDir)\buildfailed"
if errorlevel 1 exit 1
echo XX$(ProjectName)XX > "$(ConfigurationBuildDir)\buildfailed"

bash build-generated-files.sh "$(ConfigurationBuildDir)" "$(WebKitLibrariesDir)" "$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win" windows
set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
bash migrate-scripts.sh "$(WebKitOutputDir)/$(ConfigurationName)/obj/WebCore/scripts"
cmd /C copyForwardingHeaders.cmd cg cf
cmd /C copyInspectorFiles.cmd

if exist "$(ConfigurationBuildDir)\buildfailed" del "$(ConfigurationBuildDir)\buildfailed"
" - ReBuildCommandLine="echo XX$(ProjectName)XX > "$(ConfigurationBuildDir)\buildfailed"

del /s /q "$(ConfigurationBuildDir)\obj\WebCore\DerivedSources"
del /s /q "$(ConfigurationBuildDir)\obj\WebCore\scripts"
%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
bash build-generated-files.sh "$(ConfigurationBuildDir)" "$(WebKitLibrariesDir)" "$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win" windows
set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
bash migrate-scripts.sh "$(WebKitOutputDir)/$(ConfigurationName)/obj/WebCore/scripts"
cmd /C copyForwardingHeaders.cmd cg cf
cmd /C copyInspectorFiles.cmd

if exist "$(ConfigurationBuildDir)\buildfailed" del "$(ConfigurationBuildDir)\buildfailed"
" + BuildCommandLine="%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
if exist "$(ConfigurationBuildDir)\buildfailed" grep XX$(ProjectName)XX "$(ConfigurationBuildDir)\buildfailed"
if errorlevel 1 exit 1
echo XX$(ProjectName)XX > "$(ConfigurationBuildDir)\buildfailed"

bash build-generated-files.sh "$(ConfigurationBuildDir)" "$(WebKitLibrariesDir)" "$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win" windows
set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
bash migrate-scripts.sh "$(WebKitOutputDir)/$(ConfigurationName)/obj/WebCore/scripts"
cmd /C copyForwardingHeaders.cmd cg cf
cmd /C copyWebCoreResourceFiles.cmd

if exist "$(ConfigurationBuildDir)\buildfailed" del "$(ConfigurationBuildDir)\buildfailed"
" + ReBuildCommandLine="echo XX$(ProjectName)XX > "$(ConfigurationBuildDir)\buildfailed"

del /s /q "$(ConfigurationBuildDir)\obj\WebCore\DerivedSources"
del /s /q "$(ConfigurationBuildDir)\obj\WebCore\scripts"
%SystemDrive%\cygwin\bin\which.exe bash
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
bash build-generated-files.sh "$(ConfigurationBuildDir)" "$(WebKitLibrariesDir)" "$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win" windows
set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
bash migrate-scripts.sh "$(WebKitOutputDir)/$(ConfigurationName)/obj/WebCore/scripts"
cmd /C copyForwardingHeaders.cmd cg cf
cmd /C copyWebCoreResourceFiles.cmd

if exist "$(ConfigurationBuildDir)\buildfailed" del "$(ConfigurationBuildDir)\buildfailed"
" CleanCommandLine="del /s /q "$(ConfigurationBuildDir)\obj\WebCore\DerivedSources"
del /s /q "$(ConfigurationBuildDir)\obj\WebCore\scripts"
if exist "$(ConfigurationBuildDir)\buildfailed" del "$(ConfigurationBuildDir)\buildfailed"
" /> </VisualStudioPropertySheet> diff --git a/Source/WebCore/WebCore.vcproj/WebCorePreBuild.cmd b/Source/WebCore/WebCore.vcproj/WebCorePreBuild.cmd index 15f5324..7401678 100644 --- a/Source/WebCore/WebCore.vcproj/WebCorePreBuild.cmd +++ b/Source/WebCore/WebCore.vcproj/WebCorePreBuild.cmd @@ -5,8 +5,4 @@ if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGUR if errorlevel 1 exit 1 echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed" -touch "%CONFIGURATIONBUILDDIR%\tmp.cpp" -cl /analyze /nologo /c "%CONFIGURATIONBUILDDIR%\tmp.cpp" /Fo"%INTDIR%\tmp.obj" 2>&1 | findstr D9040 -if ERRORLEVEL 1 (set EnablePREfast="true") else (set EnablePREfast="false") -if ERRORLEVEL 1 (set AnalyzeWithLargeStack="/analyze:65536") else (set AnalyzeWithLargeStack="") exit /b diff --git a/Source/WebCore/WebCore.vcproj/WebCoreProduction.vsprops b/Source/WebCore/WebCore.vcproj/WebCoreProduction.vsprops index af07ec2..ce5c610 100644 --- a/Source/WebCore/WebCore.vcproj/WebCoreProduction.vsprops +++ b/Source/WebCore/WebCore.vcproj/WebCoreProduction.vsprops @@ -6,7 +6,7 @@ InheritedPropertySheets=" $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; - $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops; .\WebCoreCommon.vsprops; .\WebCoreCG.vsprops; diff --git a/Source/WebCore/WebCore.vcproj/WebCoreRelease.vsprops b/Source/WebCore/WebCore.vcproj/WebCoreRelease.vsprops index f1c9d03..a9d222c 100644 --- a/Source/WebCore/WebCore.vcproj/WebCoreRelease.vsprops +++ b/Source/WebCore/WebCore.vcproj/WebCoreRelease.vsprops @@ -6,6 +6,7 @@ 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; .\WebCoreCommon.vsprops; .\WebCoreCG.vsprops; diff --git a/Source/WebCore/WebCore.vcproj/WebCoreReleaseCairoCFLite.vsprops b/Source/WebCore/WebCore.vcproj/WebCoreReleaseCairoCFLite.vsprops index 613c9b1..fb5a292 100644 --- a/Source/WebCore/WebCore.vcproj/WebCoreReleaseCairoCFLite.vsprops +++ b/Source/WebCore/WebCore.vcproj/WebCoreReleaseCairoCFLite.vsprops @@ -6,6 +6,7 @@ InheritedPropertySheets=" $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops; .\WebCoreCommon.vsprops; diff --git a/Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd b/Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd index 98d2452..2149a86 100755 --- a/Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd +++ b/Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd @@ -8,8 +8,7 @@ mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\parser" mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\runtime" mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\masm" mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\profiler" -mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\collector" -mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\collector\handles" +mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\heap" mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\wtf" mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\wtf\text" mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\wtf\unicode" @@ -78,7 +77,7 @@ xcopy /y /d "%ProjectDir%..\ForwardingHeaders\parser\*.h" "%CONFIGURATIONBUILDDI xcopy /y /d "%ProjectDir%..\ForwardingHeaders\runtime\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\runtime" xcopy /y /d "%ProjectDir%..\ForwardingHeaders\masm\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\masm" xcopy /y /d "%ProjectDir%..\ForwardingHeaders\profiler\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\profiler" -xcopy /y /d "%ProjectDir%..\ForwardingHeaders\collector\handles\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\collector\handles" +xcopy /y /d "%ProjectDir%..\ForwardingHeaders\heap\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\heap" xcopy /y /d "%ProjectDir%..\ForwardingHeaders\wtf\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\wtf" xcopy /y /d "%ProjectDir%..\ForwardingHeaders\wtf\text\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\wtf\text" xcopy /y /d "%ProjectDir%..\ForwardingHeaders\wtf\unicode\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\wtf\unicode" diff --git a/Source/WebCore/WebCore.vcproj/copyInspectorFiles.cmd b/Source/WebCore/WebCore.vcproj/copyWebCoreResourceFiles.cmd index 4a7f67a..62d1ffc 100755 --- a/Source/WebCore/WebCore.vcproj/copyInspectorFiles.cmd +++ b/Source/WebCore/WebCore.vcproj/copyWebCoreResourceFiles.cmd @@ -3,3 +3,4 @@ xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\inspector\front-end\*" "% xcopy /y /d /s /exclude:xcopy.excludes "%CONFIGURATIONBUILDDIR%\obj\WebCore\DerivedSources\InspectorBackendStub.js" "%CONFIGURATIONBUILDDIR%\bin\WebKit.resources\inspector" mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin\WebKit.resources\en.lproj" xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\English.lproj\localizedStrings.js" "%CONFIGURATIONBUILDDIR%\bin\WebKit.resources\en.lproj" +xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\English.lproj\Localizable.strings" "%CONFIGURATIONBUILDDIR%\bin\WebKit.resources\en.lproj" |