Bug 46303 – [WinCairo] Update WebKitTestRunner and DumpRenderTree Build

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Misc.

[Brent Fulgham]

This bug updates the build infrastructure for the WebKitTestRunner and DumpRenderTree projects so that the WinCairo port builds properly.  This is a step in preparation for activating the WinCairo build bot.

Changes include:
1. Disable the MD5 sources in DumpRenderTree, and copy the wtf/MD5.h header to an appropriate location for the cairo build.  WinCairo attempts to match the native cairo pixel handling logic, so shares the WTF version of the MD5 routines.
2. Add a CFLite version of InjectedBundleCommon.vsprops for the non-CoreFoundation build used by WinCairo.
3. Update InjectedBundle so with *_Cairo build targets so that the WinCairo port uses CFLite and appropriate DLL naming.

[Brent Fulgham]

Created attachment 68444 [details]
Build fixes for WinCairo.

[Adam Roben (:aroben)]

Comment on attachment 68444 [details]
Build fixes for WinCairo.

View in context: https://bugs.webkit.org/attachment.cgi?id=68444&action=review

You seem to be missing a WebKit/ChangeLog entry.

> WebKitTools/WebKitTestRunner/Configurations/InjectedBundleCFLite.vsprops:24
> +	<Tool
> +		Name="VCCLCompilerTool"
> +		AdditionalIncludeDirectories="&quot;$(ProjectDir)\..&quot;;&quot;$(ProjectDir)\..\InjectedBundle\&quot;;&quot;$(ProjectDir)\..\InjectedBundle\Bindings&quot;;&quot;$(WebKitOutputDir)\Include&quot;;&quot;$(WebKitOutputDir)\Include\private&quot;;&quot;$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitOutputDir)\obj\InjectedBundle\DerivedSources\&quot;"
> +		ForcedIncludeFiles="WebKitTestRunnerPrefix.h"
> +	/>
> +	<Tool
> +		Name="VCLinkerTool"
> +		AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib CFLite$(LibraryConfigSuffix).lib"
> +		OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).dll"
> +	/>
> +	<Tool
> +		Name="VCPostBuildEventTool"
> +		CommandLine="if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;"
> +	/>
> +	<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;"
> +	/>

We should move the Apple-specific stuff out of InjectedBundleCommon so that the non-Apple-specific things don't need to be duplicated here.

[Brent Fulgham]

Created attachment 68466 [details]
Revised per aroben's comments.

* Adds missing ChangeLog entry.
* Refactors vsprops to reduce duplication.

[Martin Robinson]

Comment on attachment 68466 [details]
Revised per aroben's comments.

Looks sane to me after fixing the ChangeLog.

[Brent Fulgham]

I'm adding an additional patch to resolve building of WebKitTestRunner and MiniBrowser.  With these additions, a full build can again be achieved on WinCairo.

[Brent Fulgham]

Created attachment 68480 [details]
Part 2 of change: Correct build for WebKitTestRunner and MiniBrowser

[Brent Fulgham]

Part 1 landed in http://trac.webkit.org/changeset/68098.

[Brent Fulgham]

Note: I purposely left the post-build settings in both the *CoreFoundation and *CFLite property sheets (and projects), even though they are currently the same.  A future update will modify the CFLite version of these routines to copy the CFLite-specific DLL's into the appropriate bin directory so tests can be run.

[Martin Robinson]

Comment on attachment 68480 [details]
Part 2 of change: Correct build for WebKitTestRunner and MiniBrowser

This looks sane to me, though there is a lot of duplicated copying logic. bfulgham has assured me that he's making a followup patch which reduces this though.

[Brent Fulgham]

Landed part 2 in http://trac.webkit.org/changeset/68107.