Closed Bug 751431 Opened 13 years ago Closed 13 years ago

[Skia] Rip out Skia from libxul

Categories

(Firefox Build System :: General, defect)

x86_64
Windows 7
defect
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED
mozilla15

People

(Reporter: nrc, Assigned: nrc)

References

Details

Attachments

(1 file, 4 obsolete files)

No description provided.
Blocks: 687187
Attached patch patch 1: configure/make changes (obsolete) (deleted) — Splinter Review
Attached patch patch 2: Skia API changes (obsolete) (deleted) — Splinter Review
What are SKIA_DLL and SKIA_IMPLEMENTATION?
(In reply to Ehsan Akhgari [:ehsan] from comment #3) > What are SKIA_DLL and SKIA_IMPLEMENTATION? SKIA_DLL indicates that Skia is being built as a dll and SKIA_IMPLEMENTATION indicates that we are building Skia itself, and not a program which uses Skia (obviously we are doing both). The effect of setting SKIA_DLL and SKIA_IMPLEMENTATION is that SK_API is set to __declspec(dllexport), so the Skia classes are exported by the DLL.
These patches will change quite a lot when Bas lands his patch to rip out Azure.
Depends on: 751463
Try run for 59b97b2bb57d is complete. Detailed breakdown of the results available here: https://tbpl.mozilla.org/?tree=Try&rev=59b97b2bb57d Results (out of 296 total builds): exception: 1 success: 259 warnings: 29 failure: 2 other: 5 Builds (or logs if builds failed) available at: http://ftp.mozilla.org/pub/mozilla.org/firefox/try-builds/ncameron@mozilla.com-59b97b2bb57d Timed out after 12 hours without completing.
Try run for 59b97b2bb57d is complete. Detailed breakdown of the results available here: https://tbpl.mozilla.org/?tree=Try&rev=59b97b2bb57d Results (out of 296 total builds): exception: 1 success: 260 warnings: 29 failure: 2 other: 4 Builds (or logs if builds failed) available at: http://ftp.mozilla.org/pub/mozilla.org/firefox/try-builds/ncameron@mozilla.com-59b97b2bb57d Timed out after 12 hours without completing.
Try run for 59b97b2bb57d is complete. Detailed breakdown of the results available here: https://tbpl.mozilla.org/?tree=Try&rev=59b97b2bb57d Results (out of 296 total builds): exception: 1 success: 263 warnings: 30 failure: 2 Builds (or logs if builds failed) available at: http://ftp.mozilla.org/pub/mozilla.org/firefox/try-builds/ncameron@mozilla.com-59b97b2bb57d Timed out after 12 hours without completing.
Attached patch patch (obsolete) (deleted) — Splinter Review
New version, sits on top of Bas's patch in bug 751463. I'm nowhere near convinced this is the best solution, or execution of it, but it might just work. Hopefully, bug 738014 will be a long term solution.
Attachment #620571 - Attachment is obsolete: true
Attachment #620572 - Attachment is obsolete: true
Attachment #620948 - Flags: review?(bas.schouten)
Bas: I'll get khuey to review this once you like it (and it works, waiting on a tryserver push now).
The patch doesn't work as advertised and I seem to have hit the limit of my configure/make knowledge with this one. I am doing this in configure.in: MOZ_ENABLE_FREETYPE=1 AC_DEFINE(MOZ_ENABLE_FREETYPE) AC_SUBST(MOZ_ENABLE_FREETYPE) And in gfx/2d/Makefile.in I have: ifdef MOZ_ENABLE_FREETYPE CPPSRCS += \ ScaledFontFreetype.cpp \ $(NULL) endif But ScaledFontFreetype.cpp does not get compiled. If I remove the ifdef, then it compiles fine. I can't find anything to do in configure.in that sets MOZ_ENABLE_FREETYPE. What am I missing?
Attachment #620948 - Flags: review?(bas.schouten)
I think you need to add to config/autoconf.mk.in
Attached patch patch (obsolete) (deleted) — Splinter Review
Attachment #620948 - Attachment is obsolete: true
Attachment #621477 - Flags: review?(bas.schouten)
If possible please deal with the freetype stuff in a separate patch/bug first if possible, and then proceed with the move out of libxul.
Depends on: 752380
Attached patch patch - without Freetype stuff (deleted) — Splinter Review
Attachment #621477 - Attachment is obsolete: true
Attachment #621477 - Flags: review?(bas.schouten)
Attachment #621481 - Flags: review?(khuey)
Status: NEW → RESOLVED
Closed: 13 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla15
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: