[oe-commits] Jesse Gilles : classpath in 2011.03-maintenance

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 16a8a1e9175035b55d91a141d5302c38d63c16f1
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=16a8a1e9175035b55d91a141d5302c38d63c16f1

Author: Jesse Gilles <jgilles at multitech.com>
Date:   Tue Aug  9 03:08:35 2011 +0000

classpath in 2011.03-maintenance

On Fri, 2011-08-05 at 11:38 -0400, George C. Huntington, III wrote:
> I posted a patch that makes the wrapper script return the error code
> if it
> fails after 5 retries.  it is on patchwork.
> http://patches.openembedded.org/patch/7249/

It seems like saving the javac script arguments into the ARGS variable
is what broke the old behavior where -bootclasspath '' worked for
building classpath.  Putting that part of the script back to the way it
used to be fixes it.

Do you want to merge this in with your error code return patch?

Otherwise, I can submit it as another patch, but it will depend on yours...

Thanks,
Jesse

---

 recipes/ecj/files/ecj.in |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

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