libopie2: remove legacy staging

Use symlinking to provide libopie2 with the appropriate headers at
compile time, and install just the "public" headers at install time.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>

3 files changed, 40 insertions, 36 deletions

diff --git a/recipes/libopie/libopie2.inc b/recipes/libopie/libopie2.inc
index cb15679f8c..e91ac7b6e5 100644
--- a/recipes/libopie/libopie2.inc
+++ b/recipes/libopie/libopie2.inc
@@ -17,7 +17,8 @@ PARALLEL_MAKE = ""
 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}"'
+			LIBS+=-L${S} LIBS+="-Wl,-rpath-link,${S}" \
+			INCLUDEPATH+=${S}/include'
 
 ENABLE_SQL_PIM_BACKEND = "y"
 # NOTE: Machines with too little amount of flash may want to disable SQL backend support
@@ -38,45 +39,56 @@ python __anonymous () {
 }
 
 do_compile() {
-	install -d ${STAGING_INCDIR}/opie2
-	install -d ${STAGING_INCDIR}/opie2/private
-        for module in ${MODULES}
-        do
-            cd $module
-	    for i in `find . -name "*.h"`
-	    do
-		install -m 0644 $i ${STAGING_INCDIR}/opie2/`basename $i`
-	    done
-            cd ..
-        done
+	install -d ${S}/include/opie2
+	for module in ${MODULES}
+	do
+		cd $module
+		for i in `find . -name "*.h"`
+		do
+			filenm=`echo $i | sed 's!^\./!!'`
+			ln -sf ../../$module/$filenm ${S}/include/opie2/
+		done
+		cd ..
+	done
 
+	install -d ${S}/include/opie2/private
 	for header in ${PRIVATE}
 	do
-		install -m 0644 opiepim/private/$header ${STAGING_INCDIR}/opie2/private/
+		ln -sf ../../../opiepim/private/$header ${S}/include/opie2/private
 	done
 
 	oe_runmake MOC=${STAGING_BINDIR_NATIVE}/moc UIC=${STAGING_BINDIR_NATIVE}/uic DESTDIR=${S}
 }
 
-do_stage() {
-        for f in ${LIBS}
-	do
-		oe_libinstall -so libopie$f ${STAGING_LIBDIR}/
-	done
-	install -m 0644 ${WORKDIR}/include.pro ${OPIEDIR}/include.pro
-	# special case for uic-created header files
-	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/
-	install -m 0644 opiepim/ui/opimalarmdlgbase.h ${STAGING_INCDIR}/opie2/
-}
-
 do_install() {
 	install -d ${D}${libdir}
 	for f in ${LIBS}
 	do
 		oe_libinstall -so libopie$f ${D}${libdir}
 	done
+
+	install -m 0644 ${WORKDIR}/include.pro ${OPIEDIR}/include.pro
+
+	install -d ${D}${includedir}/opie2/
+	for module in ${MODULES}
+	do
+		cd $module
+		for i in `find . -name "*.h"`
+		do
+			if [[ $i != ./private/* ]] ; then
+				install -m 0644 $i ${D}${includedir}/opie2/`basename $i`
+			fi
+		done
+		cd ..
+	done
+	# Remove some headers we don't want packaged
+	rm ${D}${includedir}/opie2/stable_pch.h
+	rm ${D}${includedir}/opie2/ofileselector_p.h
+	rm ${D}${includedir}/opie2/okeyconfigwidget_p.h
+	rm ${D}${includedir}/opie2/okeyconfigmanager_p.h
+	rm ${D}${includedir}/opie2/ima_rw.h
+	rm ${D}${includedir}/opie2/udp_ports.h
+	rm ${D}${includedir}/opie2/odevice_*.h
 }
 
 PACKAGES_prepend = " libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2 libopiebluez2 "
diff --git a/recipes/libopie/libopie2_1.2.5.bb b/recipes/libopie/libopie2_1.2.5.bb
index ee9c687b96..79f71dc990 100644
--- a/recipes/libopie/libopie2_1.2.5.bb
+++ b/recipes/libopie/libopie2_1.2.5.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://sources.openembedded.org/opie-1.2.5-split_libopie2.tar.bz2;name=split_libopie2 \
            file://gcc45_opiemm_include.patch \
diff --git a/recipes/libopie/libopie2_cvs.bb b/recipes/libopie/libopie2_cvs.bb
index 671f86e3cb..8ffefe07fd 100644
--- a/recipes/libopie/libopie2_cvs.bb
+++ b/recipes/libopie/libopie2_cvs.bb
@@ -1,20 +1,12 @@
 require ${PN}.inc
 
 PV = "${OPIE_GIT_PV}"
-PR = "r13"
+PR = "r14"
 
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "${OPIE_GIT};protocol=git;subpath=libopie2 \
            file://include.pro"
 
-PRIVATE += " opimmemosortvector.h"
-
 # FIXME remove this!
 SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch"
-
-do_stage_append() {
-        # special case for uic-created header files
-        install -m 0644 opiepim/ui/opimalarmdlgbase.h ${STAGING_INCDIR}/opie2/
-}
-