diff options
Diffstat (limited to 'WebKitLibraries')
-rw-r--r-- | WebKitLibraries/ChangeLog | 212 | ||||
-rw-r--r-- | WebKitLibraries/WebKitSystemInterface.h | 51 | ||||
-rw-r--r-- | WebKitLibraries/libWebKitSystemInterfaceLeopard.a | bin | 1624528 -> 1661560 bytes | |||
-rw-r--r-- | WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a | bin | 1360684 -> 1404468 bytes | |||
-rw-r--r-- | WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h | 15 | ||||
-rw-r--r-- | WebKitLibraries/win/lib/WebKitSystemInterface.lib | bin | 469556 -> 556678 bytes | |||
-rw-r--r-- | WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib | bin | 482276 -> 567246 bytes | |||
-rw-r--r-- | WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR | 2 | ||||
-rw-r--r-- | WebKitLibraries/win/tools/vsprops/WinCairo.vsprops | 34 | ||||
-rw-r--r-- | WebKitLibraries/win/tools/vsprops/cURL.vsprops | 26 | ||||
-rw-r--r-- | WebKitLibraries/win/tools/vsprops/common.vsprops | 30 | ||||
-rw-r--r-- | WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops | 68 | ||||
-rw-r--r-- | WebKitLibraries/win/tools/vsprops/release.vsprops | 4 |
13 files changed, 361 insertions, 81 deletions
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index 5280178..ca243f4 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,215 @@ +2011-01-17 Adam Roben <aroben@apple.com> + + Make it possible to both set and clear a wkCACFContext's D3D device + + Fixes <http://webkit.org/b/52587> WKCACFLayerRenderer is hard to use + + Reviewed by Chris Marrin. + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + +2011-01-07 Chris Marrin <cmarrin@apple.com> + + Unreviewed. + + Minor change to check for null context + + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: + +2011-01-07 Chris Marrin <cmarrin@apple.com> + + Unreviewed. + + Added one more API to WKSI to get the user data + out of the CACFContext. + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: + +2011-01-07 Chris Marrin <cmarrin@apple.com> + + Unreviewed. + + Adding updated WKSI files missed in http://trac.webkit.org/changeset/75262 + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: + +2011-01-05 Steve Falkenburg <sfalken@apple.com> + + Reviewed by Darin Adler. + + Debug and Release builds on Windows clobber each other + https://bugs.webkit.org/show_bug.cgi?id=49185 + + Changes the structure of WebKitBuild build products directory so we + completely separate each build configuration into independent directories. + + Although we previously had per-configuration directories for obj, this change adds + per-configuration directories for bin, lib, obj, and include. Each configuration's + build products are stored within a directory inside of WebKitBuild. + + Most use of $(WebKitOutputDir) in the build files has been replaced by $(ConfigurationBuildDir), + defined in common.vsprops to be $(WebKitOutputDir)\$(ConfigurationName). + + * win/tools/vsprops/common.vsprops: + +2011-01-03 Chris Fleizach <cfleizach@apple.com> + + Reviewed, tweaked and landed by Sam Weinig. + + WebKit2: Accessibility support (42130) + <rdar://problem/7660629> + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + +2011-01-02 Dan Bernstein <mitz@apple.com> + + Rubber-stamped by Simon Fraser. + + <rdar://problem/8812159> Update copyright strings + + * win/tools/scripts/COPYRIGHT-END-YEAR: + +2010-12-21 Sam Weinig <weinig@apple.com> + + Reviewed by Anders Carlsson. + + Add serialization for CFURLRequestRef and CFURLResponseRef. + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + +2010-12-14 Anders Carlsson <andersca@apple.com> + + Reviewed by Dan Bernstein. + + Add WKGetScriptCodeFromCurrentKeyboardInputSource function. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + +2010-12-10 Chris Marrin <cmarrin@apple.com> + + Reviewed by Adam Roben. + + Add CACFContextGetLastCommitTime to WebKitSystemInterface for Windows. + Also got rid of WebKitSystemInterface_debug.lib as recommended by + Adam Roben. No OpenSource builds use it since r72327. + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: + * win/lib/WebKitSystemInterface_debug.lib: Removed. + +2010-12-09 Anders Carlsson <andersca@apple.com> + + Reviewed by Sam Weinig. + + Cannot use NSKeyedArchiver in WK2 for ResourceResponses + https://bugs.webkit.org/show_bug.cgi?id=50792 + <rdar://problem/8741799> + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + +2010-12-03 Anders Carlsson <andersca@apple.com> + + Reviewed by Sam Weinig. + + Dispatch keyboard events in the Carbon event model + https://bugs.webkit.org/show_bug.cgi?id=50503 + + Make WKGetNSEventKeyChar available in 32-bit. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + +2010-12-02 Anders Carlsson <andersca@apple.com> + + Reviewed by Sam Weinig. + + Plug-ins should be able to update the mouse cursor + https://bugs.webkit.org/show_bug.cgi?id=50399 + + Add WKEnableSettingCursorWhenInBackground. + + * WebKitSystemInterface.h: + * libWebKitSystemInterfaceLeopard.a: + * libWebKitSystemInterfaceSnowLeopard.a: + +2010-12-01 Adam Roben <aroben@apple.com> + + Don't let harmless errorlevels from the "set" utility leak into + project-specific build scripts + + When using set to unset an environment variable that didn't previously + exist, set raises the errorlevel to 1. This was leaking into + project-specific scripts, causing them to think the build has failed. + We now clear the errorlevel after we finish setting environment + variables. + + Fixes <http://webkit.org/b/50350> Windows builds mysteriously fail in + some configurations + + Reviewed by Steve Falkenburg. + + * win/tools/vsprops/common.vsprops: Call "cmd /c" after setting + environment variables to get rid of any errorlevel that "set" set. + +2010-12-01 Steve Falkenburg <sfalken@apple.com> + + Reviewed by Adam Roben. + + vcproj changes can't be applied cleanly by the Windows EWS bot + https://bugs.webkit.org/show_bug.cgi?id=50328 + + * win/tools/vsprops/WinCairo.vsprops: Added property svn:eol-style. + * win/tools/vsprops/cURL.vsprops: Added property svn:eol-style. + * win/tools/vsprops/debug_wincairo.vsprops: Added property svn:eol-style. + +2010-11-29 Steve Falkenburg <sfalken@apple.com> + + Windows build fix (part 2). + Define Visual Studio internal variables used in pre-build/pre-link/post-build commands in environment for separated cmd files. + + * win/tools/vsprops/common.vsprops: + +2010-11-19 Steve Falkenburg <sfalken@apple.com> + + Reviewed by Adam Roben. + + Add a mechanism for Windows pre-build/pre-link/post-build events to be separated into individual cmd files + https://bugs.webkit.org/show_bug.cgi?id=49858 + + We're migrating our prebuild/prelink/postbuild steps out of vcproj and vsprops files: + - To simplify editing (editing vsprops build steps is confusing). + - For more readable diffs. + + To add a prebuild/prelink/postbuild step for a vcproj, + Add a new file named {ProjectName}PreBuild|PreLink|PostBuild.cmd to the project directory. + For example, a WTF prebuild script would be named WTFPreBuild.cmd and would be located + in the directory JavaScriptCore/JavaScriptCore.vcproj/WTF (alongside WTF.vcproj). + + * win/tools/vsprops/common.vsprops: + * win/tools/vsprops/release.vsprops: + +2010-11-29 Anders Carlsson <andersca@apple.com> + + Reviewed by Sam Weinig and Simon Fraser. + + WebKitSystemInterface.h piece of r72438. + + * WebKitSystemInterface.h: + 2010-11-22 Adam Roben <aroben@apple.com> Use paths relative to $WebKitVSPropsRedirectionDir to access shared .vsprops files diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index 7ec07fb..edbfd4e 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -81,6 +81,16 @@ void WKAccessibilityHandleFocusChanged(void); AXUIElementRef WKCreateAXUIElementRef(id element); void WKUnregisterUniqueIdForElement(id element); + +#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) +// Remote Accessibility API. +void WKAXRegisterRemoteApp(void); +void WKAXInitializeElementWithPresenterPid(id, pid_t); +CFDataRef WKAXRemoteTokenForElement(id); +id WKAXRemoteElementForToken(CFDataRef); +void WKAXInitializeRemoteElementWithWindow(id remoteElement, id window); +#endif + void WKSetUpFontCache(void); void WKSignalCFReadStreamEnd(CFReadStreamRef stream); @@ -143,7 +153,7 @@ CGAffineTransform WKGetUserToBaseCTM(CGContextRef); void WKGetGlyphsForCharacters(CGFontRef, const UniChar[], CGGlyph[], size_t); #else typedef void *WKGlyphVectorRef; -OSStatus WKConvertCharToGlyphs(void *styleGroup, const UniChar *characters, unsigned numCharacters, WKGlyphVectorRef glyphs); +OSStatus WKConvertCharToGlyphs(void *styleGroup, const UniChar* characters, unsigned numCharacters, WKGlyphVectorRef glyphs); OSStatus WKGetATSStyleGroup(ATSUStyle fontStyle, void **styleGroup); void WKReleaseStyleGroup(void *group); OSStatus WKInitializeGlyphVector(int count, WKGlyphVectorRef glyphs); @@ -157,6 +167,9 @@ size_t WKGetGlyphVectorRecordSize(WKGlyphVectorRef glyphVector); CTLineRef WKCreateCTLineWithUniCharProvider(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*); #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) CTTypesetterRef WKCreateCTTypesetterWithUniCharProviderAndOptions(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*, CFDictionaryRef options); + +CGContextRef WKIOSurfaceContextCreate(IOSurfaceRef, unsigned width, unsigned height, CGColorSpaceRef); +CGImageRef WKIOSurfaceContextCreateImage(CGContextRef context); #endif #ifndef __LP64__ @@ -303,13 +316,11 @@ void WKWindowBounceAnimationSetAnimationProgress(WKWindowBounceAnimationContextR #if defined(__x86_64__) #import <mach/mig.h> - CFRunLoopSourceRef WKCreateMIGServerSource(mig_subsystem_t subsystem, mach_port_t serverPort); +#endif // defined(__x86_64__) NSUInteger WKGetInputPanelWindowStyle(void); - UInt8 WKGetNSEventKeyChar(NSEvent *); -#endif // defined(__x86_64__) #endif // !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) @class CAPropertyAnimation; @@ -330,12 +341,44 @@ void WKWindowSetScaledFrame(NSWindow *window, NSRect scaleFrame, NSRect nonScale #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) void WKSyncSurfaceToView(NSView *view); + +void WKEnableSettingCursorWhenInBackground(void); + +CFDictionaryRef WKNSURLRequestCreateSerializableRepresentation(NSURLRequest *request, CFTypeRef tokenNull); +NSURLRequest *WKNSURLRequestFromSerializableRepresentation(CFDictionaryRef representation, CFTypeRef tokenNull); + +CFDictionaryRef WKNSURLResponseCreateSerializableRepresentation(NSURLResponse *response, CFTypeRef tokenNull); +NSURLResponse *WKNSURLResponseFromSerializableRepresentation(CFDictionaryRef representation, CFTypeRef tokenNull); + +#ifndef __LP64__ +ScriptCode WKGetScriptCodeFromCurrentKeyboardInputSource(void); +#endif + #endif #if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD) CFIndex WKGetHyphenationLocationBeforeIndex(CFStringRef string, CFIndex index); #endif +#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) +typedef enum { + WKSandboxExtensionTypeReadOnly, + WKSandboxExtensionTypeWriteOnly, + WKSandboxExtensionTypeReadWrite, +} WKSandboxExtensionType; +typedef struct __WKSandboxExtension *WKSandboxExtensionRef; + +WKSandboxExtensionRef WKSandboxExtensionCreate(const char* path, WKSandboxExtensionType type); +void WKSandboxExtensionDestroy(WKSandboxExtensionRef sandboxExtension); + +bool WKSandboxExtensionConsume(WKSandboxExtensionRef sandboxExtension); +bool WKSandboxExtensionInvalidate(WKSandboxExtensionRef sandboxExtension); + +const char* WKSandboxExtensionGetSerializedFormat(WKSandboxExtensionRef sandboxExtension, size_t* length); +WKSandboxExtensionRef WKSandboxExtensionCreateFromSerializedFormat(const char* serializationFormat, size_t length); + +#endif + #ifdef __cplusplus } #endif diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a Binary files differindex 678342a..c562459 100644 --- a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a +++ b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a Binary files differindex 1f82d39..e0b7445 100644 --- a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a +++ b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h index 52aac61..744f80b 100644 --- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h +++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h @@ -144,7 +144,15 @@ void wkCACFContextDestroy(WKCACFContext*); void wkCACFContextSetLayer(WKCACFContext*, CACFLayerRef); void wkCACFContextFlush(WKCACFContext*); -void wkCACFContextInitializeD3DDevice(WKCACFContext*, IDirect3DDevice9*); +CFTimeInterval wkCACFContextGetLastCommitTime(WKCACFContext*); +CFTimeInterval wkCACFContextGetNextUpdateTime(WKCACFContext*); + +void* wkCACFContextGetUserData(WKCACFContext*); +void wkCACFContextSetUserData(WKCACFContext*, void*); + +void* wkCACFLayerGetContextUserData(CACFLayerRef); + +void wkCACFContextSetD3DDevice(WKCACFContext*, IDirect3DDevice9*); void wkCACFContextReleaseD3DResources(WKCACFContext*); bool wkCACFContextBeginUpdate(WKCACFContext*, void* buffer, size_t bufferSize, CFTimeInterval time, const CGRect& bounds, const CGRect dirtyRects[], size_t dirtyRectCount); @@ -156,6 +164,11 @@ WKCACFUpdateRectEnumerator* wkCACFContextCopyUpdateRectEnumerator(WKCACFContext* const CGRect* wkCACFUpdateRectEnumeratorNextRect(WKCACFUpdateRectEnumerator*); void wkCACFUpdateRectEnumeratorRelease(WKCACFUpdateRectEnumerator*); +CFDictionaryRef wkCFURLRequestCreateSerializableRepresentation(CFURLRequestRef cfRequest, CFTypeRef tokenNull); +CFURLRequestRef wkCFURLRequestCreateFromSerializableRepresentation(CFDictionaryRef representation, CFTypeRef tokenNull); +CFDictionaryRef wkCFURLResponseCreateSerializableRepresentation(CFURLResponseRef cfResponse, CFTypeRef tokenNull); +CFURLResponseRef wkCFURLResponseCreateFromSerializableRepresentation(CFDictionaryRef representation, CFTypeRef tokenNull); + typedef enum { WKMediaUIPartFullscreenButton = 0, WKMediaUIPartMuteButton, diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib Binary files differindex 686a355..f1af3b0 100644 --- a/WebKitLibraries/win/lib/WebKitSystemInterface.lib +++ b/WebKitLibraries/win/lib/WebKitSystemInterface.lib diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib Binary files differindex f0257a0..f21c19a 100644 --- a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib +++ b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib diff --git a/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR b/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR index 48ad625..cb4176b 100644 --- a/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR +++ b/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR @@ -1 +1 @@ -2010 +2011 diff --git a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops index 9710568..704cd7a 100644 --- a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops +++ b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops @@ -1,17 +1,17 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="WinCairo"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(WebKitLibrariesDir)\include\cairo";"$(SolutionDir)\..\..\..\JavaScriptCore\os-win32""
- PreprocessorDefinitions="WIN_CAIRO=1"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="cairo.lib libjpeg.lib zlib.lib libpng.lib"
- AdditionalLibraryDirectories=""$(WebKitLibrariesDir)\lib""
- />
-</VisualStudioPropertySheet>
+<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="WinCairo" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(WebKitLibrariesDir)\include\cairo";"$(SolutionDir)\..\..\..\JavaScriptCore\os-win32"" + PreprocessorDefinitions="WIN_CAIRO=1" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="cairo.lib libjpeg.lib zlib.lib libpng.lib" + AdditionalLibraryDirectories=""$(WebKitLibrariesDir)\lib"" + /> +</VisualStudioPropertySheet> diff --git a/WebKitLibraries/win/tools/vsprops/cURL.vsprops b/WebKitLibraries/win/tools/vsprops/cURL.vsprops index 3f06aa6..db7680a 100644 --- a/WebKitLibraries/win/tools/vsprops/cURL.vsprops +++ b/WebKitLibraries/win/tools/vsprops/cURL.vsprops @@ -1,13 +1,13 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="cURL"
- >
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib wininet.lib Wldap32.lib libeay32.lib ssleay32.lib libcurl_imp.lib"
- IgnoreAllDefaultLibraries="false"
- IgnoreDefaultLibraryNames=""
- />
-</VisualStudioPropertySheet>
+<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="cURL" + > + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib wininet.lib Wldap32.lib libeay32.lib ssleay32.lib libcurl_imp.lib" + IgnoreAllDefaultLibraries="false" + IgnoreDefaultLibraryNames="" + /> +</VisualStudioPropertySheet> diff --git a/WebKitLibraries/win/tools/vsprops/common.vsprops b/WebKitLibraries/win/tools/vsprops/common.vsprops index b9c710c..46e73b6 100644 --- a/WebKitLibraries/win/tools/vsprops/common.vsprops +++ b/WebKitLibraries/win/tools/vsprops/common.vsprops @@ -3,8 +3,8 @@ ProjectType="Visual C++" Version="8.00" Name="common" - OutputDirectory="$(WebKitOutputDir)\bin" - IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)" + OutputDirectory="$(ConfigurationBuildDir)\bin" + IntermediateDirectory="$(ConfigurationBuildDir)\obj\$(ProjectName)" > <Tool Name="VCCLCompilerTool" @@ -25,12 +25,12 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="false" - AdditionalOptions="/SAFESEH /FIXED:NO /dynamicbase /ignore:4221" + AdditionalOptions="/SAFESEH /FIXED:NO /dynamicbase /ignore:4221" OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe" - AdditionalLibraryDirectories=""$(WebKitOutputDir)\lib";"$(WebKitLibrariesDir)\lib"" + AdditionalLibraryDirectories=""$(ConfigurationBuildDir)\lib";"$(WebKitLibrariesDir)\lib"" GenerateDebugInformation="true" SubSystem="2" - ImportLibrary="$(WebKitOutputDir)\lib\$(TargetName).lib" + ImportLibrary="$(ConfigurationBuildDir)\lib\$(TargetName).lib" TargetMachine="1" /> <Tool @@ -40,15 +40,31 @@ HeaderFileName="$(OutDir)\$(InputName).h" /> <Tool + Name="VCPostBuildEventTool" + CommandLine="REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PostBuild.cmd file
if not exist "$(ProjectDir)$(ProjectName)PostBuild.cmd" exit /b

