From dc42af0846fb690ef79471af9690597cad1257e4 Mon Sep 17 00:00:00 2001
From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Mon, 19 Mar 2012 00:18:02 +0100
Subject: ecj-bootstrap: rework javac script and bump PR

---
 recipes-core/ecj/ecj-bootstrap-native.bb |  1 +
 recipes-core/ecj/files/ecj.in            | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/recipes-core/ecj/ecj-bootstrap-native.bb b/recipes-core/ecj/ecj-bootstrap-native.bb
index df05be5..dded41b 100644
--- a/recipes-core/ecj/ecj-bootstrap-native.bb
+++ b/recipes-core/ecj/ecj-bootstrap-native.bb
@@ -10,6 +10,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \
                    "
+PR = "r1"
 
 DEPENDS = "libecj-bootstrap virtual/java-native"
 
diff --git a/recipes-core/ecj/files/ecj.in b/recipes-core/ecj/files/ecj.in
index 30c3862..e054f24 100755
--- a/recipes-core/ecj/files/ecj.in
+++ b/recipes-core/ecj/files/ecj.in
@@ -1,12 +1,18 @@
-error_counter=0;
-error_occured=139
-while [ ${error_counter} -le 50 -a ${error_occured} -eq 139 ]; do
+error_counter=1
+error_max=21
+error_occured=true
+error_number=0
+while [ ${error_counter} -le ${error_max} -a ${error_occured} == true ]; do
     ${RUNTIME} -Xmx1024m -cp ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main ${1+"$@"}
-    error_occured=$?
-    if [ ${error_occured} -eq 139 ]; then
-        echo "ecj crashed - silently trying again"
+    error_number=$?
+    if [ ${error_number} -eq 139 -o ${error_number} -eq 134 ]; then
+        echo "ecj crashed ${error_counter} - silently trying again"
+        error_occured=true
         error_counter=$(( $error_counter + 1 ))
+    else
+        error_occured=false
     fi
 done
 
-exit ${error_occured}
+exit ${error_number}
+
-- 
cgit v1.2.3-54-g00ecf