This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository ecj.
commit 26f6aaaa2eb8cad3f5ae4e9d73dd2f2911cb8fe6 Author: Matthias Klose <[email protected]> Date: Thu Feb 9 16:33:45 2006 +0000 Import Debian changes 3.1.2-2 ecj-bootstrap (3.1.2-2) unstable; urgency=low * Set the bootclasspath to /usr/share/java/libgcj-4.0.jar, if not called with the -bootclasspath and /usr/lib/jvm/java-gcj/jre/lib/rt.jar does not exist (java-gcj-compat not installed). Closes: #350542. --- debian/changelog | 8 ++++++++ ecj-bootstrap | 13 ++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7d5e826..7a1f0c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ecj-bootstrap (3.1.2-2) unstable; urgency=low + + * Set the bootclasspath to /usr/share/java/libgcj-4.0.jar, if not called + with the -bootclasspath and /usr/lib/jvm/java-gcj/jre/lib/rt.jar does + not exist (java-gcj-compat not installed). Closes: #350542. + + -- Matthias Klose <[email protected]> Thu, 9 Feb 2006 16:33:45 +0000 + ecj-bootstrap (3.1.2-1) unstable; urgency=low * New upstream version. diff --git a/ecj-bootstrap b/ecj-bootstrap index 761fb65..1eff49b 100644 --- a/ecj-bootstrap +++ b/ecj-bootstrap @@ -1,13 +1,20 @@ #!/bin/sh case $CLASSPATH in -*/usr/share/java/ecj.jar*) ;; -*) CLASSPATH=$CLASSPATH:/usr/share/java/ecj.jar + */usr/share/java/ecj.jar*) ;; + *) CLASSPATH=${CLASSPATH:+$CLASSPATH:}/usr/share/java/ecj.jar esac +case "$*" in + *-bootclasspath*) ;; + *) + if [ ! -f /usr/lib/jvm/java-gcj/jre/lib/rt.jar ]; then + bcoption="-bootclasspath /usr/share/java/libgcj-4.0.jar" + fi +esac export CLASSPATH exec /usr/bin/gij-4.0 \ -Dgnu.gcj.precompiled.db.path=/var/lib/gcj-4.0/classmap.db \ -Djava.ext.dirs=/usr/lib/java-ext:/usr/share/java-ext \ - org.eclipse.jdt.internal.compiler.batch.Main ${1+"$@"} + org.eclipse.jdt.internal.compiler.batch.Main $bcoption ${1+"$@"} -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ecj.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
