Changeset 161322 in webkit
- Timestamp:
- Jan 5, 2014 2:34:04 AM (10 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r161311 r161322 1 2014-01-05 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GTK] Stop installing WebKit2 C API headers 4 https://bugs.webkit.org/show_bug.cgi?id=126489 5 6 Reviewed by Martin Robinson. 7 8 * GNUmakefile.am: 9 1 10 2014-01-04 Martin Robinson <mrobinson@igalia.com> 2 11 -
trunk/GNUmakefile.am
r160568 r161322 103 103 webkitgtk_built_sources := 104 104 webkitgtk_built_nosources := 105 webkit2_h_api :=106 105 webkit2_sources := 107 106 webkit2_built_sources := 108 107 webkit2platform_sources := 108 webkit2gtk_ui_h_api := 109 webkit2gtk_web_extension_h_api := 109 110 webkit2gtk_h_api := 110 111 webkit2gtk_built_sources := 111 webkit2_web_extension_h_api :=112 112 webkit2_plugin_process_sources := 113 113 webkit2_plugin_process_built_sources := -
trunk/Source/WebKit2/ChangeLog
r161319 r161322 1 2014-01-05 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GTK] Stop installing WebKit2 C API headers 4 https://bugs.webkit.org/show_bug.cgi?id=126489 5 6 Reviewed by Martin Robinson. 7 8 We are not actually maintaining the API/ABI compatibility of the 9 WebKit2 C API, it's only used internally by the public GTK+ API 10 and nobody is using it. 11 12 * GNUmakefile.am: 13 * GNUmakefile.list.am: 14 1 15 2014-01-05 Gavin Barraclough <barraclough@apple.com> 2 16 -
trunk/Source/WebKit2/GNUmakefile.am
r161255 r161322 61 61 62 62 libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \ 63 $(webkit2 _h_api)64 65 libwebkit2gtkincludedir = $(libwebkitgtkincludedir)/webkit2 66 nodist_libwebkit2gtk include_HEADERS = \63 $(webkit2gtk_ui_h_api) \ 64 $(webkit2gtk_web_extension_h_api) 65 66 nodist_libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \ 67 67 DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitEnumTypes.h \ 68 68 DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitVersion.h 69 70 libwebkit2gtkinclude_HEADERS = \71 $(webkit2gtk_h_api) \72 $(webkit2_web_extension_h_api)73 69 74 70 nodist_libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \ … … 216 212 217 213 libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = \ 218 $(libwebkit 2gtkincludedir)/WebKit2214 $(libwebkitgtkincludedir)/webkit2 219 215 220 216 libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS := \ … … 282 278 $(XT_LIBS) \ 283 279 $(ZLIB_LIBS) 280 281 webkit2gtk_h_api += \ 282 $(webkit2gtk_ui_h_api) \ 283 $(webkit2gtk_web_extension_h_api) 284 284 285 285 if ENABLE_WEBKIT2 … … 326 326 -DWEBKIT2_COMPILATION \ 327 327 $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitEnumTypes.h \ 328 $(webkit2gtk_ h_api) \328 $(webkit2gtk_ui_h_api) \ 329 329 $(WebKit2)/UIProcess/API/gtk/*.cpp 330 330 … … 375 375 -DBUILDING_WEBKIT \ 376 376 -DWEBKIT2_COMPILATION \ 377 $(webkit2 _web_extension_h_api) \377 $(webkit2gtk_web_extension_h_api) \ 378 378 $(webkitgtk_gdom_built_h_api) \ 379 379 $(WebKit2)/WebProcess/InjectedBundle/API/gtk/*.cpp … … 396 396 BUILT_SOURCES += $(top_builddir)/stamp-webkit2-forwarding-headers 397 397 398 $(GENSOURCES_WEBKIT2)/webkit2gtk/include/webkit2: $( libwebkit2gtkinclude_HEADERS)398 $(GENSOURCES_WEBKIT2)/webkit2gtk/include/webkit2: $(webkit2gtk_h_api) 399 399 $(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/webkit2gtk/include \ 400 400 && ln -n -s -f ${shell pwd}/$(WebKit2)/UIProcess/API/gtk $@ 401 401 402 $(GENSOURCES_WEBKIT2)/webkit2extension/include/webkit2: $( libwebkit2gtkinclude_HEADERS)402 $(GENSOURCES_WEBKIT2)/webkit2extension/include/webkit2: $(webkit2gtk_h_api) 403 403 $(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/webkit2extension/include \ 404 404 && ln -n -s -f ${shell pwd}/$(WebKit2)/WebProcess/InjectedBundle/API/gtk $@ … … 462 462 @true 463 463 464 stamp-webkit2enumtypes: $( libwebkit2gtkinclude_HEADERS) $(WebKit2)/GNUmakefile.am464 stamp-webkit2enumtypes: $(webkit2gtk_h_api) $(WebKit2)/GNUmakefile.am 465 465 $(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2 \ 466 && glib-mkenums --template $(WebKit2)/UIProcess/API/gtk/WebKitEnumTypes.h.template $( libwebkit2gtkinclude_HEADERS) | \466 && glib-mkenums --template $(WebKit2)/UIProcess/API/gtk/WebKitEnumTypes.h.template $(webkit2gtk_h_api) | \ 467 467 sed 's,web_kit,webkit,' | \ 468 468 sed 's,WEBKIT_TYPE_KIT,WEBKIT_TYPE,' \ … … 472 472 && echo timestamp > $(@F) 473 473 474 $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitEnumTypes.cpp: $( libwebkit2gtkinclude_HEADERS) $(WebKit2)/GNUmakefile.am474 $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitEnumTypes.cpp: $(webkit2gtk_h_api) $(WebKit2)/GNUmakefile.am 475 475 $(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2 \ 476 && glib-mkenums --template $(WebKit2)/UIProcess/API/gtk/WebKitEnumTypes.cpp.template $( libwebkit2gtkinclude_HEADERS) | \476 && glib-mkenums --template $(WebKit2)/UIProcess/API/gtk/WebKitEnumTypes.cpp.template $(webkit2gtk_h_api) | \ 477 477 sed 's,web_kit,webkit,' \ 478 478 > wk2-xgen-gtc \ -
trunk/Source/WebKit2/GNUmakefile.list.am
r161156 r161322 1 webkit2_h_api += \ 2 $(WebKit2)/Shared/API/c/gtk/WKBaseGtk.h \ 3 $(WebKit2)/Shared/API/c/soup/WKBaseSoup.h \ 4 $(WebKit2)/Shared/API/c/WKArray.h \ 5 $(WebKit2)/Shared/API/c/WKBase.h \ 6 $(WebKit2)/Shared/API/c/WKCertificateInfo.h \ 7 $(WebKit2)/Shared/API/c/WKConnectionRef.h \ 8 $(WebKit2)/Shared/API/c/WKContextMenuItem.h \ 9 $(WebKit2)/Shared/API/c/WKContextMenuItemTypes.h \ 10 $(WebKit2)/Shared/API/c/WKData.h \ 11 $(WebKit2)/Shared/API/c/WKDeclarationSpecifiers.h \ 12 $(WebKit2)/Shared/API/c/WKDictionary.h \ 13 $(WebKit2)/Shared/API/c/WKError.h \ 14 $(WebKit2)/Shared/API/c/WKEvent.h \ 15 $(WebKit2)/Shared/API/c/WKFindOptions.h \ 16 $(WebKit2)/Shared/API/c/WKGeometry.h \ 17 $(WebKit2)/Shared/API/c/WKImage.h \ 18 $(WebKit2)/Shared/API/c/WKMutableArray.h \ 19 $(WebKit2)/Shared/API/c/WKMutableDictionary.h \ 20 $(WebKit2)/Shared/API/c/WKNumber.h \ 21 $(WebKit2)/Shared/API/c/WKPageLoadTypes.h \ 22 $(WebKit2)/Shared/API/c/WKPageVisibilityTypes.h \ 23 $(WebKit2)/Shared/API/c/WKPluginInformation.h \ 24 $(WebKit2)/Shared/API/c/WKRenderLayer.h \ 25 $(WebKit2)/Shared/API/c/WKRenderObject.h \ 26 $(WebKit2)/Shared/API/c/WKSecurityOrigin.h \ 27 $(WebKit2)/Shared/API/c/WKSerializedScriptValue.h \ 28 $(WebKit2)/Shared/API/c/WKSerializedScriptValuePrivate.h \ 29 $(WebKit2)/Shared/API/c/WKSharedAPICast.h \ 30 $(WebKit2)/Shared/API/c/WKString.h \ 31 $(WebKit2)/Shared/API/c/WKStringPrivate.h \ 32 $(WebKit2)/Shared/API/c/WKType.h \ 33 $(WebKit2)/Shared/API/c/WKURL.h \ 34 $(WebKit2)/Shared/API/c/WKURLRequest.h \ 35 $(WebKit2)/Shared/API/c/WKURLResponse.h \ 36 $(WebKit2)/Shared/API/c/WKUserContentInjectedFrames.h \ 37 $(WebKit2)/Shared/API/c/WKUserContentURLPattern.h \ 38 $(WebKit2)/Shared/API/c/WKUserScriptInjectionTime.h \ 39 $(WebKit2)/UIProcess/API/C/gtk/WKAPICastGtk.h \ 40 $(WebKit2)/UIProcess/API/C/gtk/WKFullScreenClientGtk.h \ 41 $(WebKit2)/UIProcess/API/C/gtk/WKInspectorClientGtk.h \ 42 $(WebKit2)/UIProcess/API/C/gtk/WKView.h \ 43 $(WebKit2)/UIProcess/API/C/soup/WKAPICastSoup.h \ 44 $(WebKit2)/UIProcess/API/C/soup/WKContextSoup.h \ 45 $(WebKit2)/UIProcess/API/C/soup/WKSoupRequestManager.h \ 46 $(WebKit2)/UIProcess/API/C/WebKit2_C.h \ 47 $(WebKit2)/UIProcess/API/C/WKAPICast.h \ 48 $(WebKit2)/UIProcess/API/C/WKApplicationCacheManager.h \ 49 $(WebKit2)/UIProcess/API/C/WKAuthenticationChallenge.h \ 50 $(WebKit2)/UIProcess/API/C/WKAuthenticationDecisionListener.h \ 51 $(WebKit2)/UIProcess/API/C/WKBackForwardListRef.h \ 52 $(WebKit2)/UIProcess/API/C/WKBackForwardListItemRef.h \ 53 $(WebKit2)/UIProcess/API/C/WKBatteryManager.h \ 54 $(WebKit2)/UIProcess/API/C/WKBatteryStatus.h \ 55 $(WebKit2)/UIProcess/API/C/WKColorPickerResultListener.h \ 56 $(WebKit2)/UIProcess/API/C/WKContext.h \ 57 $(WebKit2)/UIProcess/API/C/WKContextConnectionClient.h \ 58 $(WebKit2)/UIProcess/API/C/WKContextDownloadClient.h \ 59 $(WebKit2)/UIProcess/API/C/WKContextHistoryClient.h \ 60 $(WebKit2)/UIProcess/API/C/WKContextInjectedBundleClient.h \ 61 $(WebKit2)/UIProcess/API/C/WKContextPrivate.h \ 62 $(WebKit2)/UIProcess/API/C/WKCookieManager.h \ 63 $(WebKit2)/UIProcess/API/C/WKCredential.h \ 64 $(WebKit2)/UIProcess/API/C/WKCredentialTypes.h \ 65 $(WebKit2)/UIProcess/API/C/WKDatabaseManager.h \ 66 $(WebKit2)/UIProcess/API/C/WKDownload.h \ 67 $(WebKit2)/UIProcess/API/C/WKFormSubmissionListener.h \ 68 $(WebKit2)/UIProcess/API/C/WKFrame.h \ 69 $(WebKit2)/UIProcess/API/C/WKFramePolicyListener.h \ 70 $(WebKit2)/UIProcess/API/C/WKGeolocationManager.h \ 71 $(WebKit2)/UIProcess/API/C/WKGeolocationPermissionRequest.h \ 72 $(WebKit2)/UIProcess/API/C/WKGeolocationPosition.h \ 73 $(WebKit2)/UIProcess/API/C/WKGrammarDetail.h \ 74 $(WebKit2)/UIProcess/API/C/WKHitTestResult.h \ 75 $(WebKit2)/UIProcess/API/C/WKInspector.h \ 76 $(WebKit2)/UIProcess/API/C/WKKeyValueStorageManager.h \ 77 $(WebKit2)/UIProcess/API/C/WKMediaCacheManager.h \ 78 $(WebKit2)/UIProcess/API/C/WKNativeEvent.h \ 79 $(WebKit2)/UIProcess/API/C/WKNavigationDataRef.h \ 80 $(WebKit2)/UIProcess/API/C/WKNetworkInfo.h \ 81 $(WebKit2)/UIProcess/API/C/WKNetworkInfoManager.h \ 82 $(WebKit2)/UIProcess/API/C/WKNotification.h \ 83 $(WebKit2)/UIProcess/API/C/WKNotificationManager.h \ 84 $(WebKit2)/UIProcess/API/C/WKNotificationPermissionRequest.h \ 85 $(WebKit2)/UIProcess/API/C/WKNotificationProvider.h \ 86 $(WebKit2)/UIProcess/API/C/WKOpenPanelParameters.h \ 87 $(WebKit2)/UIProcess/API/C/WKOpenPanelResultListener.h \ 88 $(WebKit2)/UIProcess/API/C/WKOriginDataManager.h \ 89 $(WebKit2)/UIProcess/API/C/WKPageGroup.h \ 90 $(WebKit2)/UIProcess/API/C/WKPage.h \ 91 $(WebKit2)/UIProcess/API/C/WKPagePrivate.h \ 92 $(WebKit2)/UIProcess/API/C/WKPageContextMenuClient.h \ 93 $(WebKit2)/UIProcess/API/C/WKPageFindClient.h \ 94 $(WebKit2)/UIProcess/API/C/WKPageFindMatchesClient.h \ 95 $(WebKit2)/UIProcess/API/C/WKPageFormClient.h \ 96 $(WebKit2)/UIProcess/API/C/WKPageLoaderClient.h \ 97 $(WebKit2)/UIProcess/API/C/WKPagePolicyClient.h \ 98 $(WebKit2)/UIProcess/API/C/WKPageUIClient.h \ 99 $(WebKit2)/UIProcess/API/C/WKPluginSiteDataManager.h \ 100 $(WebKit2)/UIProcess/API/C/WKPreferences.h \ 101 $(WebKit2)/UIProcess/API/C/WKPreferencesPrivate.h \ 102 $(WebKit2)/UIProcess/API/C/WKProtectionSpace.h \ 103 $(WebKit2)/UIProcess/API/C/WKProtectionSpaceTypes.h \ 104 $(WebKit2)/UIProcess/API/C/WKResourceCacheManager.h \ 105 $(WebKit2)/UIProcess/API/C/WKTextChecker.h \ 106 $(WebKit2)/UIProcess/API/C/WKVibration.cpp \ 107 $(WebKit2)/UIProcess/API/cpp/WKRetainPtr.h 108 109 webkit2gtk_h_api += \ 1 webkit2gtk_ui_h_api += \ 110 2 $(WebKit2)/UIProcess/API/gtk/WebKitAuthenticationRequest.h \ 111 3 $(WebKit2)/UIProcess/API/gtk/WebKitBackForwardList.h \ … … 151 43 $(WebKit2)/UIProcess/API/gtk/webkit2.h 152 44 153 webkit2 _web_extension_h_api += \45 webkit2gtk_web_extension_h_api += \ 154 46 $(WebKit2)/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.h \ 155 47 $(WebKit2)/WebProcess/InjectedBundle/API/gtk/WebKitFrame.h \
Note: See TracChangeset
for help on using the changeset viewer.