[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
bfulgham at webkit.org
bfulgham at webkit.org
Wed Dec 22 11:14:06 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 1a238f22009958c770d429ff2d876309c1b564ee
Author: bfulgham at webkit.org <bfulgham at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 15 17:56:52 2010 +0000
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
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 9d0703c..d03924b 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-14 Brent Fulgham <bfulgham at 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 at webkit.org>
Reviewed by Darin Adler.
diff --git a/WebKit/win/WebKit.vcproj/WebKit.sln b/WebKit/win/WebKit.vcproj/WebKit.sln
index 74feffa..3577f33 100644
--- a/WebKit/win/WebKit.vcproj/WebKit.sln
+++ b/WebKit/win/WebKit.vcproj/WebKit.sln
@@ -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
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index fb56f4a..a267b8d 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,18 @@
+2010-07-14 Brent Fulgham <bfulgham at 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 at apple.com>
Update the sorting in the Xcode project files.
diff --git a/WebKit2/win/WebKit2Apple.vsprops b/WebKit2/win/WebKit2Apple.vsprops
index ee96690..d6a24b2 100644
--- a/WebKit2/win/WebKit2Apple.vsprops
+++ b/WebKit2/win/WebKit2Apple.vsprops
@@ -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>
diff --git a/WebKit2/win/WebKit2CFLite.def b/WebKit2/win/WebKit2CFLite.def
new file mode 100644
index 0000000..848a646
--- /dev/null
+++ b/WebKit2/win/WebKit2CFLite.def
@@ -0,0 +1,127 @@
+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 at WTF@@YAPAXI at Z
+ ?fastZeroedMalloc at WTF@@YAPAXI at Z
+ ?fastFree at WTF@@YAXPAX at Z
+ ?fastCalloc at WTF@@YAPAXII at Z
+ ??0Mutex at WTF@@QAE at XZ
+ ??0ThreadCondition at WTF@@QAE at XZ
+ ??1Mutex at WTF@@QAE at XZ
+ ??1ThreadCondition at WTF@@QAE at XZ
+ ?broadcast at ThreadCondition@WTF@@QAEXXZ
+ ?callOnMainThread at WTF@@YAXP6AXPAX at Z0@Z
+ ?createThread at WTF@@YAIP6APAXPAX at Z0PBD@Z
+ ?currentThread at WTF@@YAIXZ
+ ?detachThread at WTF@@YAXI at Z
+ ?initializeMainThread at WTF@@YAXXZ
+ ?initializeThreading at WTF@@YAXXZ
+ ?isMainThread at WTF@@YA_NXZ
+ ?lock at Mutex@WTF@@QAEXXZ
+ ?lockAtomicallyInitializedStaticMutex at WTF@@YAXXZ
+ ?signal at ThreadCondition@WTF@@QAEXXZ
+ ?timedWait at ThreadCondition@WTF@@QAE_NAAVMutex at 2@N at Z
+ ?tlsKeyCount at WTF@@YAAAJXZ
+ ?tlsKeys at WTF@@YAPAKXZ
+ ?tryLock at Mutex@WTF@@QAE_NXZ
+ ?unlock at Mutex@WTF@@QAEXXZ
+ ?unlockAtomicallyInitializedStaticMutex at WTF@@YAXXZ
+ ?wait at ThreadCondition@WTF@@QAEXAAVMutex at 2@@Z
+ ?waitForThreadCompletion at WTF@@YAHIPAPAX at Z
+ ?createThread at WTF@@YAIP6APAXPAX at Z0@Z
diff --git a/WebKit2/win/WebKit2CFLite.vsprops b/WebKit2/win/WebKit2CFLite.vsprops
index 65b2967..fadb41e 100644
--- a/WebKit2/win/WebKit2CFLite.vsprops
+++ b/WebKit2/win/WebKit2CFLite.vsprops
@@ -7,6 +7,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="CFLite$(LibraryConfigSuffix).lib"
+ ModuleDefinitionFile="WebKit2CFLite.def"
AdditionalLibraryDirectories=""
/>
</VisualStudioPropertySheet>
diff --git a/WebKit2/win/WebKit2Common.vsprops b/WebKit2/win/WebKit2Common.vsprops
index 9a79485..fd6a56d 100644
--- a/WebKit2/win/WebKit2Common.vsprops
+++ b/WebKit2/win/WebKit2Common.vsprops
@@ -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
diff --git a/WebKit2/win/WebKit2WebProcess.vcproj b/WebKit2/win/WebKit2WebProcess.vcproj
index bd298ab..5955627 100755
--- a/WebKit2/win/WebKit2WebProcess.vcproj
+++ b/WebKit2/win/WebKit2WebProcess.vcproj
@@ -279,6 +279,74 @@
CommandLine="if exist "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"
/>
</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
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
if exist "$(WebKitOutputDir)\buildfailed" grep XX$(ProjectName)XX "$(WebKitOutputDir)\buildfailed"
if errorlevel 1 exit 1
echo XX$(ProjectName)XX > "$(WebKitOutputDir)\buildfailed"

bash "$(WebKitLibrariesDir)\tools\scripts\auto-version.sh" "$(IntDir)"
"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(ProjectDir)\..\WebProcess\win""
+ />
+ <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 "$(WebKitOutputDir)\buildfailed" del "$(WebKitOutputDir)\buildfailed"
"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list