aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Schuster <robertschuster@fsfe.org>2010-02-09 12:29:34 +0100
committerRobert Schuster <robertschuster@fsfe.org>2010-02-09 12:31:17 +0100
commit7951a6b0278c4c108301e929e4001e80b03bc03d (patch)
tree6dc284f19ab1bc2ea44447244daa4b860f91f55b
parent611381226aa6a4c040d1d2580836cf43a85d7df2 (diff)
downloadopenembedded-7951a6b0278c4c108301e929e4001e80b03bc03d.tar.gz
swt-gtk.inc: Removed need for specifying SWTVERSION, now done programmatically.
swt3.4-gtk 3.4.2: Removed SWTVERSION.
-rw-r--r--recipes/swt/swt-gtk.inc11
-rw-r--r--recipes/swt/swt3.4-gtk_3.4.2.bb3
2 files changed, 7 insertions, 7 deletions
diff --git a/recipes/swt/swt-gtk.inc b/recipes/swt/swt-gtk.inc
index 1c26a397c2..aa0f1ee70e 100644
--- a/recipes/swt/swt-gtk.inc
+++ b/recipes/swt/swt-gtk.inc
@@ -10,7 +10,6 @@ S = "${WORKDIR}/swt-source"
# A number which is used by SWT to mark the shared libraries. It can be found
# in the version.txt file inside the source directory.
-SWTVERSION = ${@bb.fatal('SWTVERSION is not defined in this swt-gtk recipe!')}
SWT_API_VERSION = ${@bb.fatal('SWT_API_VERSION is not defined in this swt-gtk recipe!')}
do_unpackpost() {
@@ -37,12 +36,14 @@ do_compile() {
addtask unpackpost after do_unpack before do_patch
do_install() {
+ local swtversion=`cat version.txt | tr -d "version. "`
+
oe_jarinstall swt-gtk-${PV}.jar swt-gtk.jar swt.jar
- oe_libinstall -so libswt-atk-gtk-${SWTVERSION} ${D}/${libdir_jni}
- oe_libinstall -so libswt-cairo-gtk-${SWTVERSION} ${D}/${libdir_jni}
- oe_libinstall -so libswt-pi-gtk-${SWTVERSION} ${D}/${libdir_jni}
- oe_libinstall -so libswt-gtk-${SWTVERSION} ${D}/${libdir_jni}
+ oe_libinstall -so libswt-atk-gtk-$swtversion ${D}/${libdir_jni}
+ oe_libinstall -so libswt-cairo-gtk-$swtversion ${D}/${libdir_jni}
+ oe_libinstall -so libswt-pi-gtk-$swtversion ${D}/${libdir_jni}
+ oe_libinstall -so libswt-gtk-$swtversion ${D}/${libdir_jni}
}
do_stage() {
diff --git a/recipes/swt/swt3.4-gtk_3.4.2.bb b/recipes/swt/swt3.4-gtk_3.4.2.bb
index 6c0a4d41d8..1f9b80f27c 100644
--- a/recipes/swt/swt3.4-gtk_3.4.2.bb
+++ b/recipes/swt/swt3.4-gtk_3.4.2.bb
@@ -1,12 +1,11 @@
require swt-gtk.inc
-PR = "r1"
+PR = "r2"
SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4.2-200902111700/swt-3.4.2-gtk-linux-x86.zip \
file://Makefile"
# A number which is used by SWT to mark the shared libraries.
-SWTVERSION = "3452"
SWT_API_VERSION = "3.4"
PROVIDES = "swt3.4-gtk"