[oe-commits] org.oe.dev packages/webkit: Build the Qt/Qtopia port of WebKit as well.
freyther commit
openembedded-commits at lists.openembedded.org
Sun Oct 21 13:25:53 UTC 2007
packages/webkit: Build the Qt/Qtopia port of WebKit as well.
Unifiy the WebKit recipe and allow to build the Gtk+, Qt
and Qtopia port. Add classes/qtopia4core.bbclass to assist
building for Qtopia. Change the WebKit.pro to currently not
build the testkjs and DumpRenderTree test utilities.
Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: e2ef6c7c9f67b4e28fb1c4393ee4307e8358d81d
ViewMTN: http://monotone.openembedded.org/revision/info/e2ef6c7c9f67b4e28fb1c4393ee4307e8358d81d
Files:
1
classes/qtopia4core.bbclass
packages/webkit/webkit-qt.inc
packages/webkit/webkit-qt_svn.bb
packages/webkit/webkit-qtopia_svn.bb
packages/webkit/webkit.inc
conf/distro/include/sane-srcrevs.inc
packages/webkit/files/WebKit.pro
packages/webkit/webkit-gtk_svn.bb
Diffs:
#
# mt diff -r5845bcf9f2b77a412308ab9b7bd6e383f6c902ce -re2ef6c7c9f67b4e28fb1c4393ee4307e8358d81d
#
#
#
# add_file "classes/qtopia4core.bbclass"
# content [f05bb12d7e6296c2ea9e9656a44b1c93f5f0cf21]
#
# add_file "packages/webkit/webkit-qt.inc"
# content [0d47aaa6f3b4850c8e35d881a2a71b271b6b589a]
#
# add_file "packages/webkit/webkit-qt_svn.bb"
# content [8a7e0008b0321d228d80e15a433d3a8b60cd718c]
#
# add_file "packages/webkit/webkit-qtopia_svn.bb"
# content [fd38f04ea3408debdff8222ee61518c57420e507]
#
# add_file "packages/webkit/webkit.inc"
# content [37dc3651ff08fde99eab8a8c58f1a4922d578ad1]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [32c8bb4a0fd7ec05c2bb58544741775fd310207b]
# to [15e4b10fbe98dedc177e719f6e16a00418d98db4]
#
# patch "packages/webkit/files/WebKit.pro"
# from [3fcda9c52630ed394b0c75da8bd0ab4d43099125]
# to [dd444c86e92aeb8c404efbd945a61ec54293c346]
#
# patch "packages/webkit/webkit-gtk_svn.bb"
# from [1bdedb776717ed3d1b2512c2e784c47970489c45]
# to [84963a3b5a31a26c3902cc1010efa9df33f746a5]
#
============================================================
--- classes/qtopia4core.bbclass f05bb12d7e6296c2ea9e9656a44b1c93f5f0cf21
+++ classes/qtopia4core.bbclass f05bb12d7e6296c2ea9e9656a44b1c93f5f0cf21
@@ -0,0 +1,11 @@
+DEPENDS_prepend = "${@["qtopia-core ", ""][(bb.data.getVar('PN', d, 1) == 'qtopia-core')]}"
+inherit qmake2
+
+#
+# override variables set by qmake-base to compile QtopiaCore apps
+#
+export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopiacore4"
+export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopiacore4/"
+export OE_QMAKE_LIBS_QT = "qt"
+export OE_QMAKE_LIBS_X11 = ""
+EXTRA_QMAKEVARS_POST += "LIBS+=-lQtNetwork "
============================================================
--- packages/webkit/webkit-qt.inc 0d47aaa6f3b4850c8e35d881a2a71b271b6b589a
+++ packages/webkit/webkit-qt.inc 0d47aaa6f3b4850c8e35d881a2a71b271b6b589a
@@ -0,0 +1,20 @@
+WEBKIT_PORT = "qt"
+WEBKIT_EXTRA_OPTIONS = ""
+PACKAGES =+ "webkit-qtlauncher-dbg webkit-qtlauncher"
+
+FILES_webkit-qtlauncher = "${bindir}/QtLauncher"
+FILES_webkit-qtlauncher-dbg = "${bindir}/.debug/*"
+
+require webkit.inc
+
+do_install() {
+ install -d ${D}${bindir}
+ install -d ${D}${libdir}
+ install -d ${D}${libdir}/pkgconfig
+
+ install -m 0755 ${S}/WebKitBuilds/Debug/bin/QtLauncher ${D}${bindir}
+ cd ${S}/WebKitBuilds/Debug
+ PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir} $PWD/../../WebKit.pro
+ oe_runmake install
+}
+
============================================================
--- packages/webkit/webkit-qt_svn.bb 8a7e0008b0321d228d80e15a433d3a8b60cd718c
+++ packages/webkit/webkit-qt_svn.bb 8a7e0008b0321d228d80e15a433d3a8b60cd718c
@@ -0,0 +1,2 @@
+require webkit-qt.inc
+inherit qt4x11
============================================================
--- packages/webkit/webkit-qtopia_svn.bb fd38f04ea3408debdff8222ee61518c57420e507
+++ packages/webkit/webkit-qtopia_svn.bb fd38f04ea3408debdff8222ee61518c57420e507
@@ -0,0 +1,3 @@
+BROKEN="1"
+require webkit-qt.inc
+inherit qtopia4core
============================================================
--- packages/webkit/webkit.inc 37dc3651ff08fde99eab8a8c58f1a4922d578ad1
+++ packages/webkit/webkit.inc 37dc3651ff08fde99eab8a8c58f1a4922d578ad1
@@ -0,0 +1,48 @@
+DEPENDS += "flex-native gperf-native perl-native sqlite3"
+SRCREV_FORMAT = "webcore-rwebkit"
+
+# Yes, this is wrong...
+PV = "0.0+svnr${SRCREV}"
+PR = "r1"
+
+inherit qmake2 pkgconfig
+
+SRC_URI = "\
+ svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
+ svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptGlue;proto=http \
+ svn://svn.webkit.org/repository/webkit/trunk/;module=WebCore;proto=http;name=webcore \
+ svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http;name=webkit \
+ svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \
+ svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \
+ file://Makefile \
+ file://Makefile.shared \
+ file://WebKit.pri \
+ file://WebKit.pro \
+"
+S = "${WORKDIR}/"
+
+WEBKIT_QMAKE = "qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ ${WEBKIT_EXTRA_OPTIONS} CONFIG+=${WEBKIT_PORT}"
+
+do_configure() {
+ qmake2 -spec ${QMAKESPEC} CONFIG+=${WEBKIT_PORT} ${WEBKIT_EXTRA_OPTIONS} CONFIG-=release CONFIG+=debug
+ mkdir -p WebKitBuilds/Debug
+ cd WebKitBuilds/Debug
+ PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${prefix}/include WEBKIT_LIB_DIR=${libdir} $PWD/../../WebKit.pro
+}
+
+do_compile_prepend() {
+ mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
+ cd ${S}/JavaScriptCore/pcre
+ ${BUILD_CC} dftables.c -o dftables -I. -I../wtf
+ cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
+ cd ${S}/WebKitBuilds/Debug
+}
+
+do_stage() {
+ install -d ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}
+ cd ${S}/WebKitBuilds/Debug
+ PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR} $PWD/../../WebKit.pro
+ oe_runmake install
+}
+
============================================================
--- conf/distro/include/sane-srcrevs.inc 32c8bb4a0fd7ec05c2bb58544741775fd310207b
+++ conf/distro/include/sane-srcrevs.inc 15e4b10fbe98dedc177e719f6e16a00418d98db4
@@ -96,6 +96,8 @@ SRCREV_pn-webkit-gtk ?= "26079"
SRCREV_pn-sjf2410-linux-native ?= "933"
SRCREV_pn-sphyrna ?= "44"
SRCREV_pn-webkit-gtk ?= "26079"
+SRCREV_pn-webkit-qt ?= "26079"
+SRCREV_pn-webkit-qtopia ?= "26079"
SRCREV_pn-xoo ?= "1623"
SRCREV_pn-mplayer ?= "24587"
SRCREV_pn-networkmanager ?= "2887"
============================================================
--- packages/webkit/files/WebKit.pro 3fcda9c52630ed394b0c75da8bd0ab4d43099125
+++ packages/webkit/files/WebKit.pro dd444c86e92aeb8c404efbd945a61ec54293c346
@@ -1,16 +1,11 @@ SUBDIRS += \
TEMPLATE = subdirs
CONFIG += ordered
!gtk-port:CONFIG += qt-port
qt-port:!win32-*:SUBDIRS += WebKit/qt/Plugins
SUBDIRS += \
- WebCore \
- JavaScriptCore/kjs/testkjs.pro
+ WebCore
-qt-port {
- SUBDIRS += WebKit/qt/QtLauncher
-
- !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
-}
-
+qt-port:SUBDIRS += \
+ WebKit/qt/QtLauncher
gtk-port:SUBDIRS += \
WebKitTools/GtkLauncher
============================================================
--- packages/webkit/webkit-gtk_svn.bb 1bdedb776717ed3d1b2512c2e784c47970489c45
+++ packages/webkit/webkit-gtk_svn.bb 84963a3b5a31a26c3902cc1010efa9df33f746a5
@@ -1,43 +1,14 @@
-DEPENDS = "flex-native gperf-native gperf perl-native curl icu libxml2 sqlite3 cairo libxslt libidn gnutls gtk+"
-SRCREV_FORMAT = "webcore-rwebkit"
+DEPENDS = "curl icu libxml2 cairo libxslt libidn gnutls gtk+"
-# Yes, this is wrong...
-PV = "0.0+svnr${SRCREV}"
-PR = "r1"
+WEBKIT_PORT = "gtk-port"
+WEBKIT_EXTRA_OPTIONS = "CONFIG-=qt"
+PACKAGES =+ "webkit-gtklauncher-dbg webkit-gtklauncher"
-inherit qmake2 pkgconfig
+FILES_webkit-gtklauncher = "${bindir}/GtkLauncher"
+FILES_webkit-gtklauncher-dbg = "${bindir}/.debug/GtkLauncher"
-SRC_URI = "\
- svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
- svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptGlue;proto=http \
- svn://svn.webkit.org/repository/webkit/trunk/;module=WebCore;proto=http;name=webcore \
- svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http;name=webkit \
- svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \
-# svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitQt;proto=http \
- svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \
- file://Makefile \
- file://Makefile.shared \
- file://WebKit.pri \
- file://WebKit.pro \
-"
-S = "${WORKDIR}/"
+require webkit.inc
-do_configure() {
- qmake2 -spec ${QMAKESPEC} CONFIG+=gtk-port CONFIG-=qt CONFIG-=release CONFIG+=debug
- mkdir -p WebKitBuilds/Debug
- cd WebKitBuilds/Debug
- PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gtk-port $PWD/../../WebKit.pro \
- WEBKIT_INC_DIR=${prefix}/include WEBKIT_LIB_DIR=${libdir}
-}
-
-do_compile_prepend() {
- mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
- cd ${S}/JavaScriptCore/pcre
- ${BUILD_CC} dftables.c -o dftables -I. -I../wtf
- cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
- cd ${S}/WebKitBuilds/Debug
-}
-
do_install() {
install -d ${D}${bindir}
install -d ${D}${libdir}
@@ -45,22 +16,7 @@ do_install() {
install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GtkLauncher/GtkLauncher ${D}${bindir}
cd ${S}/WebKitBuilds/Debug
- PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gtk-port $PWD/../../WebKit.pro \
- WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir}
+ PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir} $PWD/../../WebKit.pro
oe_runmake install
}
-do_stage() {
- install -d ${STAGING_LIBDIR}
- install -d ${STAGING_INCDIR}
- cd ${S}/WebKitBuilds/Debug
- PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gtk-port $PWD/../../WebKit.pro \
- WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR}
- oe_runmake install
-}
-
-
-PACKAGES =+ "webkit-gtklauncher-dbg webkit-gtklauncher"
-
-FILES_webkit-gtklauncher = "${bindir}/GtkLauncher"
-FILES_webkit-gtklauncher-dbg = "${bindir}/.debug/GtkLauncher"
More information about the Openembedded-commits
mailing list