Commit 1a238f22 authored by bfulgham@webkit.org's avatar bfulgham@webkit.org
Browse files

Patch for https://bugs.webkit.org/show_bug.cgi?id=42299

Correct WinCairo build for new WebKit2 project structure.

Reviewed by Steve Falkenburg.

WebKit/win: 

* WebKit.vcproj/WebKit.sln:

WebKit2: 

* win/WebKit2Apple.vsprops: Put WebKit2.def here.
* win/WebKit2CFLite.def: Added CFLite version of def file.
* win/WebKit2CFLite.vsprops: Add new WebKit2CFLite.def here.
* win/WebKit2Common.vsprops: Remove WebKit2.def definition as
  WinCairo and Apple need different versions of this.
* win/WebKit2WebProcess.vcproj: Add a new Debug_Cairo target
  for the WebKit2WebProcess project.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63438 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent dbef7ab1
2010-07-14 Brent Fulgham <bfulgham@webkit.org>
Reviewed by Steve Falkenburg.
Patch for https://bugs.webkit.org/show_bug.cgi?id=42299
Correct WinCairo build for new WebKit2 project structure.
* WebKit.vcproj/WebKit.sln:
2010-07-14 Sam Weinig <sam@webkit.org>
Reviewed by Darin Adler.
......
......@@ -189,7 +189,6 @@ Global
{0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release|Win32.ActiveCfg = all|Win32
{0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release|Win32.Build.0 = all|Win32
{E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug_Cairo|Win32.ActiveCfg = Debug|Win32
{E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug_Cairo|Win32.Build.0 = Debug|Win32
{E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug_Internal|Win32.ActiveCfg = Debug_Internal|Win32
{E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug_Internal|Win32.Build.0 = Debug_Internal|Win32
{E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug|Win32.ActiveCfg = Debug|Win32
......@@ -228,8 +227,8 @@ Global
{2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release_Cairo|Win32.Build.0 = all|Win32
{2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release|Win32.ActiveCfg = all|Win32
{2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release|Win32.Build.0 = all|Win32
{AAE88FEF-509E-4D49-870B-7357922C276F}.Debug_Cairo|Win32.ActiveCfg = Debug|Win32
{AAE88FEF-509E-4D49-870B-7357922C276F}.Debug_Cairo|Win32.Build.0 = Debug|Win32
{AAE88FEF-509E-4D49-870B-7357922C276F}.Debug_Cairo|Win32.ActiveCfg = Debug_CFLite|Win32
{AAE88FEF-509E-4D49-870B-7357922C276F}.Debug_Cairo|Win32.Build.0 = Debug_CFLite|Win32
{AAE88FEF-509E-4D49-870B-7357922C276F}.Debug_Internal|Win32.ActiveCfg = Debug_Internal|Win32
{AAE88FEF-509E-4D49-870B-7357922C276F}.Debug_Internal|Win32.Build.0 = Debug_Internal|Win32
{AAE88FEF-509E-4D49-870B-7357922C276F}.Debug|Win32.ActiveCfg = Debug|Win32
......
2010-07-14 Brent Fulgham <bfulgham@webkit.org>
Reviewed by Steve Falkenburg.
Patch for https://bugs.webkit.org/show_bug.cgi?id=42299
Correct WinCairo build for new WebKit2 project structure.
* win/WebKit2Apple.vsprops: Put WebKit2.def here.
* win/WebKit2CFLite.def: Added CFLite version of def file.
* win/WebKit2CFLite.vsprops: Add new WebKit2CFLite.def here.
* win/WebKit2Common.vsprops: Remove WebKit2.def definition as
WinCairo and Apple need different versions of this.
* win/WebKit2WebProcess.vcproj: Add a new Debug_Cairo target
for the WebKit2WebProcess project.
2010-07-15 Mark Rowe <mrowe@apple.com>
Update the sorting in the Xcode project files.
......
......@@ -7,6 +7,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="CFNetwork$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib QTMovieWin$(WebKitConfigSuffix).lib WebKitSystemInterface$(WebKitConfigSuffix).lib"
ModuleDefinitionFile="WebKit2.def"
DelayLoadDLLs="QTMovieWin$(WebKitConfigSuffix).dll"
/>
</VisualStudioPropertySheet>
EXPORTS
DllGetClassObject PRIVATE
DllCanUnloadNow PRIVATE
DllRegisterServer PRIVATE
DllUnregisterServer PRIVATE
RunAsLocalServer PRIVATE
LocalServerDidDie PRIVATE
setUseOpenSourceWebKit
shutDownWebKit
progIDForClass
WebLocalizedStringUTF8
WebLocalizedLPCTSTRUTF8
WebKitCreateInstance
; These functions are deprecated
WebLocalizedString
WebLocalizedLPCTSTR
SetWebLocalizedStringMainBundle
; Deprecated re-exports from JavaScriptCore
JSCheckScriptSyntax
JSClassCreate
JSClassRelease
JSClassRetain
JSContextGetGlobalObject
JSContextGetGroup
JSContextGroupCreate
JSContextGroupRelease
JSContextGroupRetain
JSEvaluateScript
JSGarbageCollect
JSGlobalContextCreate
JSGlobalContextCreateInGroup
JSGlobalContextRelease
JSGlobalContextRetain
JSObjectCallAsConstructor
JSObjectCallAsFunction
JSObjectCopyPropertyNames
JSObjectDeleteProperty
JSObjectGetPrivate
JSObjectGetProperty
JSObjectGetPropertyAtIndex
JSObjectGetPrototype
JSObjectHasProperty
JSObjectIsConstructor
JSObjectIsFunction
JSObjectMake
JSObjectMakeArray
JSObjectMakeConstructor
JSObjectMakeDate
JSObjectMakeError
JSObjectMakeFunction
JSObjectMakeFunctionWithCallback
JSObjectMakeRegExp
JSObjectSetPrivate
JSObjectSetProperty
JSObjectSetPropertyAtIndex
JSObjectSetPrototype
JSPropertyNameAccumulatorAddName
JSPropertyNameArrayGetCount
JSPropertyNameArrayGetNameAtIndex
JSPropertyNameArrayRelease
JSPropertyNameArrayRetain
JSStringCopyBSTR
JSStringCopyCFString
JSStringCreateWithBSTR
JSStringCreateWithCFString
JSStringCreateWithCharacters
JSStringCreateWithUTF8CString
JSStringGetCharactersPtr
JSStringGetLength
JSStringGetMaximumUTF8CStringSize
JSStringGetUTF8CString
JSStringIsEqual
JSStringIsEqualToUTF8CString
JSStringRelease
JSStringRetain
JSValueGetType
JSValueIsBoolean
JSValueIsEqual
JSValueIsInstanceOfConstructor
JSValueIsNull
JSValueIsNumber
JSValueIsObject
JSValueIsObjectOfClass
JSValueIsStrictEqual
JSValueIsString
JSValueIsUndefined
JSValueMakeBoolean
JSValueMakeNull
JSValueMakeNumber
JSValueMakeString
JSValueMakeUndefined
JSValueProtect
JSValueToBoolean
JSValueToNumber
JSValueToObject
JSValueToStringCopy
JSValueUnprotect
?fastMalloc@WTF@@YAPAXI@Z
?fastZeroedMalloc@WTF@@YAPAXI@Z
?fastFree@WTF@@YAXPAX@Z
?fastCalloc@WTF@@YAPAXII@Z
??0Mutex@WTF@@QAE@XZ
??0ThreadCondition@WTF@@QAE@XZ
??1Mutex@WTF@@QAE@XZ
??1ThreadCondition@WTF@@QAE@XZ
?broadcast@ThreadCondition@WTF@@QAEXXZ
?callOnMainThread@WTF@@YAXP6AXPAX@Z0@Z
?createThread@WTF@@YAIP6APAXPAX@Z0PBD@Z
?currentThread@WTF@@YAIXZ
?detachThread@WTF@@YAXI@Z
?initializeMainThread@WTF@@YAXXZ
?initializeThreading@WTF@@YAXXZ
?isMainThread@WTF@@YA_NXZ
?lock@Mutex@WTF@@QAEXXZ
?lockAtomicallyInitializedStaticMutex@WTF@@YAXXZ
?signal@ThreadCondition@WTF@@QAEXXZ
?timedWait@ThreadCondition@WTF@@QAE_NAAVMutex@2@N@Z
?tlsKeyCount@WTF@@YAAAJXZ
?tlsKeys@WTF@@YAPAKXZ
?tryLock@Mutex@WTF@@QAE_NXZ
?unlock@Mutex@WTF@@QAEXXZ
?unlockAtomicallyInitializedStaticMutex@WTF@@YAXXZ
?wait@ThreadCondition@WTF@@QAEXAAVMutex@2@@Z
?waitForThreadCompletion@WTF@@YAHIPAPAX@Z
?createThread@WTF@@YAIP6APAXPAX@Z0@Z
......@@ -7,6 +7,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="CFLite$(LibraryConfigSuffix).lib"
ModuleDefinitionFile="WebKit2CFLite.def"
AdditionalLibraryDirectories=""
/>
</VisualStudioPropertySheet>
......@@ -17,7 +17,6 @@
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 icuin$(LibraryConfigSuffix).lib icuuc$(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"
OutputFile="$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll"
ModuleDefinitionFile="WebKit2.def"
DelayLoadDLLs="usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;msimg32.dll;iphlpapi.dll"
/>
<Tool
......
......@@ -279,6 +279,74 @@
CommandLine="if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
Name="Debug_CFLite|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\FeatureDefines.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug_wincairo.vsprops"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; grep XX$(ProjectName)XX &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;bash &quot;$(WebKitLibrariesDir)\tools\scripts\auto-version.sh&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\WebProcess\win&quot;"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/NXCOMPAT"
AdditionalDependencies="WebKit$(WebKitDLLConfigSuffix).lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"
/>
</Configuration>
</Configurations>
<References>
</References>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment