Bug 17300 - WebKit should support Cairo and CoreGraphics on Windows
Summary: WebKit should support Cairo and CoreGraphics on Windows
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit Misc. (show other bugs)
Version: 523.x (Safari 3)
Hardware: PC OS X 10.5
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2008-02-10 15:43 PST by Brent Fulgham
Modified: 2008-03-07 13:14 PST (History)
2 users (show)

See Also:


Attachments
Visual Studio Project File (245.00 KB, application/xml)
2008-02-10 15:45 PST, Brent Fulgham
no flags Details
Cairo version of WebKit project (51.85 KB, application/xml)
2008-02-10 15:47 PST, Brent Fulgham
no flags Details
Cairo version of WebCore project (245.02 KB, application/xml)
2008-02-12 16:25 PST, Brent Fulgham
no flags Details
Cairo version of WebKit project (51.91 KB, application/xml)
2008-02-12 16:26 PST, Brent Fulgham
no flags Details
Cairo version of WebCore.vcproj (245.12 KB, application/xml)
2008-02-18 17:50 PST, Brent Fulgham
no flags Details
Cairo version of WebKit.vcproj (52.90 KB, application/xml)
2008-02-18 17:51 PST, Brent Fulgham
no flags Details
Cairo version of WebCore.vcproj (245.57 KB, application/xml)
2008-02-28 12:00 PST, Brent Fulgham
no flags Details
Merged to single Project File (105.50 KB, patch)
2008-03-06 12:21 PST, Brent Fulgham
no flags Details | Formatted Diff | Diff
No longer use vsprops file (108.03 KB, patch)
2008-03-07 11:12 PST, Brent Fulgham
aroben: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Brent Fulgham 2008-02-10 15:43:17 PST
Currently, the WebKit build on Windows only supports the CoreGraphics target.  Users wishing to use WebKit as part of a redistributable product cannot ship these proprietary Apple libraries, and so must build a Cairo-based variant.  Unfortunately, the existing Visual Studio projects and solution files do not support the Cairo build.  At the moment, I have to swap out a set of custom project files, remembering to change back to the 'stock' versions before performing a 'svn update'.

I propose devising a means to support either type of build, preferably from a single set of project files to help keep the two versions in sync.
Comment 1 Brent Fulgham 2008-02-10 15:45:48 PST
Created attachment 19053 [details]
Visual Studio Project File

This file is the WebCore.vcproj required to build a Cairo-based WebCore library.  It repeats large portions of the original WebCore.vcproj; it would be nice if the two could somehow be merged.
Comment 2 Brent Fulgham 2008-02-10 15:47:45 PST
Created attachment 19054 [details]
Cairo version of WebKit project

This is the Cairo-based WebKit project file.  It duplicates large portions of the main WebKit.vcproj file; it would be nice if the two could somehow be combined.
Comment 3 Brent Fulgham 2008-02-12 16:25:29 PST
Created attachment 19096 [details]
Cairo version of WebCore project
Comment 4 Brent Fulgham 2008-02-12 16:26:08 PST
Created attachment 19097 [details]
Cairo version of WebKit project
Comment 5 Brent Fulgham 2008-02-12 16:26:32 PST
Updated for Cairo version with working font/browsing.
Comment 6 Brent Fulgham 2008-02-18 17:50:42 PST
Created attachment 19200 [details]
Cairo version of WebCore.vcproj
Comment 7 Brent Fulgham 2008-02-18 17:51:22 PST
Created attachment 19201 [details]
Cairo version of WebKit.vcproj
Comment 8 Brent Fulgham 2008-02-28 12:00:06 PST
Created attachment 19439 [details]
Cairo version of WebCore.vcproj
Comment 9 Brent Fulgham 2008-03-06 12:21:44 PST
Created attachment 19574 [details]
Merged to single Project File

* Cairo and CG sources part of same project file.
* Added new webcore.vsprops file to store common defines between project targets.
* New "Debug_Cairo" and "Release_Cairo" targets that exclude CG sources.
* "Debug" and "Release" targets exclude Cairo sources.
* WebKit.sln updated to recognize "Debug_Cairo" and "Release_Cairo" targets.
* WebKit.vcproj updated to links the *_Cairo builds against Cario, libjpeg, etc.
Comment 10 Brent Fulgham 2008-03-07 11:12:52 PST
Created attachment 19591 [details]
No longer use vsprops file

Revised per sfalken comments:
* No longer use vsprops file.
Comment 11 Adam Roben (:aroben) 2008-03-07 11:46:02 PST
Comment on attachment 19591 [details]
No longer use vsprops file

r=sfalken
Comment 12 Mark Rowe (bdash) 2008-03-07 13:14:51 PST
Landed in r30876.