convert the qwt bindings for python to use the sip and qmake oeclasses

BKrev: 40a7e265kI_9nVQWTc5xfQJdpX2aOA

2 files changed, 29 insertions, 59 deletions

diff --git a/python/python-pyqt_3.11.oe b/python/python-pyqt_3.11.oe
index 825be676bf..68ce59bb44 100644
--- a/python/python-pyqt_3.11.oe
+++ b/python/python-pyqt_3.11.oe
@@ -10,19 +10,14 @@ SRCNAME = "pyqt"
 PR = "2"
 
 SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz"
-
 S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
 
 inherit qmake sip
 
 QMAKE_PROFILES = "pyqt.pro"
-
 EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1"
-
 SIP_MODULES = "qt qtcanvas qttable qtpe"
-
 SIP_FEATURES = "${FILESDIR}/features"
-
 EXTRA_OEMAKE = " MAKEFLAGS= "
 
 EXTRA_QMAKEVARS_POST = " QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, \
diff --git a/python/python-pyqwt_3.10.oe b/python/python-pyqwt_3.10.oe
index 3cad604a7d..32a295003c 100644
--- a/python/python-pyqwt_3.10.oe
+++ b/python/python-pyqwt_3.10.oe
@@ -1,10 +1,10 @@
 DESCRIPTION = "Python QWT Bindings"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 RDEPENDS = "python-core python-pyqt (${PV}) python-numeric qwt"
-DEPENDS = "virtual/libc virtual/libqte2 python-numeric python-pyqt qwt"
+DEPENDS = "virtual/libqte2 python-numeric python-pyqt qwt"
 SRCNAME = "pyqwt"
 
 SRC_URI = "http://pyqwt.sourceforge.net/snapshot/PyQwt-20040118.tar.gz \
@@ -12,82 +12,57 @@ SRC_URI = "http://pyqwt.sourceforge.net/snapshot/PyQwt-20040118.tar.gz \
            file://${FILESDIR}/qtmod-sip-staging.patch;patch=1"
 S = "${WORKDIR}/PyQwt-20040118"
 
-#
-# FIXME - This should be updated to use OE's qmake-base.oeclass
-#         or the full qmake.oeclass.
-#
+inherit qmake sip
 
-export QTDIR = "${STAGING_LIBDIR}/.."
+QMAKE_PROFILES = "pyqwt.pro"
+EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1"
+SIP_MODULES = "qwt"
+SIP_FEATURES = "${FILESDIR}/features"   
+EXTRA_OEMAKE = " MAKEFLAGS= "
 
 EXTRA_QMAKEVARS_POST = " QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, \
                          CONFIG=qte CONFIG+=warn_on CONFIG+=release \
-                         DESTDIR=${STAGING_LIBDIR}/python2.3/site-packages \
-                         DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT DEFINES+=HAS_NUMERIC \
+                         TARGET=cmodule DESTDIR= VERSION=1.0.0 \
+                         DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT DEFINES+=HAS_NUMERIC DEFINES+=QWS \
                          INCLUDEPATH=. INCLUDEPATH+=../numpy \
                          INCLUDEPATH+=${STAGING_INCDIR}/python2.3 \
                          INCLUDEPATH+=${STAGING_INCDIR}/ \
                          LIBS=-L${STAGING_LIBDIR}/python2.3/site-packages \
                          LIBS+=-L${STAGING_LIBDIR} LIBS+=-lqte LIBS+=-lqpe LIBS+=-lsip "
 
-PYTHON = "${STAGING_BINDIR}/python"
-SIP = "${STAGING_BINDIR}/sip"
-QMAKE = "${STAGING_BINDIR}/qmake"
-QMAKESPEC = "${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++"
-
-MODULES = "qwt"
-
-do_configure_prepend() {
-    echo "%Makefile qwt.pro" >>sip/qwtmod.sip
+do_generate_prepend() {
+    echo -e "TEMPLATE=subdirs\nSUBDIRS=qwt\n" >pyqwt.pro
+    
+    echo "%Makefile qwt.pro.in" >>sip/qwtmod.sip
     echo "TEMPLATE=lib" >>sip/qwtmod.sip
     echo 'SOURCES = $B' >>sip/qwtmod.sip
     echo 'HEADERS = $H' >>sip/qwtmod.sip
     echo "%End" >>sip/qwtmod.sip
-}
-
-#%Makefile qwt.pro
-#TEMPLATE = lib
-#TARGET = @BLX_TARGET_LIB@
-#DESTDIR = @PYQT_MODDIR@
-#CONFIG += @BLX_CONFIG_LIB@ @PYQT_WARN@
-#INCLUDEPATH = @BLX_INCLUDEPATH@
-#DEFINES = @BLX_DEFINES@
-#LIBS += @PYQT_QASSISTANTCLIENT_LIB@ @BLX_LIBS@
-#macx:QMAKE_LFLAGS += -framework Python
-#SOURCES = $B
-#HEADERS = $H
-#%End
-
-do_configure() {
-    for module in ${MODULES}
-    do
-        mkdir -p ${module}
-        ${SIP} -Isip -I${STAGING_SIPDIR} -tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1 -z${FILESDIR}/features -c ${module} -m ${module}.pro sip/${module}mod.sip
-        mv -f ${module}.pro ${module}/${module}.pro
-    done
 
-    for module in ${MODULES}
-    do
-        cd ${S}/${module}
-        ${QMAKE} -spec ${QMAKESPEC} -after TARGET=${module}cmodule ${EXTRA_QMAKEVARS_POST}
-    done
+    mkdir sip/qwt/
+    mv sip/*.* sip/qwt/
 }
 
-do_compile() {
-    for module in ${MODULES}
+do_stage() {
+    install -d ${STAGING_SIPDIR}
+    for module in ${SIP_MODULES}
     do
-        cd ${S}/${module}
-        oe_runmake
+        cp -a ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/
+        install -m 0755 ${module}/libcmodule.so ${STAGING_LIBDIR}/python2.3/site-packages/lib${module}cmodule.so
     done
 }
 
 do_install() {
-    install -d ${D}/${libdir}/python2.3/site-packages/qwt
-    install -m 0644 ${S}/qwt/*.py ${D}/${libdir}/python2.3/site-packages/qwt/ 
-    for module in ${MODULES}
+    install -d ${D}/${libdir}/python2.3/site-packages/
+    oe_libinstall -so -C ${STAGING_LIBDIR}/python2.3/site-packages libsip ${D}/${libdir}/python2.3/site-packages
+    for module in ${SIP_MODULES}
     do
-        oe_libinstall -so -C ${STAGING_LIBDIR}/python2.3/site-packages lib${module}cmodule ${D}/${libdir}/python2.3/site-packages/
+        install -m 0755 ${module}/libcmodule.so ${D}/${libdir}/python2.3/site-packages/lib${module}cmodule.so
+#        install -m 0644 ${module}/${module}.py ${D}/${libdir}/python2.3/site-packages/
     done
+
+    install -d ${D}/${libdir}/python2.3/site-packages/qwt
+    install -m 0644 ${S}/qwt/*.py ${D}/${libdir}/python2.3/site-packages/qwt/
 }
 
-FILES_${PN} = ""
 FILES_${PN} = "/usr/lib/python2.3/site-packages"