Patchwork make the javac wrapper script pass back the return code

login
register
mail settings
Submitter George Huntington
Date July 8, 2011, 2 p.m.
Message ID <1310133659-22568-1-git-send-email-gchiii@mtiemail.com>
Download mbox | patch
Permalink /patch/7249/
State New, archived
Delegated to: Tom Rini
Headers show

Comments

George Huntington - July 8, 2011, 2 p.m.
this will keep things from failing silently, while
preserving the "try 5 times feature"

Signed-off-by: George C. Huntington III <gchiii@mtiemail.com>
---
 recipes/ecj/ecj-bootstrap-native.bb |    2 +-
 recipes/ecj/files/ecj.in            |    4 ++++
 2 files changed, 5 insertions(+), 1 deletions(-)
George C. Huntington, III - July 18, 2011, 7:06 p.m.
Please cherry-pick this into maintenance branch


On Fri, Jul 8, 2011 at 10:00 AM, George C. Huntington III <
gchiii@mtiemail.com> wrote:

> this will keep things from failing silently, while
> preserving the "try 5 times feature"
>
> Signed-off-by: George C. Huntington III <gchiii@mtiemail.com>
> ---
>  recipes/ecj/ecj-bootstrap-native.bb |    2 +-
>  recipes/ecj/files/ecj.in            |    4 ++++
>  2 files changed, 5 insertions(+), 1 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 0fd4a65..66f4851 100755
> --- a/recipes/ecj/files/ecj.in
> +++ b/recipes/ecj/files/ecj.in
> @@ -1,13 +1,17 @@
>  ARGS=${1+"$@"}
>  COUNT=5
>  END=0
> +RETURNCODE=0
>
>  while test "${COUNT}" -gt "${END}"
>  do
>  ${RUNTIME} -Xmx1024m -cp ${ECJ_JAR}
> org.eclipse.jdt.internal.compiler.batch.Main ${ARGS}
> + RETURNCODE=${?}
>  if test "${?}" -eq "${END}"
>  then
>     break
>  fi
>  COUNT=$(($COUNT-1))
>  done
> +
> +exit ${RETURNCODE}
> --
> 1.7.4.1
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Patch

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 0fd4a65..66f4851 100755
--- a/recipes/ecj/files/ecj.in
+++ b/recipes/ecj/files/ecj.in
@@ -1,13 +1,17 @@ 
 ARGS=${1+"$@"}
 COUNT=5
 END=0
+RETURNCODE=0
 
 while test "${COUNT}" -gt "${END}"
 do
  ${RUNTIME} -Xmx1024m -cp ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main ${ARGS}
+ RETURNCODE=${?}
  if test "${?}" -eq "${END}"
  then
     break
  fi
  COUNT=$(($COUNT-1))
 done
+
+exit ${RETURNCODE}