[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abecsi at webkit.org
abecsi at webkit.org
Wed Dec 22 12:25:51 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 1fafc55558081093e4cad75eff87ee9c5fe8959c
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 23 13:58:51 2010 +0000
2010-08-23 Balazs Kelemen <kb at inf.u-szeged.hu>
Reviewed by Ariya Hidayat.
[Qt] Find needed forwarding headers for WebKit2 automatically
https://bugs.webkit.org/show_bug.cgi?id=44336
* MiniBrowser/qt/BrowserWindow.cpp: Use normal (not framework style) includes here.
The new script does not satisfy the needs of this file however using normal includes
is generally better here.
* MiniBrowser/qt/MiniBrowser.pro: Added include paths.
* Scripts/enumerate-included-framework-headers: Enumerates headers included from the
given frameworks by files in the current directory (and subdirectories).
In the future this needs to be rewritten in perl for being able to use on Windows.
2010-08-23 Balazs Kelemen <kb at inf.u-szeged.hu>
Reviewed by Ariya Hidayat.
[Qt] Find needed forwarding headers for WebKit2 automatically
https://bugs.webkit.org/show_bug.cgi?id=44336
* DerivedSources.pro: Use the new enumerate-included-framework-headers script for generating
the list of forwarding headers we want to create.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65808 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index ed92fd3..2d1ceb3 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-23 Balazs Kelemen <kb at inf.u-szeged.hu>
+
+ Reviewed by Ariya Hidayat.
+
+ [Qt] Find needed forwarding headers for WebKit2 automatically
+ https://bugs.webkit.org/show_bug.cgi?id=44336
+
+ * DerivedSources.pro: Use the new enumerate-included-framework-headers script for generating
+ the list of forwarding headers we want to create.
+
2010-08-23 Zoltan Horvath <zoltan at webkit.org>
[Qt] Build fix.
diff --git a/WebKit2/DerivedSources.pro b/WebKit2/DerivedSources.pro
index 9a13101..2970780 100644
--- a/WebKit2/DerivedSources.pro
+++ b/WebKit2/DerivedSources.pro
@@ -3,106 +3,9 @@ TARGET = dummy
CONFIG -= debug_and_release
-WEBCORE_HEADERS_FOR_WEBKIT2 += \
- bindings/js/DOMWrapperWorld.h \
- bindings/js/GCController.h \
- bindings/js/JSPluginElementFunctions.h \
- bindings/js/ScriptController.h \
- bridge/IdentifierRep.h \
- bridge/npruntime_internal.h \
- config.h \
- css/CSSComputedStyleDeclaration.h \
- dom/Event.h \
- dom/KeyboardEvent.h \
- dom/Node.h \
- dom/Range.h \
- dom/UIEventWithKeyState.h \
- dom/UserTypingGestureIndicator.h \
- editing/EditCommand.h \
- editing/EditorInsertAction.h \
- editing/TextAffinity.h \
- history/BackForwardControllerClient.h \
- history/BackForwardList.h \
- history/HistoryItem.h \
- html/HTMLInputElement.h \
- html/HTMLFormElement.h \
- html/HTMLFrameOwnerElement.h \
- html/HTMLPlugInElement.h \
- html/HTMLTextAreaElement.h \
- inspector/InspectorClient.h \
- loader/appcache/ApplicationCacheStorage.h \
- loader/Cache.h \
- loader/DocumentLoader.h \
- loader/FormState.h \
- loader/FrameLoaderClient.h \
- loader/FrameLoader.h \
- loader/FrameLoaderTypes.h \
- loader/NetscapePlugInStreamLoader.h \
- loader/PolicyChecker.h \
- loader/ProgressTracker.h \
- page/animation/AnimationController.h \
- page/ChromeClient.h \
- page/Chrome.h \
- page/ContextMenuClient.h \
- page/DragClient.h \
- page/EditorClient.h \
- page/EventHandler.h \
- page/FocusController.h \
- page/Frame.h \
- page/FrameLoadRequest.h \
- page/FrameView.h \
- page/MediaCanStartListener.h \
- page/PageGroup.h \
- page/Page.h \
- page/SecurityOrigin.h \
- page/Settings.h \
- page/WindowFeatures.h \
- page/ZoomMode.h \
- platform/Cursor.h \
- platform/FileChooser.h \
- platform/FileSystem.h \
- platform/graphics/FloatRect.h \
- platform/graphics/FontRenderingMode.h \
- platform/graphics/GraphicsContext.h \
- platform/graphics/GraphicsLayerClient.h \
- platform/graphics/GraphicsLayer.h \
- platform/graphics/IntPoint.h \
- platform/graphics/IntRect.h \
- platform/graphics/IntSize.h \
- platform/HostWindow.h \
- platform/KURL.h \
- platform/LinkHash.h \
- platform/LocalizationStrategy.h \
- platform/MIMETypeRegistry.h \
- platform/network/android/ResourceError.h \
- platform/network/android/ResourceRequest.h \
- platform/network/android/ResourceResponse.h \
- platform/network/HTTPHeaderMap.h \
- platform/PlatformKeyboardEvent.h \
- platform/PlatformMouseEvent.h \
- platform/PlatformStrategies.h \
- platform/PlatformTouchPoint.h \
- platform/PlatformTouchEvent.h \
- platform/PlatformWheelEvent.h \
- platform/PopupMenu.h \
- platform/PopupMenuClient.h \
- platform/SchemeRegistry.h \
- platform/ScrollView.h \
- platform/SearchPopupMenu.h \
- platform/SharedBuffer.h \
- platform/text/PlatformString.h \
- platform/Widget.h \
- platform/win/BitmapInfo.h \
- platform/WindowsKeyboardCodes.h \
- platform/win/WebCoreInstanceHandle.h \
- platform/win/WindowMessageBroadcaster.h \
- platform/win/WindowMessageListener.h \
- plugins/npfunctions.h \
- plugins/PluginData.h \
- plugins/PluginStrategy.h \
- plugins/PluginViewBase.h \
- rendering/RenderLayer.h \
- rendering/RenderTreeAsText.h \
+WEBCORE_HEADERS_FOR_WEBKIT2 = $$system(../WebKitTools/Scripts/enumerate-included-framework-headers WebCore)
+JSC_HEADERS_FOR_WEBKIT2 = $$system(../WebKitTools/Scripts/enumerate-included-framework-headers JavaScriptCore)
+WEBKIT2_API_HEADERS = $$system(../WebKitTools/Scripts/enumerate-included-framework-headers WebKit2)
WEBCORE_GENERATED_HEADERS_FOR_WEBKIT2 += \
$$OUTPUT_DIR/WebCore/generated/HTMLNames.h \
@@ -111,45 +14,6 @@ WEBCORE_GENERATED_HEADERS_FOR_WEBKIT2 += \
$$OUTPUT_DIR/WebCore/generated/JSElement.h \
$$OUTPUT_DIR/WebCore/generated/JSHTMLElement.h \
-JSC_HEADERS_FOR_WEBKIT2 += \
- API/APICast.h \
- API/JavaScript.h \
- API/JSBase.h \
- runtime/Error.h \
- runtime/FunctionPrototype.h \
- runtime/InternalFunction.h \
- runtime/JSGlobalObject.h \
- runtime/JSLock.h \
- runtime/JSObject.h \
- runtime/JSObjectWithGlobalObject.h \
- runtime/ObjectPrototype.h \
- runtime/Protect.h \
- parser/SourceCode.h \
- wtf/Platform.h \
- wtf/text/StringHash.h \
-
-WEBKIT2_API_HEADERS += \
- UIProcess/API/C/WKAPICast.h \
- UIProcess/API/C/WKBase.h \
- UIProcess/API/C/WKContext.h \
- UIProcess/API/C/WKContextPrivate.h \
- UIProcess/API/C/WKFrame.h \
- UIProcess/API/C/WKFramePolicyListener.h \
- UIProcess/API/C/WKNavigationData.h \
- UIProcess/API/C/WKPage.h \
- UIProcess/API/C/WKPageNamespace.h \
- UIProcess/API/C/WKPagePrivate.h \
- UIProcess/API/C/WKPreferences.h \
- UIProcess/API/C/WKString.h \
- UIProcess/API/C/WKType.h \
- UIProcess/API/C/WKURL.h \
- UIProcess/API/C/WebKit2.h \
- UIProcess/API/cpp/WKRetainPtr.h \
- UIProcess/API/qt/qgraphicswkview.h \
- UIProcess/API/qt/qwkpage.h \
- WebProcess/InjectedBundle/API/c/WKBundleBase.h \
- WebProcess/InjectedBundle/API/c/WKBundlePage.h \
-
QUOTE = ""
DOUBLE_ESCAPED_QUOTE = ""
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index eda4b7c..c95ef33 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-23 Balazs Kelemen <kb at inf.u-szeged.hu>
+
+ Reviewed by Ariya Hidayat.
+
+ [Qt] Find needed forwarding headers for WebKit2 automatically
+ https://bugs.webkit.org/show_bug.cgi?id=44336
+
+ * MiniBrowser/qt/BrowserWindow.cpp: Use normal (not framework style) includes here.
+ The new script does not satisfy the needs of this file however using normal includes
+ is generally better here.
+ * MiniBrowser/qt/MiniBrowser.pro: Added include paths.
+ * Scripts/enumerate-included-framework-headers: Enumerates headers included from the
+ given frameworks by files in the current directory (and subdirectories).
+ In the future this needs to be rewritten in perl for being able to use on Windows.
+
2010-08-22 No'am Rosenthal <noam.rosenthal at nokia.com>
Reviewed by Ariya Hidayat.
diff --git a/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp b/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
index 09ac737..9efe64f 100644
--- a/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
+++ b/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
@@ -27,8 +27,8 @@
*/
#include "BrowserWindow.h"
-#include <WebKit2/WKPageNamespace.h>
-#include <WebKit2/qwkpage.h>
+#include "WKPageNamespace.h"
+#include "qwkpage.h"
static QWKPage* createNewPage(QWKPage* page)
{
diff --git a/WebKitTools/MiniBrowser/qt/MiniBrowser.pro b/WebKitTools/MiniBrowser/qt/MiniBrowser.pro
index 9a57d1b..b34b8f7 100644
--- a/WebKitTools/MiniBrowser/qt/MiniBrowser.pro
+++ b/WebKitTools/MiniBrowser/qt/MiniBrowser.pro
@@ -13,7 +13,11 @@ CONFIG += uitools
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../..
include(../../../WebKit.pri)
-INCLUDEPATH += $$OUTPUT_DIR/include
+INCLUDEPATH += \
+ $$PWD/../../../WebKit2/UIProcess/API/C \
+ $$PWD/../../../WebKit2/UIProcess/API/qt \
+ $$OUTPUT_DIR/include
+
DESTDIR = $$OUTPUT_DIR/bin
!CONFIG(standalone_package): CONFIG -= app_bundle
diff --git a/WebKitTools/Scripts/enumerate-included-framework-headers b/WebKitTools/Scripts/enumerate-included-framework-headers
new file mode 100755
index 0000000..5ef6083
--- /dev/null
+++ b/WebKitTools/Scripts/enumerate-included-framework-headers
@@ -0,0 +1,61 @@
+#!/bin/sh
+# Copyright (C) 2009, 2010 University of Szeged
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY UNIVERSITY OF SZEGED ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL UNIVERSITY OF SZEGED OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# A script to find and enumerate headers included from the given frameworks by files in the
+# current directory (and subdirectories).
+
+# FIXME: This should be rewritten in perl.
+# FIXME: Currently only works for qt.
+
+platform_prefixes=android/\|brew/\|cf/\|chromium/\|curl\|efl/\|gtk/\|haiku/\|mac/\|soup\|v8\|win/\|wx/
+
+for framework in $*; do
+ headers=`find . \( -name '*.cpp' -o -name '*.h' \) -exec grep "<$framework/" {} ';' | sed -e 's|.*/\(.*\.h\).*|\1|' | sort -u`
+
+ for header in $headers
+ do
+ header_paths=`find ../$framework -name $header | sed "s/..\/$framework\///g"`
+
+ if test `echo $header_paths | wc -w` -eq 1
+ then
+ header_path=$header_paths
+ if test `echo $header_path | grep -c -E $platform_prefixes` -ne 0
+ then
+ continue
+ fi
+ else
+ for path in $header_paths
+ do
+ if test `echo $path | grep -c -E $platform_prefixes` -eq 0
+ then
+ header_path=$path
+ break
+ fi
+ done
+ fi
+
+ echo -n "$header_path "
+ done
+done
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list