Bug 27087 – Add New Configuration Flag for Redistributable Windows Build

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

[Brent Fulgham]

Modify the Visual Studio projects to use a new flag WIN_REDISTRIBUTABLE to signal that the build should use the Cairo/cURL/CFLite support rather than the standard Apple Windows libraries.

This bug makes the following changes:

1.  The WebCore/config.h checks for the WIN_REDISTRIBUTABLE flag, and uses Cairo/cURL/CFLite if present.
2.  The WebKitTools/DumpRenderTree/config.h checks for the WIN_REDISTRIBUTABLE flag.
3.  Modifies the WebCore.vcproj, WebKit.vcproj, and DumpRenderTree.vcproj files to define the flag for the Cairo builds.

[Brent Fulgham]

Created attachment 32465 [details]
Add WIN_REDISTRIBUTABLE flag for builds

[Adam Roben (:aroben)]

Comment on attachment 32465 [details]
Add WIN_REDISTRIBUTABLE flag for builds

> +        * WebCore.vcproj/WebCore.vcproj: Define WIN_REDISTRIBUTABLE for
> +          the Release_Cairo and Debug_Cairo targets.

I think it would be better to make a WebCoreRedistributable.vsprops file and put the definition in there. We want to keep as much stuff out of the .vcproj as possible!

The other code changes look fine. I'm not so sure about the WIN_REDISTRIBUTABLE name, though. It seems a bit too vague (not that the existing "WIN" name is any better!). Maybe we need a more "marketing-ish" name for this port?

[Brent Fulgham]

Created attachment 32664 [details]
Revise to use vsprops instead of project modifications.  Use WIN_CAIRO label instead of WIN_REDISTRIBUTABLE.

[Adam Roben (:aroben)]

Comment on attachment 32664 [details]
Revise to use vsprops instead of project modifications.  Use WIN_CAIRO label instead of WIN_REDISTRIBUTABLE.

> +++ WebCore/WebCore.vcproj/WebCore.vcproj	(working copy)
> @@ -183,8 +183,9 @@
>  		</Configuration>
>  		<Configuration
>  			Name="Debug_Cairo|Win32"
> +			IntermediateDirectory="$(ConfigurationName)"

I don't think you meant to add this.

> +++ WebKit/win/ChangeLog	(working copy)
> @@ -1,3 +1,23 @@
> [phone]  Brent Fulgham  <[e-mail]>
> +
> +        Reviewed by NOBODY (OOPS!).
> +
> +        Add new configuration flag for redistributable Windows build.
> +        https://bugs.webkit.org/show_bug.cgi=27087
> +
> +        * WebKit.vcproj/WebKit.vcproj: Add new WinCairo.vsprops to
> +          Debug_Cairo and Release_Cairo targets.
> +
> [phone]  Brent Fulgham  <[e-mail]>
> +
> +        Reviewed by NOBODY (OOPS!).
> +
> +        Add new configuration flag for redistributable Windows build.
> +        https://bugs.webkit.org/show_bug.cgi=27087
> +
> +        * WebKit.vcproj/WebKit.vcproj: Add new WinCairo.vsprops to the
> +          Release_Cairo and Debug_Cairo targets.

Double double!

r=me

[Brent Fulgham]

Landed in http://trac.webkit.org/changeset/45831.