set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
set CONFIGURATIONNAME=$(ConfigurationName)
set INPUTDIR=$(InputDir)
set INPUTFILENAME=$(InputFileName)
set INPUTPATH=$(InputPath)
set INTDIR=$(IntDir)
set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)
set OUTDIR=$(OutDir)
set PLATFORMNAME=$(PlatformName)
set PROJECTDIR=$(ProjectDir)
set PROJECTFILENAME=$(ProjectFileName)
set PROJECTNAME=$(ProjectName)
set PROJECTPATH=$(ProjectPath)
set SOLUTIONDIR=$(SolutionDir)
set SOLUTIONFILENAME=$(SolutionFileName)
set SOLUTIONNAME=$(SolutionName)
set SOLUTIONPATH=$(SolutionPath)
set TARGETDIR=$(TargetDir)
set TARGETEXT=$(TargetExt)
set TARGETFILENAME=$(TargetFileName)
set TARGETPATH=$(TargetPath)
set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)
set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)

REM If any of the above variables didn't exist previously and
REM were set to an empty string, set will set the errorlevel to 1,
REM which will cause the project-specific script to think the build
REM has failed. This cmd /c call will clear the errorlevel.
cmd /c

"$(ProjectDir)$(ProjectName)PostBuild.cmd"
" + /> + <Tool + Name="VCPreBuildEventTool" + CommandLine="REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PreBuild.cmd file.
if not exist "$(ProjectDir)$(ProjectName)PreBuild.cmd" exit /b

