aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2012-02-17 22:06:44 +0100
committerHenning Heinold <heinold@inf.fu-berlin.de>2012-02-21 12:32:48 +0100
commit2fd114ae2977202ca2762f6ebb9be9c5d88072e2 (patch)
treee40675e66ed2804175ef56ce77bacff37800ba26
parent47d281af2916c46fa9c31c59a1253e1df54a0c52 (diff)
downloadopenembedded-2fd114ae2977202ca2762f6ebb9be9c5d88072e2.zip
openembedded-2fd114ae2977202ca2762f6ebb9be9c5d88072e2.tar.gz
openembedded-2fd114ae2977202ca2762f6ebb9be9c5d88072e2.tar.bz2
ecj-bootstrap-native: update ecj script
* merge with script from java-initial * bailout after 50 tries
-rw-r--r--recipes/ecj/ecj-bootstrap-native.bb2
-rwxr-xr-xrecipes/ecj/files/ecj.in23
2 files changed, 11 insertions, 14 deletions
diff --git a/recipes/ecj/ecj-bootstrap-native.bb b/recipes/ecj/ecj-bootstrap-native.bb
index a11ba74..72571bf 100644
--- a/recipes/ecj/ecj-bootstrap-native.bb
+++ b/recipes/ecj/ecj-bootstrap-native.bb
@@ -17,7 +17,7 @@ SRC_URI = "file://ecj.in"
S = "${WORKDIR}"
-PR = "r4"
+PR = "r5"
JAR = "ecj-bootstrap.jar"
diff --git a/recipes/ecj/files/ecj.in b/recipes/ecj/files/ecj.in
index f8d97ac..a75c610 100755
--- a/recipes/ecj/files/ecj.in
+++ b/recipes/ecj/files/ecj.in
@@ -1,16 +1,13 @@
-COUNT=5
-END=0
-RETURNCODE=0
+COUNT=50
-while test "${COUNT}" -gt "${END}"
-do
- ${RUNTIME} -Xmx1024m -cp ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main ${1+"$@"}
- RETURNCODE=${?}
- if test "${?}" -eq "${END}"
- then
- break
- fi
- COUNT=$(($COUNT-1))
+redo_from_start=1;
+while [ ${redo_from_start} -eq 1 -a ${COUNT} -gt 0 ]; do
+ redo_from_start=0;
+ ${RUNTIME} -Xmx1024m -cp ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main ${1+"$@"}
+ if [ ${?} -ne 0 ]; then
+ echo "underlying JVM crashed - silently trying again"
+ redo_from_start=1;
+ COUNT=$((${COUNT}-1))
+ fi
done
-exit ${RETURNCODE}