Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/27 19:08:24+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2004/12/27 20:08:50+01:00 handhelds.org!zecke
Fix Compilation of libopie:
	Install private pim headers into staging include directory to allow compilation

2004/12/27 19:07:16+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2004/12/27 19:05:52+00:00 nexus.co.uk!pb
minimo.png is also in ${WORKDIR}, not ${S}

2004/12/27 19:55:50+01:00 handhelds.org!CoreDump
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/mhentges/OpenEmbedded/bitbake/openembedded

2004/12/27 19:55:41+01:00 handhelds.org!CoreDump
opie-backgammon: fix packaging of pics and binary

2004/12/27 18:53:14+00:00 nexus.co.uk!pb
minimo.desktop is in ${WORKDIR}, not ${S}

BKrev: 41d06518xh9jnVevYfiiB9bpSgdmDA

4 files changed, 122 insertions, 2 deletions

diff --git a/packages/libopie/libopie2_1.1.8.bb b/packages/libopie/libopie2_1.1.8.bb
index e69de29bb2..669fd5d1fc 100644
--- a/packages/libopie/libopie2_1.1.8.bb
+++ b/packages/libopie/libopie2_1.1.8.bb
@@ -0,0 +1,82 @@
+DESCRIPTION = "Base libraries for the Open Palmtop Integrated Environment"
+HOMEPAGE = "http://opie.handhelds.org"
+SECTION = "opie/libs"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "LGPL"
+I18N_FILES = "libopiecore2.ts libopiesecurity2.ts"
+DEPENDS = "libqpe-opie sqlite3 libpcap"
+PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2 "
+PR = "r3"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
+           file://include.pro"
+S = "${WORKDIR}/libopie2"
+
+inherit opie
+
+#FIXME: Add machine specific bits here. Best use oe_machinstall and read from a given file
+
+EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \
+                        DEFINES+="OPIE_SOUND_FRAGMENT_SHIFT=16" \
+			DEFINES+=OPIE_NO_ERASE_RECT_HACKFIX \
+			LIBS+=-L${S} LIBS+="-Wl,-rpath-link,${S}"'
+
+EXTRA_QMAKEVARS_PRE = 'ENABLE_SQL_PIM_BACKEND=y'
+
+# uclibc doesn't have backtrace()
+python __anonymous () {
+    import bb, re
+    if (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None):
+        bb.data.setVar("EXTRA_QMAKEVARS_POST_append", " DEFINES+=OPIE_NO_BACKTRACE ", d)
+}
+
+do_compile() {
+	install -d ${STAGING_INCDIR}/opie2
+	install -d ${STAGING_INCDIR}/opie2/private
+	for i in `find . -name "*.h"`
+	do
+		install -m 0644 $i ${STAGING_INCDIR}/opie2/`basename $i`
+	done
+	
+	for i in opimcontactsortvector.h opimoccurrence_p.h opimsortvector.h opimtodosortvector.h vobject_p.h
+	do
+		install -m 0644 opiepim/private/$i ${STAGING_INCDIR}/opie2/private/	
+	done
+	
+	oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic DESTDIR=${S}
+}
+
+LIBS = "core2 ui2 db2 mm2 net2 pim2 security2"
+
+# need some special case for uic-created header files here
+do_stage() {
+        for f in ${LIBS}
+	do
+		oe_libinstall -so libopie$f ${STAGING_LIBDIR}/
+	done
+
+	install -m 0644 ${WORKDIR}/include.pro ${OPIEDIR}/
+	install -m 0644 opiepim/ui/opimrecurrencebase.h ${STAGING_INCDIR}/opie2/
+	install -m 0644 opieui/otimepickerbase.h ${STAGING_INCDIR}/opie2/
+	install -m 0644 opiepim/core/opimtemplatebase.h ${STAGING_INCDIR}/opie2/
+}
+
+do_install() {
+	install -d ${D}/${palmtopdir}/lib
+	for f in ${LIBS}
+	do
+		oe_libinstall -so libopie$f ${D}/${palmtopdir}/lib
+	done
+}
+
+PACKAGES = "libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2"
+FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so*"
+FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so*"
+FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so*"
+FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so*"
+FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so*"
+FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so*"
+FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so*"
+
+#FIXME: Add individual package descriptions and dependencies
diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb
index 5f5b6bb651..6f7f8ae637 100644
--- a/packages/mozilla/minimo_cvs.bb
+++ b/packages/mozilla/minimo_cvs.bb
@@ -62,9 +62,9 @@ do_install () {
 	cp -rL $MOZ_OBJDIR/dist/Embed/* ${mozdir}/
 	rm -f ${mozdir}/TestGtkEmbed
 	mkdir -p ${D}/${datadir}/applications
-	install -m 0644 ${S}/minimo.desktop ${D}/${datadir}/applications/minimo.desktop
+	install -m 0644 ${WORKDIR}/minimo.desktop ${D}/${datadir}/applications/minimo.desktop
 	mkdir -p ${D}/${datadir}/pixmaps
-	install -m 0644 ${S}/minimo.png ${D}/${datadir}/pixmaps/minimo.png
+	install -m 0644 ${WORKDIR}/minimo.png ${D}/${datadir}/pixmaps/minimo.png
 	mkdir -p ${D}/${bindir}
 	echo "#!/bin/sh" > ${D}/${bindir}/minimo
 	cat >>${D}/${bindir}/minimo << EOF
diff --git a/packages/opie-backgammon/opie-backgammon_1.1.8.bb b/packages/opie-backgammon/opie-backgammon_1.1.8.bb
index e69de29bb2..0577a9f6aa 100644
--- a/packages/opie-backgammon/opie-backgammon_1.1.8.bb
+++ b/packages/opie-backgammon/opie-backgammon_1.1.8.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Backgammon Game"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+
+APPNAME = "backgammon"
+APPTYPE = "binary"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/backgammon \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+# FILES plugins/application/libbackgammon.so* bin/backgammon apps/Games/backgammon.desktop pics/backgammon help/en/html/backgammon.html
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	
+	for dir in boards dice odds pieces table
+	do
+		install -d ${D}${palmtopdir}/pics/${APPNAME}/$dir
+		install -m 644 ${WORKDIR}/pics/${APPNAME}/$dir/*.png ${D}${palmtopdir}/pics/${APPNAME}/$dir
+	done
+		
+}
+
diff --git a/packages/opie-backgammon/opie-backgammon_cvs.bb b/packages/opie-backgammon/opie-backgammon_cvs.bb
index 57af5b86f5..174a73aa59 100644
--- a/packages/opie-backgammon/opie-backgammon_cvs.bb
+++ b/packages/opie-backgammon/opie-backgammon_cvs.bb
@@ -5,6 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 PV = "1.1.8+cvs-${CVSDATE}"
 APPNAME = "backgammon"
+APPTYPE = "binary"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/backgammon \
            ${HANDHELDS_CVS};module=opie/pics \
@@ -18,5 +19,11 @@ inherit opie
 do_install() {
         install -d ${D}${palmtopdir}/pics/${APPNAME}/
         install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+
+	for dir in boards dice odds pieces table
+	do
+		install -d ${D}${palmtopdir}/pics/${APPNAME}/$dir
+		install -m 644 ${WORKDIR}/pics/${APPNAME}/$dir/*.png ${D}${palmtopdir}/pics/${APPNAME}/$dir
+	done	
 }