[oe-commits] org.oe.dev packages/qsvn: Experiment with building the same source in different variants

[freyther commit]

packages/qsvn: Experiment with building the same source in different variants
    Experiment with having the same source build with different versions of
    the underlying toolkit. In the best case we want to be installable in parallel.

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: e9f582e5e08c174853b6324563c31ae156551b09
ViewMTN: http://monotone.openembedded.org/revision/info/e9f582e5e08c174853b6324563c31ae156551b09
Files:
1
packages/qsvn/qsvn_0.3.0.bb
packages/qsvn/qsvn.inc
packages/qsvn/qsvn-qte_0.3.0.bb
Diffs:

#
# mt diff -rfbd86972fdbb72808c12ac67d8903695443fb97d -re9f582e5e08c174853b6324563c31ae156551b09
#
# 
# 
# rename "packages/qsvn/qsvn_0.3.0.bb"
#     to "packages/qsvn/qsvn.inc"
# 
# add_file "packages/qsvn/qsvn-qte_0.3.0.bb"
#  content [d9cdc09b1d3e017a6b2821f8180b95dfe62f5817]
# 
# add_file "packages/qsvn/qsvn_0.3.0.bb"
#  content [c32f3453f2b09b0fab088f8ea9887bb69ad7f912]
# 
# patch "packages/qsvn/qsvn.inc"
#  from [81f5fd5e5a7d33ff503495f7254a9ae123bacac7]
#    to [70f0237005aa91b4c2e2b8313afba489dccefc6e]
# 
============================================================
--- packages/qsvn/qsvn-qte_0.3.0.bb	d9cdc09b1d3e017a6b2821f8180b95dfe62f5817
+++ packages/qsvn/qsvn-qte_0.3.0.bb	d9cdc09b1d3e017a6b2821f8180b95dfe62f5817
@@ -0,0 +1,3 @@
+require qsvn.inc
+FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qsvn"
+inherit qtopia4core
============================================================
--- packages/qsvn/qsvn_0.3.0.bb	c32f3453f2b09b0fab088f8ea9887bb69ad7f912
+++ packages/qsvn/qsvn_0.3.0.bb	c32f3453f2b09b0fab088f8ea9887bb69ad7f912
@@ -0,0 +1,2 @@
+require qsvn.inc
+inherit qt4x11
============================================================
--- packages/qsvn/qsvn_0.3.0.bb	81f5fd5e5a7d33ff503495f7254a9ae123bacac7
+++ packages/qsvn/qsvn.inc	70f0237005aa91b4c2e2b8313afba489dccefc6e
@@ -9,12 +9,11 @@ SRC_URI = "http://download2.berlios.de/q
 
 SRC_URI = "http://download2.berlios.de/qsvn/qsvn-${PV}-src.tar.gz \
         file://build.patch;patch=1"
+S = "${WORKDIR}/qsvn-${PV}"
 
-inherit qt4x11
-
 EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/subversion-1"
 
 do_install() {
 	install -d ${D}${bindir}
-	install -m 0755 bin/qsvn ${D}${bindir}
+	install -m 0755 bin/qsvn ${D}${bindir}/${PN}
 }