diff options
Diffstat (limited to 'Source/WebKit2/win')
| -rw-r--r-- | Source/WebKit2/win/MainWin.cpp | 28 | ||||
| -rw-r--r-- | Source/WebKit2/win/WebKit2.def | 8 | ||||
| -rwxr-xr-x | Source/WebKit2/win/WebKit2.make | 17 | ||||
| -rwxr-xr-x | Source/WebKit2/win/WebKit2.vcproj | 212 | ||||
| -rwxr-xr-x | Source/WebKit2/win/WebKit2Common.vsprops | 4 | ||||
| -rw-r--r-- | Source/WebKit2/win/WebKit2Generated.make | 178 | ||||
| -rw-r--r-- | Source/WebKit2/win/WebKit2WebProcess.resources/Info.plist | 20 | ||||
| -rw-r--r-- | Source/WebKit2/win/WebKit2WebProcessCommon.vsprops | 2 | ||||
| -rw-r--r-- | Source/WebKit2/win/WebKit2WebProcessPostBuild.cmd | 3 | ||||
| -rw-r--r-- | Source/WebKit2/win/WebKit2WebProcessPreBuild.cmd | 2 |
10 files changed, 362 insertions, 112 deletions
diff --git a/Source/WebKit2/win/MainWin.cpp b/Source/WebKit2/win/MainWin.cpp index 7aea3f2..c12d048 100644 --- a/Source/WebKit2/win/MainWin.cpp +++ b/Source/WebKit2/win/MainWin.cpp @@ -23,6 +23,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#include <shlwapi.h> #include <windows.h> #if defined _M_IX86 @@ -37,9 +38,30 @@ #pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='" PROCESSORARCHITECTURE "' publicKeyToken='6595b64144ccf1df' language='*'\"") -extern "C" __declspec(dllimport) int WebKitMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrCmdLine, int nCmdShow); - int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrCmdLine, int nCmdShow) { - return WebKitMain(hInstance, hPrevInstance, lpstrCmdLine, nCmdShow); +#ifndef DEBUG_ALL + LPCWSTR webKitDLLName = L"WebKit.dll"; +#else + LPCTSTR webKitDLLName = L"WebKit_debug.dll"; +#endif + + WCHAR webKitPath[MAX_PATH]; + ::GetModuleFileNameW(0, webKitPath, ARRAYSIZE(webKitPath)); + ::PathRemoveFileSpecW(webKitPath); + + // Look for DLLs in the same directory as WebKit2WebProcess.exe. This is not in the search + // path already, since we launch WebKit2WebProcess.exe via CreateProcess with lpCurrentDirectory + // set to 0. We want both the WebKit client app DLL path and the WebKit directory DLL path in + // the DLL search order, and we want the current directory set to the WebKit client app path. + ::SetDllDirectoryW(webKitPath); + + ::PathAppendW(webKitPath, webKitDLLName); + HMODULE module = ::LoadLibraryW(webKitPath); + typedef int (__cdecl* WebKitMainProcPtr)(HINSTANCE, HINSTANCE, LPTSTR, int); + WebKitMainProcPtr mainProc = reinterpret_cast<WebKitMainProcPtr>(GetProcAddress(module, "WebKitMain")); + if (!mainProc) + return 0; + + return mainProc(hInstance, hPrevInstance, lpstrCmdLine, nCmdShow); } diff --git a/Source/WebKit2/win/WebKit2.def b/Source/WebKit2/win/WebKit2.def index 37c5dfc..799fea9 100644 --- a/Source/WebKit2/win/WebKit2.def +++ b/Source/WebKit2/win/WebKit2.def @@ -19,6 +19,14 @@ EXPORTS WebKitShouldUseFontSmoothing WebKitCreateInstance + ; Exported for WebKitTestRunner's use only + ??0KURL@WebCore@@QAE@W4ParsedURLStringTag@1@PBD@Z + ??1StringImpl@WTF@@QAE@XZ + ?equal@WTF@@YA_NPBVStringImpl@1@PBD@Z + ?equalIgnoringCase@WTF@@YA_NPAVStringImpl@1@PBD@Z + ?host@KURL@WebCore@@QBE?AVString@WTF@@XZ + ?protocol@KURL@WebCore@@QBE?AVString@WTF@@XZ + ; These functions are deprecated WebLocalizedString WebLocalizedLPCTSTR diff --git a/Source/WebKit2/win/WebKit2.make b/Source/WebKit2/win/WebKit2.make index 7d1ea35..111d113 100755 --- a/Source/WebKit2/win/WebKit2.make +++ b/Source/WebKit2/win/WebKit2.make @@ -8,14 +8,15 @@ install: set WebKitLibrariesDir=$(SRCROOT)\AppleInternal set WebKitOutputDir=$(OBJROOT) set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE) - set WebKitVSPropsRedirectionDir=$(SRCROOT)\AppleInternal\tools\vsprops\OpenSource\1\2\ + set WebKitVSPropsRedirectionDir=$(SRCROOT)\AppleInternal\tools\vsprops\OpenSource\1\2\3\ set PRODUCTION=1 devenv "WebKit2.submit.sln" /rebuild $(BUILDSTYLE) - -xcopy "$(ConfigurationBuildDir)\bin\*.exe" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y - xcopy "$(ConfigurationBuildDir)\bin\*.pdb" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y - xcopy "$(ConfigurationBuildDir)\bin\*.dll" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y - xcopy "$(ConfigurationBuildDir)\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y - xcopy "$(ConfigurationBuildDir)\lib\*" "$(DSTROOT)\AppleInternal\lib\" /e/v/i/h/y - -xcopy "$(ConfigurationBuildDir)\bin\WebKit2.resources\*" "$(DSTROOT)\AppleInternal\bin\WebKit2.resources" /e/v/i/h/y + -xcopy "%ConfigurationBuildDir%\bin\*.exe" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y + xcopy "%ConfigurationBuildDir%\bin\*.pdb" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y + xcopy "%ConfigurationBuildDir%\bin\*.dll" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y + xcopy "%ConfigurationBuildDir%\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y + xcopy "%ConfigurationBuildDir%\lib\*" "$(DSTROOT)\AppleInternal\lib\" /e/v/i/h/y + -xcopy "%ConfigurationBuildDir%\bin\WebKit2.resources\*" "$(DSTROOT)\AppleInternal\bin\WebKit2.resources" /e/v/i/h/y + -xcopy "%ConfigurationBuildDir%\bin\WebKit2WebProcess.resources\*" "$(DSTROOT)\AppleInternal\bin\WebKit2WebProcess.resources" /e/v/i/h/y -mkdir "$(DSTROOT)\AppleInternal\Sources\WebKit2" - xcopy "$(ConfigurationBuildDir)\obj\WebKit\DerivedSources\*" "$(DSTROOT)\AppleInternal\Sources\WebKit2" /e/v/i/h/y + xcopy "%ConfigurationBuildDir%\obj\WebKit\DerivedSources\*" "$(DSTROOT)\AppleInternal\Sources\WebKit2" /e/v/i/h/y diff --git a/Source/WebKit2/win/WebKit2.vcproj b/Source/WebKit2/win/WebKit2.vcproj index 0742c6e..6d6ab21 100755 --- a/Source/WebKit2/win/WebKit2.vcproj +++ b/Source/WebKit2/win/WebKit2.vcproj @@ -399,14 +399,6 @@ > </File> <File - RelativePath="..\Shared\ShareableBitmap.cpp" - > - </File> - <File - RelativePath="..\Shared\ShareableBitmap.h" - > - </File> - <File RelativePath="..\Shared\CacheModel.h" > </File> @@ -451,6 +443,10 @@ > </File> <File + RelativePath="..\Shared\LayerTreeContext.h" + > + </File> + <File RelativePath="..\Shared\MutableArray.cpp" > </File> @@ -515,6 +511,14 @@ > </File> <File + RelativePath="..\Shared\ShareableBitmap.cpp" + > + </File> + <File + RelativePath="..\Shared\ShareableBitmap.h" + > + </File> + <File RelativePath="..\Shared\StringPairVector.h" > </File> @@ -523,6 +527,14 @@ > </File> <File + RelativePath="..\Shared\UpdateInfo.cpp" + > + </File> + <File + RelativePath="..\Shared\UpdateInfo.h" + > + </File> + <File RelativePath="..\Shared\UserMessageCoders.h" > </File> @@ -607,6 +619,14 @@ > </File> <File + RelativePath="..\Shared\WebGraphicsContext.cpp" + > + </File> + <File + RelativePath="..\Shared\WebGraphicsContext.h" + > + </File> + <File RelativePath="..\Shared\WebImage.cpp" > </File> @@ -806,6 +826,14 @@ > </File> <File + RelativePath="..\Shared\API\c\WKGraphicsContext.cpp" + > + </File> + <File + RelativePath="..\Shared\API\c\WKGraphicsContext.h" + > + </File> + <File RelativePath="..\Shared\API\c\WKImage.cpp" > </File> @@ -989,6 +1017,30 @@ Name="cg" > <File + RelativePath="..\Shared\API\c\cg\WKGraphicsContextCG.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="..\Shared\API\c\cg\WKGraphicsContextCG.h" + > + </File> + <File RelativePath="..\Shared\API\c\cg\WKImageCG.cpp" > <FileConfiguration @@ -1062,6 +1114,10 @@ > </File> <File + RelativePath="..\Shared\win\LayerTreeContextWin.cpp" + > + </File> + <File RelativePath="..\Shared\win\NativeWebKeyboardEventWin.cpp" > </File> @@ -1397,11 +1453,19 @@ Name="win" > <File - RelativePath="..\WebProcess\WebCoreSupport\win\WebContextMenuClientWin.cpp" + RelativePath="..\WebProcess\WebCoreSupport\win\WebDragClientWin.cpp" > </File> <File - RelativePath="..\WebProcess\WebCoreSupport\win\WebDatabaseManagerWin.cpp" + RelativePath="..\WebProcess\WebCoreSupport\win\WebDragSource.cpp" + > + </File> + <File + RelativePath="..\WebProcess\WebCoreSupport\win\WebDragSource.h" + > + </File> + <File + RelativePath="..\WebProcess\WebCoreSupport\win\WebContextMenuClientWin.cpp" > </File> <File @@ -1450,6 +1514,14 @@ > </File> <File + RelativePath="..\WebProcess\WebPage\DrawingAreaImpl.cpp" + > + </File> + <File + RelativePath="..\WebProcess\WebPage\DrawingAreaImpl.h" + > + </File> + <File RelativePath="..\WebProcess\WebPage\EncoderAdapter.cpp" > </File> @@ -1474,6 +1546,14 @@ > </File> <File + RelativePath="..\WebProcess\WebPage\LayerTreeHost.cpp" + > + </File> + <File + RelativePath="..\WebProcess\WebPage\LayerTreeHost.h" + > + </File> + <File RelativePath="..\WebProcess\WebPage\PageOverlay.cpp" > </File> @@ -1628,6 +1708,14 @@ /> </FileConfiguration> </File> + <Filter + Name="win" + > + <File + RelativePath="..\WebProcess\Downloads\cf\win\DownloadCFNetWin.cpp" + > + </File> + </Filter> </Filter> <Filter Name="curl" @@ -1714,6 +1802,14 @@ > </File> <File + RelativePath="..\WebProcess\InjectedBundle\InjectedBundleNavigationAction.cpp" + > + </File> + <File + RelativePath="..\WebProcess\InjectedBundle\InjectedBundleNavigationAction.h" + > + </File> + <File RelativePath="..\WebProcess\InjectedBundle\InjectedBundlePageContextMenuClient.cpp" > </File> @@ -1746,6 +1842,22 @@ > </File> <File + RelativePath="..\WebProcess\InjectedBundle\InjectedBundlePagePolicyClient.cpp" + > + </File> + <File + RelativePath="..\WebProcess\InjectedBundle\InjectedBundlePagePolicyClient.h" + > + </File> + <File + RelativePath="..\WebProcess\InjectedBundle\InjectedBundlePageResourceLoadClient.cpp" + > + </File> + <File + RelativePath="..\WebProcess\InjectedBundle\InjectedBundlePageResourceLoadClient.h" + > + </File> + <File RelativePath="..\WebProcess\InjectedBundle\InjectedBundlePageUIClient.cpp" > </File> @@ -1824,6 +1936,22 @@ > </File> <File + RelativePath="..\WebProcess\InjectedBundle\API\c\WKBundleInspector.cpp" + > + </File> + <File + RelativePath="..\WebProcess\InjectedBundle\API\c\WKBundleInspector.h" + > + </File> + <File + RelativePath="..\WebProcess\InjectedBundle\API\c\WKBundleNavigationAction.cpp" + > + </File> + <File + RelativePath="..\WebProcess\InjectedBundle\API\c\WKBundleNavigationAction.h" + > + </File> + <File RelativePath="..\WebProcess\InjectedBundle\API\c\WKBundleNodeHandle.cpp" > </File> @@ -2019,6 +2147,14 @@ Name="UIProcess" > <File + RelativePath="..\UIProcess\BackingStore.cpp" + > + </File> + <File + RelativePath="..\UIProcess\BackingStore.h" + > + </File> + <File RelativePath="..\UIProcess\ChunkedUpdateDrawingAreaProxy.cpp" > </File> @@ -2035,6 +2171,14 @@ > </File> <File + RelativePath="..\UIProcess\DrawingAreaProxyImpl.cpp" + > + </File> + <File + RelativePath="..\UIProcess\DrawingAreaProxyImpl.h" + > + </File> + <File RelativePath="..\UIProcess\FindIndicator.cpp" > </File> @@ -2726,6 +2870,10 @@ Name="win" > <File + RelativePath="..\UIProcess\win\BackingStoreWin.cpp" + > + </File> + <File RelativePath="..\UIProcess\win\ChunkedUpdateDrawingAreaProxyWin.cpp" > </File> @@ -2819,6 +2967,14 @@ > </File> <File + RelativePath="..\Platform\Region.cpp" + > + </File> + <File + RelativePath="..\Platform\Region.h" + > + </File> + <File RelativePath="..\Platform\RunLoop.cpp" > </File> @@ -2848,6 +3004,22 @@ <File RelativePath="..\Platform\cg\CGUtilities.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\cg\CGUtilities.h" @@ -2957,6 +3129,10 @@ Name="win" > <File + RelativePath="..\Platform\CoreIPC\win\BinarySemaphoreWin.cpp" + > + </File> + <File RelativePath="..\Platform\CoreIPC\win\ConnectionWin.cpp" > </File> @@ -3095,6 +3271,22 @@ > </File> <File + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\DrawingAreaMessageReceiver.cpp" + > + </File> + <File + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\DrawingAreaMessages.h" + > + </File> + <File + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\DrawingAreaProxyMessageReceiver.cpp" + > + </File> + <File + RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\DrawingAreaProxyMessages.h" + > + </File> + <File RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\WebContextMessageReceiver.cpp" > </File> diff --git a/Source/WebKit2/win/WebKit2Common.vsprops b/Source/WebKit2/win/WebKit2Common.vsprops index ab53421..b29aa75 100755 --- a/Source/WebKit2/win/WebKit2Common.vsprops +++ b/Source/WebKit2/win/WebKit2Common.vsprops @@ -6,7 +6,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(ProjectDir)\..\Platform";"$(ProjectDir)\..\Platform\cg";"$(ProjectDir)\..\Platform\CoreIPC";"$(ProjectDir)\..\PluginProcess";"$(ProjectDir)\..\Shared";"$(ProjectDir)\..\Shared\win";"$(ProjectDir)\..\Shared\cf";"$(ProjectDir)\..\Shared\API\c";"$(ProjectDir)\..\Shared\API\c\cf";"$(ProjectDir)\..\Shared\API\c\win";"$(ProjectDir)\..\Shared\CoreIPCSupport";"$(ProjectDir)\..\Shared\Plugins";"$(ProjectDir)\..\Shared\Plugins\Netscape";"$(ProjectDir)\..\UIProcess";"$(ProjectDir)\..\UIProcess\API\C";"$(ProjectDir)\..\UIProcess\API\C\win";"$(ProjectDir)\..\UIProcess\API\cpp";"$(ProjectDir)\..\UIProcess\API\win";"$(ProjectDir)\..\UIProcess\Authentication";"$(ProjectDir)\..\UIProcess\Downloads";"$(ProjectDir)\..\UIProcess\Launcher";"$(ProjectDir)\..\UIProcess\Plugins";"$(ProjectDir)\..\UIProcess\win";"$(ProjectDir)\..\WebProcess";"$(ProjectDir)\..\WebProcess\WebCoreSupport";"$(ProjectDir)\..\WebProcess\WebCoreSupport\win";"$(ProjectDir)\..\WebProcess\WebPage";"$(ProjectDir)\..\WebProcess\WebPage\win";"$(ProjectDir)\..\WebProcess\InjectedBundle";"$(ProjectDir)\..\WebProcess\InjectedBundle\API\c";"$(ProjectDir)\..\WebProcess\InjectedBundle\DOM";"$(ProjectDir)\..\WebProcess\InjectedBundle\win";"$(ProjectDir)\..\WebProcess\Plugins";"$(ProjectDir)\..\WebProcess\Plugins\Netscape";"$(ProjectDir)\..\WebProcess\win";"$(ProjectDir)\..\WebProcess\Authentication";"$(ProjectDir)\..\WebProcess\Downloads";"$(ProjectDir)\..\WebProcess\Downloads\cf";"$(ProjectDir)\..\WebProcess\Geolocation";"$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources";"$(ConfigurationBuildDir)\Include";"$(ConfigurationBuildDir)\Include\private";"$(WebKitLibrariesDir)\Include";"$(WebKitLibrariesDir)\Include\private";"$(WebKitLibrariesDir)\Include\pthreads";"$(ConfigurationBuildDir)\Include\JavaScriptCore";"$(ConfigurationBuildDir)\Include\private\JavaScriptCore";"$(WebKitLibrariesDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\private\JavaScriptCore";"$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders"" + AdditionalIncludeDirectories=""$(ProjectDir)\..";"$(ProjectDir)\..\Platform";"$(ProjectDir)\..\Platform\cg";"$(ProjectDir)\..\Platform\CoreIPC";"$(ProjectDir)\..\PluginProcess";"$(ProjectDir)\..\Shared";"$(ProjectDir)\..\Shared\win";"$(ProjectDir)\..\Shared\cf";"$(ProjectDir)\..\Shared\API\c";"$(ProjectDir)\..\Shared\API\c\cf";"$(ProjectDir)\..\Shared\API\c\win";"$(ProjectDir)\..\Shared\CoreIPCSupport";"$(ProjectDir)\..\Shared\Plugins";"$(ProjectDir)\..\Shared\Plugins\Netscape";"$(ProjectDir)\..\UIProcess";"$(ProjectDir)\..\UIProcess\API\C";"$(ProjectDir)\..\UIProcess\API\C\win";"$(ProjectDir)\..\UIProcess\API\cpp";"$(ProjectDir)\..\UIProcess\API\win";"$(ProjectDir)\..\UIProcess\Authentication";"$(ProjectDir)\..\UIProcess\Downloads";"$(ProjectDir)\..\UIProcess\Launcher";"$(ProjectDir)\..\UIProcess\Plugins";"$(ProjectDir)\..\UIProcess\win";"$(ProjectDir)\..\WebProcess";"$(ProjectDir)\..\WebProcess\WebCoreSupport";"$(ProjectDir)\..\WebProcess\WebCoreSupport\win";"$(ProjectDir)\..\WebProcess\WebPage";"$(ProjectDir)\..\WebProcess\WebPage\win";"$(ProjectDir)\..\WebProcess\InjectedBundle";"$(ProjectDir)\..\WebProcess\InjectedBundle\API\c";"$(ProjectDir)\..\WebProcess\InjectedBundle\DOM";"$(ProjectDir)\..\WebProcess\InjectedBundle\win";"$(ProjectDir)\..\WebProcess\Plugins";"$(ProjectDir)\..\WebProcess\Plugins\Netscape";"$(ProjectDir)\..\WebProcess\win";"$(ProjectDir)\..\WebProcess\Authentication";"$(ProjectDir)\..\WebProcess\Downloads";"$(ProjectDir)\..\WebProcess\Downloads\cf";"$(ProjectDir)\..\WebProcess\Geolocation";"$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources";"$(ConfigurationBuildDir)\Include";"$(ConfigurationBuildDir)\Include\private";"$(WebKitLibrariesDir)\Include";"$(WebKitLibrariesDir)\Include\private";"$(WebKitLibrariesDir)\Include\pthreads";"$(ConfigurationBuildDir)\Include\JavaScriptCore";"$(ConfigurationBuildDir)\Include\private\JavaScriptCore";"$(WebKitLibrariesDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\Include\private\JavaScriptCore";"$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders";"$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders"" PreprocessorDefinitions="_USRDLL;WEBKIT_EXPORTS;FRAMEWORK_NAME=WebKit;BUILDING_WEBKIT" UsePrecompiledHeader="2" PrecompiledHeaderThrough="WebKit2Prefix.h" @@ -18,7 +18,7 @@ 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 JavaScriptCore$(WebKitDLLConfigSuffix).lib WebCore$(WebKitConfigSuffix).lib WebKitLib$(WebKitConfigSuffix).lib WebKitGUID$(WebKitConfigSuffix).lib msimg32.lib crypt32.lib iphlpapi.lib winmm.lib comsuppw.lib rpcrt4.lib zdll$(LibraryConfigSuffix).lib" OutputFile="$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll" AdditionalLibraryDirectories=""$(IntDir)\lib"" - DelayLoadDLLs="usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;msimg32.dll;iphlpapi.dll" + DelayLoadDLLs="usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;iphlpapi.dll" /> <Tool Name="VCResourceCompilerTool" diff --git a/Source/WebKit2/win/WebKit2Generated.make b/Source/WebKit2/win/WebKit2Generated.make index 9460ab5..506e1ed 100644 --- a/Source/WebKit2/win/WebKit2Generated.make +++ b/Source/WebKit2/win/WebKit2Generated.make @@ -1,90 +1,94 @@ all: - touch "$(CONFIGURATIONBUILDDIR)\buildfailed" - -mkdir 2>NUL "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\cf\WKStringCF.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\cf\WKURLCF.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\cf\WKURLRequestCF.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\cf\WKURLResponseCF.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\cg\WKImageCG.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\win\WKBaseWin.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\win\WKCertificateInfoWin.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\WKArray.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\WKBase.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\WKCertificateInfo.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\C\WKContextMenuItem.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\C\WKContextMenuItemTypes.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\WKData.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\WKDictionary.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\WKError.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\WKEvent.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\WKFindOptions.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\WKGeometry.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\WKImage.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\WKMutableArray.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\WKMutableDictionary.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\WKNumber.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\WKPageLoadTypes.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\C\WKSecurityOrigin.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\WKSerializedScriptValue.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\WKSerializedScriptValuePrivate.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\WKString.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\WKStringPrivate.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\WKType.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\WKURL.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\WKURLRequest.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\WKURLResponse.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\Shared\API\c\WKUserContentURLPattern.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WebKit2.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKAuthenticationChallenge.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKAuthenticationDecisionListener.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKBackForwardList.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKBackForwardListItem.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKContext.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKContextPrivate.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKCredential.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKCredentialTypes.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKDatabaseManager.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKDownload.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKFormSubmissionListener.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKFrame.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKFramePolicyListener.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKGeolocationManager.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKGeolocationPermissionRequest.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKGeolocationPosition.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\c\WKInspector.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKNativeEvent.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKNavigationData.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKOpenPanelParameters.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKOpenPanelResultListener.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKPage.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKPageGroup.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKPreferences.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKPreferencesPrivate.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKProtectionSpace.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\WKProtectionSpaceTypes.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\win\WKContextPrivateWin.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\win\WKView.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\C\win\WKViewPrivate.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\UIProcess\API\cpp\WKRetainPtr.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundle.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleBackForwardList.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleBackForwardListItem.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleFrame.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleFramePrivate.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleHitTestResult.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleInitialize.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleNodeHandle.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleNodeHandlePrivate.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundlePage.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundlePageGroup.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundlePageOverlay.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundlePagePrivate.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundlePrivate.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleRangeHandle.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleScriptWorld.h" "$(CONFIGURATIONBUILDDIR)\include\WebKit2" - bash build-generated-files.sh "$(CONFIGURATIONBUILDDIR)" - -del "$(CONFIGURATIONBUILDDIR)\buildfailed" + touch "%ConfigurationBuildDir%\buildfailed" + -mkdir 2>NUL "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\cf\WKStringCF.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\cf\WKURLCF.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\cf\WKURLRequestCF.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\cf\WKURLResponseCF.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\cg\WKImageCG.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\cg\WKGraphicsContextCG.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\win\WKBaseWin.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\win\WKCertificateInfoWin.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\WKArray.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\WKBase.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\WKCertificateInfo.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\C\WKContextMenuItem.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\C\WKContextMenuItemTypes.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\WKData.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\WKDictionary.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\WKError.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\WKEvent.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\WKFindOptions.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\WKGeometry.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\WKGraphicsContext.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\WKImage.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\WKMutableArray.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\WKMutableDictionary.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\WKNumber.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\WKPageLoadTypes.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\C\WKSecurityOrigin.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\WKSerializedScriptValue.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\WKSerializedScriptValuePrivate.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\WKString.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\WKStringPrivate.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\WKType.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\WKURL.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\WKURLRequest.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\WKURLResponse.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\Shared\API\c\WKUserContentURLPattern.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WebKit2.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKAuthenticationChallenge.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKAuthenticationDecisionListener.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKBackForwardList.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKBackForwardListItem.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKContext.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKContextPrivate.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKCredential.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKCredentialTypes.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKDatabaseManager.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKDownload.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKFormSubmissionListener.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKFrame.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKFramePolicyListener.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKGeolocationManager.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKGeolocationPermissionRequest.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKGeolocationPosition.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\c\WKInspector.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKNativeEvent.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKNavigationData.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKOpenPanelParameters.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKOpenPanelResultListener.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKPage.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKPageGroup.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKPreferences.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKPreferencesPrivate.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKProtectionSpace.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKProtectionSpaceTypes.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\win\WKContextPrivateWin.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\win\WKView.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\win\WKViewPrivate.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\cpp\WKRetainPtr.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundle.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleBackForwardList.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleBackForwardListItem.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleFrame.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleFramePrivate.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleHitTestResult.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleInitialize.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleInspector.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleNavigationAction.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleNodeHandle.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleNodeHandlePrivate.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundlePage.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundlePageGroup.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundlePageOverlay.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundlePagePrivate.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundlePrivate.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleRangeHandle.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\WebProcess\InjectedBundle\API\c\WKBundleScriptWorld.h" "%ConfigurationBuildDir%\include\WebKit2" + bash build-generated-files.sh "%ConfigurationBuildDir%" + -del "%ConfigurationBuildDir%\buildfailed" clean: - -del "$(CONFIGURATIONBUILDDIR)\buildfailed" - -del /s /q "$(CONFIGURATIONBUILDDIR)\include\WebKit2" + -del "%ConfigurationBuildDir%\buildfailed" + -del /s /q "%ConfigurationBuildDir%\include\WebKit2" diff --git a/Source/WebKit2/win/WebKit2WebProcess.resources/Info.plist b/Source/WebKit2/win/WebKit2WebProcess.resources/Info.plist new file mode 100644 index 0000000..2b8f801 --- /dev/null +++ b/Source/WebKit2/win/WebKit2WebProcess.resources/Info.plist @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> + <string>WebKit2WebProcess</string> + <key>CFBundleGetInfoString</key> + <string>Copyright 2011 Apple Inc.</string> + <key>CFBundleIdentifier</key> + <string>com.apple.WebKit2WebProcess</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>WebKit2WebProcess</string> + <key>CFBundlePackageType</key> + <string>APPL</string> +</dict> +</plist> diff --git a/Source/WebKit2/win/WebKit2WebProcessCommon.vsprops b/Source/WebKit2/win/WebKit2WebProcessCommon.vsprops index 4a79706..6e3681e 100644 --- a/Source/WebKit2/win/WebKit2WebProcessCommon.vsprops +++ b/Source/WebKit2/win/WebKit2WebProcessCommon.vsprops @@ -10,6 +10,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="WebKit$(WebKitDLLConfigSuffix).lib" + AdditionalDependencies="Shlwapi.lib" /> </VisualStudioPropertySheet> diff --git a/Source/WebKit2/win/WebKit2WebProcessPostBuild.cmd b/Source/WebKit2/win/WebKit2WebProcessPostBuild.cmd index 26707ca..609f325 100644 --- a/Source/WebKit2/win/WebKit2WebProcessPostBuild.cmd +++ b/Source/WebKit2/win/WebKit2WebProcessPostBuild.cmd @@ -1 +1,4 @@ +mkdir 2>NUL "%OUTDIR%\..\bin\WebKit2WebProcess.resources" +xcopy /y /d "%PROJECTDIR%\WebKit2WebProcess.resources\*" "%OUTDIR%\..\bin\WebKit2WebProcess.resources" + if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed" diff --git a/Source/WebKit2/win/WebKit2WebProcessPreBuild.cmd b/Source/WebKit2/win/WebKit2WebProcessPreBuild.cmd index 21af383..42fbb71 100644 --- a/Source/WebKit2/win/WebKit2WebProcessPreBuild.cmd +++ b/Source/WebKit2/win/WebKit2WebProcessPreBuild.cmd @@ -3,6 +3,6 @@ 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" +echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed" bash "%WEBKITLIBRARIESDIR%\tools\scripts\auto-version.sh" "%INTDIR%" |