Bug 68178 - [GTK] Disable WebKit2 by default in configure.ac, but enable it with build-webkit
Summary: [GTK] Disable WebKit2 by default in configure.ac, but enable it with build-we...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKitGTK (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Martin Robinson
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-09-15 12:03 PDT by Martin Robinson
Modified: 2011-09-16 04:51 PDT (History)
3 users (show)

See Also:


Attachments
Patch (4.69 KB, patch)
2011-09-15 12:18 PDT, Martin Robinson
xan.lopez: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Martin Robinson 2011-09-15 12:03:28 PDT
We do not want to ship WebKit2 yet, so we should disable it in configure.ac. We want the bots to test the build though, so we should enable it during calls to build-webkit.
Comment 1 Martin Robinson 2011-09-15 12:18:17 PDT
Created attachment 107527 [details]
Patch
Comment 2 Carlos Garcia Campos 2011-09-15 12:30:38 PDT
Comment on attachment 107527 [details]
Patch

Looks good to me
Comment 3 Xan Lopez 2011-09-15 15:02:29 PDT
Comment on attachment 107527 [details]
Patch

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

> Source/WebKit2/GNUmakefile.am:916
> +pkgconfig_DATA += Source/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc

Shouldn't this have $(top_builddir)? Otherwise might be ambiguous?
Comment 4 Carlos Garcia Campos 2011-09-15 23:22:28 PDT
(In reply to comment #3)
> (From update of attachment 107527 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=107527&action=review
> 
> > Source/WebKit2/GNUmakefile.am:916
> > +pkgconfig_DATA += Source/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc
> 
> Shouldn't this have $(top_builddir)? Otherwise might be ambiguous?

We have the same for the other .pc files, so if this is wrong we should fix all of them:

pkgconfig_DATA += Source/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc
pkgconfig_DATA += Source/JavaScriptCore/javascriptcoregtk-@WEBKITGTK_API_VERSION@.pc
Comment 5 Carlos Garcia Campos 2011-09-16 04:42:27 PDT
Committed r95283: <http://trac.webkit.org/changeset/95283>
Comment 6 Xan Lopez 2011-09-16 04:48:18 PDT
(In reply to comment #4)
> We have the same for the other .pc files, so if this is wrong we should fix all of them:
> 
> pkgconfig_DATA += Source/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc
> pkgconfig_DATA += Source/JavaScriptCore/javascriptcoregtk-@WEBKITGTK_API_VERSION@.pc

Well, ok, but that does not really answer anything. I'd have expected someone to say whether it's wrong or not before committing...
Comment 7 Carlos Garcia Campos 2011-09-16 04:51:01 PDT
(In reply to comment #6)
> (In reply to comment #4)
> > We have the same for the other .pc files, so if this is wrong we should fix all of them:
> > 
> > pkgconfig_DATA += Source/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc
> > pkgconfig_DATA += Source/JavaScriptCore/javascriptcoregtk-@WEBKITGTK_API_VERSION@.pc
> 
> Well, ok, but that does not really answer anything. I'd have expected someone to say whether it's wrong or not before committing...

we are trying to release, and webkit2 breaks distcheck.