Title: [161322] trunk
- Revision
- 161322
- Author
- [email protected]
- Date
- 2014-01-05 02:34:04 -0800 (Sun, 05 Jan 2014)
Log Message
[GTK] Stop installing WebKit2 C API headers
https://bugs.webkit.org/show_bug.cgi?id=126489
Reviewed by Martin Robinson.
.:
* GNUmakefile.am:
Source/WebKit2:
We are not actually maintaining the API/ABI compatibility of the
WebKit2 C API, it's only used internally by the public GTK+ API
and nobody is using it.
* GNUmakefile.am:
* GNUmakefile.list.am:
Modified Paths
Diff
Modified: trunk/ChangeLog (161321 => 161322)
--- trunk/ChangeLog 2014-01-05 09:46:00 UTC (rev 161321)
+++ trunk/ChangeLog 2014-01-05 10:34:04 UTC (rev 161322)
@@ -1,3 +1,12 @@
+2014-01-05 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Stop installing WebKit2 C API headers
+ https://bugs.webkit.org/show_bug.cgi?id=126489
+
+ Reviewed by Martin Robinson.
+
+ * GNUmakefile.am:
+
2014-01-04 Martin Robinson <[email protected]>
[GTK] [CMake] Improve the way we locate gobject-introspection
Modified: trunk/GNUmakefile.am (161321 => 161322)
--- trunk/GNUmakefile.am 2014-01-05 09:46:00 UTC (rev 161321)
+++ trunk/GNUmakefile.am 2014-01-05 10:34:04 UTC (rev 161322)
@@ -102,13 +102,13 @@
webkitgtk_gdom_built_sources :=
webkitgtk_built_sources :=
webkitgtk_built_nosources :=
-webkit2_h_api :=
webkit2_sources :=
webkit2_built_sources :=
webkit2platform_sources :=
+webkit2gtk_ui_h_api :=
+webkit2gtk_web_extension_h_api :=
webkit2gtk_h_api :=
webkit2gtk_built_sources :=
-webkit2_web_extension_h_api :=
webkit2_plugin_process_sources :=
webkit2_plugin_process_built_sources :=
webkittestrunner_built_sources :=
Modified: trunk/Source/WebKit2/ChangeLog (161321 => 161322)
--- trunk/Source/WebKit2/ChangeLog 2014-01-05 09:46:00 UTC (rev 161321)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-05 10:34:04 UTC (rev 161322)
@@ -1,3 +1,17 @@
+2014-01-05 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Stop installing WebKit2 C API headers
+ https://bugs.webkit.org/show_bug.cgi?id=126489
+
+ Reviewed by Martin Robinson.
+
+ We are not actually maintaining the API/ABI compatibility of the
+ WebKit2 C API, it's only used internally by the public GTK+ API
+ and nobody is using it.
+
+ * GNUmakefile.am:
+ * GNUmakefile.list.am:
+
2014-01-05 Gavin Barraclough <[email protected]>
Move process suppression of WebProcess to Page (from UIProcess)
Modified: trunk/Source/WebKit2/GNUmakefile.am (161321 => 161322)
--- trunk/Source/WebKit2/GNUmakefile.am 2014-01-05 09:46:00 UTC (rev 161321)
+++ trunk/Source/WebKit2/GNUmakefile.am 2014-01-05 10:34:04 UTC (rev 161322)
@@ -60,17 +60,13 @@
libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \
- $(webkit2_h_api)
+ $(webkit2gtk_ui_h_api) \
+ $(webkit2gtk_web_extension_h_api)
-libwebkit2gtkincludedir = $(libwebkitgtkincludedir)/webkit2
-nodist_libwebkit2gtkinclude_HEADERS = \
+nodist_libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \
DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitEnumTypes.h \
DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitVersion.h
-libwebkit2gtkinclude_HEADERS = \
- $(webkit2gtk_h_api) \
- $(webkit2_web_extension_h_api)
-
nodist_libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
$(webkit2_built_sources) \
$(webkit2gtk_built_sources)
@@ -215,7 +211,7 @@
endif
libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = \
- $(libwebkit2gtkincludedir)/WebKit2
+ $(libwebkitgtkincludedir)/webkit2
libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS := \
-version-info @LIBWEBKIT2GTK_VERSION@ \
@@ -282,6 +278,10 @@
$(XT_LIBS) \
$(ZLIB_LIBS)
+webkit2gtk_h_api += \
+ $(webkit2gtk_ui_h_api) \
+ $(webkit2gtk_web_extension_h_api)
+
if ENABLE_WEBKIT2
pkgconfig_DATA += Source/WebKit2/webkit2gtk-@[email protected]
@@ -325,7 +325,7 @@
-DBUILDING_WEBKIT \
-DWEBKIT2_COMPILATION \
$(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitEnumTypes.h \
- $(webkit2gtk_h_api) \
+ $(webkit2gtk_ui_h_api) \
$(WebKit2)/UIProcess/API/gtk/*.cpp
WebKit2-@[email protected]: WebKit2-@[email protected] $(G_IR_COMPILER)
@@ -374,7 +374,7 @@
-I$(GENSOURCES_WEBKIT2)/webkit2gtk \
-DBUILDING_WEBKIT \
-DWEBKIT2_COMPILATION \
- $(webkit2_web_extension_h_api) \
+ $(webkit2gtk_web_extension_h_api) \
$(webkitgtk_gdom_built_h_api) \
$(WebKit2)/WebProcess/InjectedBundle/API/gtk/*.cpp
@@ -395,11 +395,11 @@
BUILT_SOURCES += $(top_builddir)/stamp-webkit2-forwarding-headers
-$(GENSOURCES_WEBKIT2)/webkit2gtk/include/webkit2: $(libwebkit2gtkinclude_HEADERS)
+$(GENSOURCES_WEBKIT2)/webkit2gtk/include/webkit2: $(webkit2gtk_h_api)
$(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/webkit2gtk/include \
&& ln -n -s -f ${shell pwd}/$(WebKit2)/UIProcess/API/gtk $@
-$(GENSOURCES_WEBKIT2)/webkit2extension/include/webkit2: $(libwebkit2gtkinclude_HEADERS)
+$(GENSOURCES_WEBKIT2)/webkit2extension/include/webkit2: $(webkit2gtk_h_api)
$(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/webkit2extension/include \
&& ln -n -s -f ${shell pwd}/$(WebKit2)/WebProcess/InjectedBundle/API/gtk $@
@@ -461,9 +461,9 @@
$(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitEnumTypes.h: stamp-webkit2enumtypes
@true
-stamp-webkit2enumtypes: $(libwebkit2gtkinclude_HEADERS) $(WebKit2)/GNUmakefile.am
+stamp-webkit2enumtypes: $(webkit2gtk_h_api) $(WebKit2)/GNUmakefile.am
$(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2 \
- && glib-mkenums --template $(WebKit2)/UIProcess/API/gtk/WebKitEnumTypes.h.template $(libwebkit2gtkinclude_HEADERS) | \
+ && glib-mkenums --template $(WebKit2)/UIProcess/API/gtk/WebKitEnumTypes.h.template $(webkit2gtk_h_api) | \
sed 's,web_kit,webkit,' | \
sed 's,WEBKIT_TYPE_KIT,WEBKIT_TYPE,' \
> wk2-xgen-gth \
@@ -471,9 +471,9 @@
&& rm -f wk2-xgen-gth \
&& echo timestamp > $(@F)
-$(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitEnumTypes.cpp: $(libwebkit2gtkinclude_HEADERS) $(WebKit2)/GNUmakefile.am
+$(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitEnumTypes.cpp: $(webkit2gtk_h_api) $(WebKit2)/GNUmakefile.am
$(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2 \
- && glib-mkenums --template $(WebKit2)/UIProcess/API/gtk/WebKitEnumTypes.cpp.template $(libwebkit2gtkinclude_HEADERS) | \
+ && glib-mkenums --template $(WebKit2)/UIProcess/API/gtk/WebKitEnumTypes.cpp.template $(webkit2gtk_h_api) | \
sed 's,web_kit,webkit,' \
> wk2-xgen-gtc \
&& cp wk2-xgen-gtc $@ \
Modified: trunk/Source/WebKit2/GNUmakefile.list.am (161321 => 161322)
--- trunk/Source/WebKit2/GNUmakefile.list.am 2014-01-05 09:46:00 UTC (rev 161321)
+++ trunk/Source/WebKit2/GNUmakefile.list.am 2014-01-05 10:34:04 UTC (rev 161322)
@@ -1,112 +1,4 @@
-webkit2_h_api += \
- $(WebKit2)/Shared/API/c/gtk/WKBaseGtk.h \
- $(WebKit2)/Shared/API/c/soup/WKBaseSoup.h \
- $(WebKit2)/Shared/API/c/WKArray.h \
- $(WebKit2)/Shared/API/c/WKBase.h \
- $(WebKit2)/Shared/API/c/WKCertificateInfo.h \
- $(WebKit2)/Shared/API/c/WKConnectionRef.h \
- $(WebKit2)/Shared/API/c/WKContextMenuItem.h \
- $(WebKit2)/Shared/API/c/WKContextMenuItemTypes.h \
- $(WebKit2)/Shared/API/c/WKData.h \
- $(WebKit2)/Shared/API/c/WKDeclarationSpecifiers.h \
- $(WebKit2)/Shared/API/c/WKDictionary.h \
- $(WebKit2)/Shared/API/c/WKError.h \
- $(WebKit2)/Shared/API/c/WKEvent.h \
- $(WebKit2)/Shared/API/c/WKFindOptions.h \
- $(WebKit2)/Shared/API/c/WKGeometry.h \
- $(WebKit2)/Shared/API/c/WKImage.h \
- $(WebKit2)/Shared/API/c/WKMutableArray.h \
- $(WebKit2)/Shared/API/c/WKMutableDictionary.h \
- $(WebKit2)/Shared/API/c/WKNumber.h \
- $(WebKit2)/Shared/API/c/WKPageLoadTypes.h \
- $(WebKit2)/Shared/API/c/WKPageVisibilityTypes.h \
- $(WebKit2)/Shared/API/c/WKPluginInformation.h \
- $(WebKit2)/Shared/API/c/WKRenderLayer.h \
- $(WebKit2)/Shared/API/c/WKRenderObject.h \
- $(WebKit2)/Shared/API/c/WKSecurityOrigin.h \
- $(WebKit2)/Shared/API/c/WKSerializedScriptValue.h \
- $(WebKit2)/Shared/API/c/WKSerializedScriptValuePrivate.h \
- $(WebKit2)/Shared/API/c/WKSharedAPICast.h \
- $(WebKit2)/Shared/API/c/WKString.h \
- $(WebKit2)/Shared/API/c/WKStringPrivate.h \
- $(WebKit2)/Shared/API/c/WKType.h \
- $(WebKit2)/Shared/API/c/WKURL.h \
- $(WebKit2)/Shared/API/c/WKURLRequest.h \
- $(WebKit2)/Shared/API/c/WKURLResponse.h \
- $(WebKit2)/Shared/API/c/WKUserContentInjectedFrames.h \
- $(WebKit2)/Shared/API/c/WKUserContentURLPattern.h \
- $(WebKit2)/Shared/API/c/WKUserScriptInjectionTime.h \
- $(WebKit2)/UIProcess/API/C/gtk/WKAPICastGtk.h \
- $(WebKit2)/UIProcess/API/C/gtk/WKFullScreenClientGtk.h \
- $(WebKit2)/UIProcess/API/C/gtk/WKInspectorClientGtk.h \
- $(WebKit2)/UIProcess/API/C/gtk/WKView.h \
- $(WebKit2)/UIProcess/API/C/soup/WKAPICastSoup.h \
- $(WebKit2)/UIProcess/API/C/soup/WKContextSoup.h \
- $(WebKit2)/UIProcess/API/C/soup/WKSoupRequestManager.h \
- $(WebKit2)/UIProcess/API/C/WebKit2_C.h \
- $(WebKit2)/UIProcess/API/C/WKAPICast.h \
- $(WebKit2)/UIProcess/API/C/WKApplicationCacheManager.h \
- $(WebKit2)/UIProcess/API/C/WKAuthenticationChallenge.h \
- $(WebKit2)/UIProcess/API/C/WKAuthenticationDecisionListener.h \
- $(WebKit2)/UIProcess/API/C/WKBackForwardListRef.h \
- $(WebKit2)/UIProcess/API/C/WKBackForwardListItemRef.h \
- $(WebKit2)/UIProcess/API/C/WKBatteryManager.h \
- $(WebKit2)/UIProcess/API/C/WKBatteryStatus.h \
- $(WebKit2)/UIProcess/API/C/WKColorPickerResultListener.h \
- $(WebKit2)/UIProcess/API/C/WKContext.h \
- $(WebKit2)/UIProcess/API/C/WKContextConnectionClient.h \
- $(WebKit2)/UIProcess/API/C/WKContextDownloadClient.h \
- $(WebKit2)/UIProcess/API/C/WKContextHistoryClient.h \
- $(WebKit2)/UIProcess/API/C/WKContextInjectedBundleClient.h \
- $(WebKit2)/UIProcess/API/C/WKContextPrivate.h \
- $(WebKit2)/UIProcess/API/C/WKCookieManager.h \
- $(WebKit2)/UIProcess/API/C/WKCredential.h \
- $(WebKit2)/UIProcess/API/C/WKCredentialTypes.h \
- $(WebKit2)/UIProcess/API/C/WKDatabaseManager.h \
- $(WebKit2)/UIProcess/API/C/WKDownload.h \
- $(WebKit2)/UIProcess/API/C/WKFormSubmissionListener.h \
- $(WebKit2)/UIProcess/API/C/WKFrame.h \
- $(WebKit2)/UIProcess/API/C/WKFramePolicyListener.h \
- $(WebKit2)/UIProcess/API/C/WKGeolocationManager.h \
- $(WebKit2)/UIProcess/API/C/WKGeolocationPermissionRequest.h \
- $(WebKit2)/UIProcess/API/C/WKGeolocationPosition.h \
- $(WebKit2)/UIProcess/API/C/WKGrammarDetail.h \
- $(WebKit2)/UIProcess/API/C/WKHitTestResult.h \
- $(WebKit2)/UIProcess/API/C/WKInspector.h \
- $(WebKit2)/UIProcess/API/C/WKKeyValueStorageManager.h \
- $(WebKit2)/UIProcess/API/C/WKMediaCacheManager.h \
- $(WebKit2)/UIProcess/API/C/WKNativeEvent.h \
- $(WebKit2)/UIProcess/API/C/WKNavigationDataRef.h \
- $(WebKit2)/UIProcess/API/C/WKNetworkInfo.h \
- $(WebKit2)/UIProcess/API/C/WKNetworkInfoManager.h \
- $(WebKit2)/UIProcess/API/C/WKNotification.h \
- $(WebKit2)/UIProcess/API/C/WKNotificationManager.h \
- $(WebKit2)/UIProcess/API/C/WKNotificationPermissionRequest.h \
- $(WebKit2)/UIProcess/API/C/WKNotificationProvider.h \
- $(WebKit2)/UIProcess/API/C/WKOpenPanelParameters.h \
- $(WebKit2)/UIProcess/API/C/WKOpenPanelResultListener.h \
- $(WebKit2)/UIProcess/API/C/WKOriginDataManager.h \
- $(WebKit2)/UIProcess/API/C/WKPageGroup.h \
- $(WebKit2)/UIProcess/API/C/WKPage.h \
- $(WebKit2)/UIProcess/API/C/WKPagePrivate.h \
- $(WebKit2)/UIProcess/API/C/WKPageContextMenuClient.h \
- $(WebKit2)/UIProcess/API/C/WKPageFindClient.h \
- $(WebKit2)/UIProcess/API/C/WKPageFindMatchesClient.h \
- $(WebKit2)/UIProcess/API/C/WKPageFormClient.h \
- $(WebKit2)/UIProcess/API/C/WKPageLoaderClient.h \
- $(WebKit2)/UIProcess/API/C/WKPagePolicyClient.h \
- $(WebKit2)/UIProcess/API/C/WKPageUIClient.h \
- $(WebKit2)/UIProcess/API/C/WKPluginSiteDataManager.h \
- $(WebKit2)/UIProcess/API/C/WKPreferences.h \
- $(WebKit2)/UIProcess/API/C/WKPreferencesPrivate.h \
- $(WebKit2)/UIProcess/API/C/WKProtectionSpace.h \
- $(WebKit2)/UIProcess/API/C/WKProtectionSpaceTypes.h \
- $(WebKit2)/UIProcess/API/C/WKResourceCacheManager.h \
- $(WebKit2)/UIProcess/API/C/WKTextChecker.h \
- $(WebKit2)/UIProcess/API/C/WKVibration.cpp \
- $(WebKit2)/UIProcess/API/cpp/WKRetainPtr.h
-
-webkit2gtk_h_api += \
+webkit2gtk_ui_h_api += \
$(WebKit2)/UIProcess/API/gtk/WebKitAuthenticationRequest.h \
$(WebKit2)/UIProcess/API/gtk/WebKitBackForwardList.h \
$(WebKit2)/UIProcess/API/gtk/WebKitBackForwardListItem.h \
@@ -150,7 +42,7 @@
$(WebKit2)/UIProcess/API/gtk/WebKitWindowProperties.h \
$(WebKit2)/UIProcess/API/gtk/webkit2.h
-webkit2_web_extension_h_api += \
+webkit2gtk_web_extension_h_api += \
$(WebKit2)/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.h \
$(WebKit2)/WebProcess/InjectedBundle/API/gtk/WebKitFrame.h \
$(WebKit2)/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.h \
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
