Bug 68178

Summary: [GTK] Disable WebKit2 by default in configure.ac, but enable it with build-webkit
Product: WebKit Reporter: Martin Robinson <mrobinson>
Component: WebKitGTKAssignee: Martin Robinson <mrobinson>
Status: RESOLVED FIXED    
Severity: Normal CC: alex, cgarcia, xan.lopez
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: Unspecified   
OS: Unspecified   
Attachments:
Description Flags
Patch xan.lopez: review+

Martin Robinson
Reported 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.
Attachments
Patch (4.69 KB, patch)
2011-09-15 12:18 PDT, Martin Robinson 		xan.lopez: review+
DetailsFormatted DiffDiff
View All Add attachment proposed patch, testcase, etc.
Martin Robinson
Comment 1 2011-09-15 12:18:17 PDT
Created attachment 107527 [details] Patch
Carlos Garcia Campos
Comment 2 2011-09-15 12:30:38 PDT
Comment on attachment 107527 [details] Patch Looks good to me
Xan Lopez
Comment 3 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?
Carlos Garcia Campos
Comment 4 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
Carlos Garcia Campos
Comment 5 2011-09-16 04:42:27 PDT
Committed r95283: <http://trac.webkit.org/changeset/95283>
Xan Lopez
Comment 6 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...
Carlos Garcia Campos
Comment 7 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.
Note You need to log in before you can comment on or make changes to this bug.