set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
set CONFIGURATIONNAME=$(ConfigurationName)
set INPUTDIR=$(InputDir)
set INPUTFILENAME=$(InputFileName)
set INPUTPATH=$(InputPath)
set INTDIR=$(IntDir)
set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)
set OUTDIR=$(OutDir)
set PLATFORMNAME=$(PlatformName)
set PROJECTDIR=$(ProjectDir)
set PROJECTFILENAME=$(ProjectFileName)
set PROJECTNAME=$(ProjectName)
set PROJECTPATH=$(ProjectPath)
set SOLUTIONDIR=$(SolutionDir)
set SOLUTIONFILENAME=$(SolutionFileName)
set SOLUTIONNAME=$(SolutionName)
set SOLUTIONPATH=$(SolutionPath)
set TARGETDIR=$(TargetDir)
set TARGETEXT=$(TargetExt)
set TARGETFILENAME=$(TargetFileName)
set TARGETPATH=$(TargetPath)
set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)
set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)

REM If any of the above variables didn't exist previously and
REM were set to an empty string, set will set the errorlevel to 1,
REM which will cause the project-specific script to think the build
REM has failed. This cmd /c call will clear the errorlevel.
cmd /c

"$(ProjectDir)$(ProjectName)PreBuild.cmd"
" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PreLink.cmd file.
if not exist "$(ProjectDir)$(ProjectName)PreLink.cmd" exit /b

