webkit: rename to webkit-gtk

diff --git a/packages/webkit/files/.mtn2git_empty b/packages/webkit/files/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/webkit/files/Makefile b/packages/webkit/files/Makefile
new file mode 100644 (file)
index 0000000..89344f7
--- /dev/null
+++ b/packages/webkit/files/Makefile
@@ -0,0 +1,22 @@
+MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
+
+all:
+       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+
+debug d development dev develop:
+       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+       
+release r deployment dep deploy:
+       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+       
+universal u:
+       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+
+clean:
+       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+

diff --git a/packages/webkit/files/Makefile.shared b/packages/webkit/files/Makefile.shared
new file mode 100644 (file)
index 0000000..a036aac
--- /dev/null
+++ b/packages/webkit/files/Makefile.shared
@@ -0,0 +1,21 @@
+SCRIPTS_PATH ?= ../WebKitTools/Scripts
+XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
+
+all:
+       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
+
+debug d development dev develop: force
+       $(SCRIPTS_PATH)/set-webkit-configuration --debug
+       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
+
+release r deployment dep deploy: force
+       $(SCRIPTS_PATH)/set-webkit-configuration --release
+       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
+
+universal u: force
+       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} )
+
+clean:
+       ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
+
+force: ;

diff --git a/packages/webkit/files/WebKit.pri b/packages/webkit/files/WebKit.pri
new file mode 100644 (file)
index 0000000..0375102
--- /dev/null
+++ b/packages/webkit/files/WebKit.pri
@@ -0,0 +1,61 @@
+# Include file to make it easy to include WebKit into Qt projects
+
+
+isEmpty(OUTPUT_DIR) {
+    CONFIG(release):OUTPUT_DIR=$$PWD/WebKitBuild/Release
+    CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug
+}
+
+!gdk-port:CONFIG += qt-port
+qt-port:DEFINES += BUILDING_QT__=1
+qt-port:!building-libs:LIBS += -L$$OUTPUT_DIR/lib -lQtWebKit
+gdk-port:CONFIG += link_pkgconfig
+gdk-port:PKGCONFIG += cairo gdk-2.0 gtk+-2.0 libcurl
+gdk-port:DEFINES += BUILDING_GDK__=1 BUILDING_CAIRO__
+gdk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGdk $$system(icu-config --ldflags) -ljpeg -lpng -lcurl
+gdk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
+
+DEFINES += USE_SYSTEM_MALLOC
+CONFIG(release) {
+    DEFINES += NDEBUG
+}
+
+BASE_DIR = $$PWD
+qt-port:INCLUDEPATH += \
+    $$PWD/WebKitQt/Api
+gdk-port:INCLUDEPATH += \
+    $$BASE_DIR/WebCore/platform/gdk \
+    $$BASE_DIR/WebCore/platform/network/curl \
+    $$BASE_DIR/WebCore/platform/graphics/cairo \
+    $$BASE_DIR/WebCore/loader/gdk \
+    $$BASE_DIR/WebCore/page/gdk \
+    $$BASE_DIR/WebKit/gtk/Api \
+    $$BASE_DIR/WebKit/gtk/WebCoreSupport
+INCLUDEPATH += \
+    $$BASE_DIR/JavaScriptCore/ \
+    $$BASE_DIR/JavaScriptCore/kjs \
+    $$BASE_DIR/JavaScriptCore/bindings \
+    $$BASE_DIR/JavaScriptCore/bindings/c \
+    $$BASE_DIR/JavaScriptCore/wtf \
+    $$BASE_DIR/JavaScriptCore/ForwardingHeaders \
+    $$BASE_DIR/WebCore \
+    $$BASE_DIR/WebCore/ForwardingHeaders \
+    $$BASE_DIR/WebCore/platform \
+    $$BASE_DIR/WebCore/platform/network \
+    $$BASE_DIR/WebCore/platform/graphics \
+    $$BASE_DIR/WebCore/loader \
+    $$BASE_DIR/WebCore/page \
+    $$BASE_DIR/WebCore/css \
+    $$BASE_DIR/WebCore/dom \
+    $$BASE_DIR/WebCore/bridge \
+    $$BASE_DIR/WebCore/editing \
+    $$BASE_DIR/WebCore/rendering \
+    $$BASE_DIR/WebCore/history \
+    $$BASE_DIR/WebCore/xml \
+    $$BASE_DIR/WebCore/html
+
+
+macx {
+       INCLUDEPATH += /usr/include/libxml2
+       LIBS += -lxml2 -lxslt
+}

