[oe-commits] org.oe.dev xapian: commit my latest work on xapian-quickindex. partly closes 3711.

[Laibsch commit]

xapian: commit my latest work on xapian-quickindex.  partly closes 3711.
* xapian-quickindex looks like a good candidate for creating an offline wikipedia.

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: a858865489e9e014f299d9caaa2c9ce237ec87ac
ViewMTN: http://monotone.openembedded.org/revision/info/a858865489e9e014f299d9caaa2c9ce237ec87ac
Files:
1
packages/xapian/xapian-quickstartindex_1.0.bb
packages/xapian/xapian-quickstart.inc
packages/xapian/xapian-core-native_1.0.5.bb
packages/xapian/xapian-quickstartindex-native_1.0.bb
packages/xapian/xapian-quickstartsearch_1.0.bb
Diffs:

#
# mt diff -r42aeb6cf89b649d5a016a09ae349681bf15e9d83 -ra858865489e9e014f299d9caaa2c9ce237ec87ac
#
#
#
# rename "packages/xapian/xapian-quickstartindex_1.0.bb"
#     to "packages/xapian/xapian-quickstart.inc"
# 
# add_file "packages/xapian/xapian-core-native_1.0.5.bb"
#  content [f53f0f3d23a4986dd1f3b808b4b7a7a4acea202c]
# 
# add_file "packages/xapian/xapian-quickstartindex-native_1.0.bb"
#  content [d07b07ae26ee893e4a8fbc8401c86a23920792a3]
# 
# add_file "packages/xapian/xapian-quickstartindex_1.0.bb"
#  content [503ae28911dc24fe53a2bcf189638f089205b4c9]
# 
# add_file "packages/xapian/xapian-quickstartsearch_1.0.bb"
#  content [c1a70c8535df3383bcc91c64ecfbe94ef458d3fd]
# 
# patch "packages/xapian/xapian-quickstart.inc"
#  from [1c7028dd7343e73e3fcc0fe3750699b578adb9d9]
#    to [3ada22f1aec5b46950e441445b902e7e7fc06a12]
#
============================================================
--- packages/xapian/xapian-core-native_1.0.5.bb	f53f0f3d23a4986dd1f3b808b4b7a7a4acea202c
+++ packages/xapian/xapian-core-native_1.0.5.bb	f53f0f3d23a4986dd1f3b808b4b7a7a4acea202c
@@ -0,0 +1,5 @@
+require xapian-core_${PV}.bb
+
+inherit native
+
+S = "${WORKDIR}/xapian-core-${PV}"
============================================================
--- packages/xapian/xapian-quickstartindex-native_1.0.bb	d07b07ae26ee893e4a8fbc8401c86a23920792a3
+++ packages/xapian/xapian-quickstartindex-native_1.0.bb	d07b07ae26ee893e4a8fbc8401c86a23920792a3
@@ -0,0 +1,9 @@
+require xapian-quickstartindex_${PV}.bb
+
+DEPENDS = "xapian-core-native"
+
+inherit native
+
+do_stage() {
+        install -m 0744 ${WORKDIR}/${BINARY_NAME} ${STAGING_BINDIR}
+}
============================================================
--- packages/xapian/xapian-quickstartindex_1.0.bb	503ae28911dc24fe53a2bcf189638f089205b4c9
+++ packages/xapian/xapian-quickstartindex_1.0.bb	503ae28911dc24fe53a2bcf189638f089205b4c9
@@ -0,0 +1,4 @@
+require xapian-quickstart.inc
+
+DESCRIPTION += "This package provides the tool for creating the index."
+PR = "r1"
============================================================
--- packages/xapian/xapian-quickstartsearch_1.0.bb	c1a70c8535df3383bcc91c64ecfbe94ef458d3fd
+++ packages/xapian/xapian-quickstartsearch_1.0.bb	c1a70c8535df3383bcc91c64ecfbe94ef458d3fd
@@ -0,0 +1,4 @@
+require xapian-quickstart.inc
+
+DESCRIPTION += "This package provides the tool for searching the index."
+PR = "r1"
============================================================
--- packages/xapian/xapian-quickstartindex_1.0.bb	1c7028dd7343e73e3fcc0fe3750699b578adb9d9
+++ packages/xapian/xapian-quickstart.inc	3ada22f1aec5b46950e441445b902e7e7fc06a12
@@ -1,18 +1,20 @@
-DESCRIPTION = "Simplest possible indexer (from older release of xapian)"
+DESCRIPTION = "Simplest possible indexer (from an older release of xapian)."
 HOMEPAGE = "http://users.softlab.ece.ntua.gr/~ttsiod/buildWikipediaOffline.html"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "xapian-core"
-PR = "r0"
 
-SRC_URI = "http://users.softlab.ece.ntua.gr/~ttsiod/quickstartindex.cc"
+BINARY_NAME = ${@bb.data.getVar("PN",d,1).replace("xapian-","").replace("-native","")}
 S = "${WORKDIR}"
 
+SRC_URI = "http://users.softlab.ece.ntua.gr/~ttsiod/${BINARY_NAME}.cc"
+
 do_compile() {
-        ${CXX} ${CXXLAGS} ${LDFLAGS} -lxapian -o quickstartindex quickstartindex.cc
+        ${CXX} ${CXXLAGS} ${LDFLAGS} -I${STAGING_INCDIR_NATIVE} -lxapian -o ${BINARY_NAME} ${BINARY_NAME}.cc
 }
 
 do_install() {
+        install -d ${D}$
         install -d ${D}${bindir}
-        install -m 0755 ${WORKDIR}/quickstartindex ${D}${bindir}/
+        install -m 0755 ${WORKDIR}/${BINARY_NAME} ${D}${bindir}/
 }