set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
set CONFIGURATIONNAME=$(ConfigurationName)
set INPUTDIR=$(InputDir)
set INPUTFILENAME=$(InputFileName)
set INPUTPATH=$(InputPath)
set INTDIR=$(IntDir)
set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)
set OUTDIR=$(OutDir)
set PLATFORMNAME=$(PlatformName)
set PROJECTDIR=$(ProjectDir)
set PROJECTFILENAME=$(ProjectFileName)
set PROJECTNAME=$(ProjectName)
set PROJECTPATH=$(ProjectPath)
set SOLUTIONDIR=$(SolutionDir)
set SOLUTIONFILENAME=$(SolutionFileName)
set SOLUTIONNAME=$(SolutionName)
set SOLUTIONPATH=$(SolutionPath)
set TARGETDIR=$(TargetDir)
set TARGETEXT=$(TargetExt)
set TARGETFILENAME=$(TargetFileName)
set TARGETPATH=$(TargetPath)
set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)
set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)

REM If any of the above variables didn't exist previously and
REM were set to an empty string, set will set the errorlevel to 1,
REM which will cause the project-specific script to think the build
REM has failed. This cmd /c call will clear the errorlevel.
cmd /c

"$(ProjectDir)$(ProjectName)PreLink.cmd"
" + /> + <Tool Name="VCResourceCompilerTool" Culture="1033" AdditionalIncludeDirectories=""$(IntDir)\include"" /> - <UserMacro + <UserMacro Name="ProductionBuild" Value="$(PRODUCTION)" /> - <UserMacro + <UserMacro + Name="ConfigurationBuildDir" + Value="$(WebKitOutputDir)\$(ConfigurationName)" + /> + <UserMacro Name="AnalyzeWithLargeStack" Value="" /> diff --git a/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops b/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops index 7d424e6..c9f5722 100644 --- a/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops +++ b/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops @@ -1,34 +1,34 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="debug_wincairo"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="2"
- AdditionalIncludeDirectories=""$(WebKitLibrariesDir)\include\cairo""
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- AdditionalLibraryDirectories=""$(WebKitLibrariesDir)\lib""
- />
- <UserMacro
- Name="WebKitConfigSuffix"
- Value="_debug"
- PerformEnvironmentSet="true"
- />
- <UserMacro
- Name="LibraryConfigSuffix"
- Value=""
- PerformEnvironmentSet="true"
- />
- <UserMacro
- Name="WebKitDLLConfigSuffix"
- Value="_debug"
- />
-</VisualStudioPropertySheet>
+<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="debug_wincairo" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="2" + AdditionalIncludeDirectories=""$(WebKitLibrariesDir)\include\cairo"" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + AdditionalLibraryDirectories=""$(WebKitLibrariesDir)\lib"" + /> + <UserMacro + Name="WebKitConfigSuffix" + Value="_debug" + PerformEnvironmentSet="true" + /> + <UserMacro + Name="LibraryConfigSuffix" + Value="" + PerformEnvironmentSet="true" + /> + <UserMacro + Name="WebKitDLLConfigSuffix" + Value="_debug" + /> +</VisualStudioPropertySheet> diff --git a/WebKitLibraries/win/tools/vsprops/release.vsprops b/WebKitLibraries/win/tools/vsprops/release.vsprops index 8b38b73..6416e3f 100644 --- a/WebKitLibraries/win/tools/vsprops/release.vsprops +++ b/WebKitLibraries/win/tools/vsprops/release.vsprops @@ -18,10 +18,6 @@ OptimizeForWindows98="1" /> <Tool - Name="VCPreLinkEventTool" - CommandLine="if not exist "$(WebKitOutputDir)\public\sym" mkdir "$(WebKitOutputDir)\public\sym"" - /> - <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" /> |