diff --git a/packages/webkit/files/WebKit.pro b/packages/webkit/files/WebKit.pro
new file mode 100644 (file)
index 0000000..335d11e
--- /dev/null
+++ b/packages/webkit/files/WebKit.pro
@@ -0,0 +1,13 @@
+TEMPLATE = subdirs
+CONFIG += ordered
+!gdk-port:CONFIG += qt-port
+qt-port:SUBDIRS += WebKitQt/Plugins
+SUBDIRS += \
+        WebCore \
+        JavaScriptCore/kjs/testkjs.pro
+
+qt-port:SUBDIRS += \
+        WebKitQt/QtLauncher \
+        WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro
+gdk-port:SUBDIRS += \
+        WebKitTools/GdkLauncher

diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb
new file mode 100644 (file)
index 0000000..8a6480d
--- /dev/null
+++ b/packages/webkit/webkit-gtk_svn.bb
@@ -0,0 +1,64 @@
+DEPENDS = "flex-native gperf-native gperf perl-native curl icu uicmoc4-native qmake2-native libxml2 sqlite3 cairo libxslt libidn gnutls gtk+"
+
+# Yes, this is wrong...
+PV = "0.0+svn${SRCDATE}"
+PR = "r1"
+
+inherit qmake qt4x11 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 \
+  svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http \
+  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}/"
+
+do_configure_append() {
+       qmake2 -spec ${QMAKESPEC} CONFIG+=gdk-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+=gdk-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}
+       install -d ${D}${libdir}/pkgconfig
+
+       install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GdkLauncher/GdkLauncher ${D}${bindir}
+       cd ${S}/WebKitBuilds/Debug
+       PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro \
+      WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir}
+       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+=gdk-port $PWD/../../WebKit.pro \
+      WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR}
+       oe_runmake install
+}
+
+PACKAGES =+ "webkit-gdklauncher-dbg webkit-gdklauncher"
+
+FILES_webkit-gdklauncher = "${bindir}/GdkLauncher"
+FILES_webkit-gdklauncher-dbg = "${bindir}/.debug/GdkLauncher"

diff --git a/packages/webkit/webkit/.mtn2git_empty b/packages/webkit/webkit/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/webkit/webkit/Makefile b/packages/webkit/webkit/Makefile
deleted file mode 100644 (file)
index 89344f7..0000000
--- a/packages/webkit/webkit/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
-
-all:
-       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
-debug d development dev develop:
-       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-       
-release r deployment dep deploy:
-       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-       
-universal u:
-       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
-clean:
-       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-

diff --git a/packages/webkit/webkit/Makefile.shared b/packages/webkit/webkit/Makefile.shared
deleted file mode 100644 (file)
index a036aac..0000000
--- a/packages/webkit/webkit/Makefile.shared
+++ /dev/null
@@ -1,21 +0,0 @@
-SCRIPTS_PATH ?= ../WebKitTools/Scripts
-XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
-
-all:
-       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-debug d development dev develop: force
-       $(SCRIPTS_PATH)/set-webkit-configuration --debug
-       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-release r deployment dep deploy: force
-       $(SCRIPTS_PATH)/set-webkit-configuration --release
-       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-universal u: force
-       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-clean:
-       ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-force: ;

