aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-05-24 13:46:43 -0700
committerHenning Heinold <heinold@inf.fu-berlin.de>2013-09-29 21:51:08 +0200
commit311b292972533ab5be8f21dcd527db44afa4954a (patch)
treeed2581b9c8797bc2c48a64e6009c9b642aaecd8b
parent9406a34197e0d116bdfcf451f90112b67796455c (diff)
downloadmeta-java-311b292972533ab5be8f21dcd527db44afa4954a.tar.gz
meta-java-311b292972533ab5be8f21dcd527db44afa4954a.tar.bz2
meta-java-311b292972533ab5be8f21dcd527db44afa4954a.zip
junit: Fix build when rebuilding from same tree
use -o option to unzip to overwrite the classes it fails otherwise when unpack build step is reexecuted again There is no need to specify bootclasspath now Add unzip-native to dependency Fix fastjar commandline order Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--recipes-core/junit/junit_3.8.2.bb11
1 files changed, 6 insertions, 5 deletions
diff --git a/recipes-core/junit/junit_3.8.2.bb b/recipes-core/junit/junit_3.8.2.bb
index f92440f..bae022d 100644
--- a/recipes-core/junit/junit_3.8.2.bb
+++ b/recipes-core/junit/junit_3.8.2.bb
@@ -9,16 +9,17 @@ SRC_URI = "http://downloads.sourceforge.net/junit/junit${PV}.zip"
S = "${WORKDIR}/junit${PV}"
+DEPENDS += "unzip-native"
+
inherit java-library
do_unpackpost() {
mkdir -p src
-
# Prevent deletion by do_removebinaries.
if [ -e src.jar ]; then
mv src.jar src.zip
fi
- unzip src.zip -d src
+ unzip -o src.zip -d src
}
addtask unpackpost before do_removebinaries after do_unpack
@@ -27,11 +28,11 @@ do_compile() {
mkdir -p build
# Workaround for jamvm.
- bcp=${STAGING_DATADIR_NATIVE}/classpath/glibj.zip
+ #bcp=${STAGING_DATADIR_NATIVE}/classpath/glibj.zip
- javac -bootclasspath $bcp -sourcepath src -d build `find src -name "*.java"`
+ javac -sourcepath src -d build `find src -name "*.java"`
- fastjar -C build -c -f ${JARFILENAME} .
+ fastjar cf ${JARFILENAME} -C build .
}
SRC_URI[md5sum] = "9b8963ba2147a64bd5f1574b6fd289cb"