diff --git a/packages/webkit/webkit/WebKit.pri b/packages/webkit/webkit/WebKit.pri
deleted file mode 100644 (file)
index 0375102..0000000
--- a/packages/webkit/webkit/WebKit.pri
+++ /dev/null
@@ -1,61 +0,0 @@
-# Include file to make it easy to include WebKit into Qt projects
-
-
-isEmpty(OUTPUT_DIR) {
-    CONFIG(release):OUTPUT_DIR=$$PWD/WebKitBuild/Release
-    CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug
-}
-
-!gdk-port:CONFIG += qt-port
-qt-port:DEFINES += BUILDING_QT__=1
-qt-port:!building-libs:LIBS += -L$$OUTPUT_DIR/lib -lQtWebKit
-gdk-port:CONFIG += link_pkgconfig
-gdk-port:PKGCONFIG += cairo gdk-2.0 gtk+-2.0 libcurl
-gdk-port:DEFINES += BUILDING_GDK__=1 BUILDING_CAIRO__
-gdk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGdk $$system(icu-config --ldflags) -ljpeg -lpng -lcurl
-gdk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
-
-DEFINES += USE_SYSTEM_MALLOC
-CONFIG(release) {
-    DEFINES += NDEBUG
-}
-
-BASE_DIR = $$PWD
-qt-port:INCLUDEPATH += \
-    $$PWD/WebKitQt/Api
-gdk-port:INCLUDEPATH += \
-    $$BASE_DIR/WebCore/platform/gdk \
-    $$BASE_DIR/WebCore/platform/network/curl \
-    $$BASE_DIR/WebCore/platform/graphics/cairo \
-    $$BASE_DIR/WebCore/loader/gdk \
-    $$BASE_DIR/WebCore/page/gdk \
-    $$BASE_DIR/WebKit/gtk/Api \
-    $$BASE_DIR/WebKit/gtk/WebCoreSupport
-INCLUDEPATH += \
-    $$BASE_DIR/JavaScriptCore/ \
-    $$BASE_DIR/JavaScriptCore/kjs \
-    $$BASE_DIR/JavaScriptCore/bindings \
-    $$BASE_DIR/JavaScriptCore/bindings/c \
-    $$BASE_DIR/JavaScriptCore/wtf \
-    $$BASE_DIR/JavaScriptCore/ForwardingHeaders \
-    $$BASE_DIR/WebCore \
-    $$BASE_DIR/WebCore/ForwardingHeaders \
-    $$BASE_DIR/WebCore/platform \
-    $$BASE_DIR/WebCore/platform/network \
-    $$BASE_DIR/WebCore/platform/graphics \
-    $$BASE_DIR/WebCore/loader \
-    $$BASE_DIR/WebCore/page \
-    $$BASE_DIR/WebCore/css \
-    $$BASE_DIR/WebCore/dom \
-    $$BASE_DIR/WebCore/bridge \
-    $$BASE_DIR/WebCore/editing \
-    $$BASE_DIR/WebCore/rendering \
-    $$BASE_DIR/WebCore/history \
-    $$BASE_DIR/WebCore/xml \
-    $$BASE_DIR/WebCore/html
-
-
-macx {
-       INCLUDEPATH += /usr/include/libxml2
-       LIBS += -lxml2 -lxslt
-}

diff --git a/packages/webkit/webkit/WebKit.pro b/packages/webkit/webkit/WebKit.pro
deleted file mode 100644 (file)
index 335d11e..0000000
--- a/packages/webkit/webkit/WebKit.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE = subdirs
-CONFIG += ordered
-!gdk-port:CONFIG += qt-port
-qt-port:SUBDIRS += WebKitQt/Plugins
-SUBDIRS += \
-        WebCore \
-        JavaScriptCore/kjs/testkjs.pro
-
-qt-port:SUBDIRS += \
-        WebKitQt/QtLauncher \
-        WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro
-gdk-port:SUBDIRS += \
-        WebKitTools/GdkLauncher

diff --git a/packages/webkit/webkit_svn.bb b/packages/webkit/webkit_svn.bb
deleted file mode 100644 (file)
index 8a6480d..0000000
--- a/packages/webkit/webkit_svn.bb
+++ /dev/null
@@ -1,64 +0,0 @@
-DEPENDS = "flex-native gperf-native gperf perl-native curl icu uicmoc4-native qmake2-native libxml2 sqlite3 cairo libxslt libidn gnutls gtk+"
-
-# Yes, this is wrong...
-PV = "0.0+svn${SRCDATE}"
-PR = "r1"
-
-inherit qmake qt4x11 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 \
-  svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http \
-  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}/"
-
-do_configure_append() {
-       qmake2 -spec ${QMAKESPEC} CONFIG+=gdk-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+=gdk-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}
-       install -d ${D}${libdir}/pkgconfig
-
-       install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GdkLauncher/GdkLauncher ${D}${bindir}
-       cd ${S}/WebKitBuilds/Debug
-       PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro \
-      WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir}
-       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+=gdk-port $PWD/../../WebKit.pro \
-      WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR}
-       oe_runmake install
-}
-
-PACKAGES =+ "webkit-gdklauncher-dbg webkit-gdklauncher"
-
-FILES_webkit-gdklauncher = "${bindir}/GdkLauncher"
-FILES_webkit-gdklauncher-dbg = "${bindir}/.debug/GdkLauncher"