[kaffe] CVS kaffe (robilad): Made javac script use jikes
Kaffe CVS
cvs-commits at kaffe.org
Tue Feb 8 15:19:32 PST 2005
PatchSet 5509
Date: 2005/02/08 23:15:03
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Made javac script use jikes
2005-02-08 Dalibor Topic <robilad at kaffe.org>
* kaffe/scripts/compat/javac.in: Switched to use jikes
with correct bootclasspath.
Members:
ChangeLog:1.3553->1.3554
kaffe/scripts/compat/javac.in:1.8->1.9
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3553 kaffe/ChangeLog:1.3554
--- kaffe/ChangeLog:1.3553 Tue Feb 8 22:05:15 2005
+++ kaffe/ChangeLog Tue Feb 8 23:15:03 2005
@@ -1,5 +1,10 @@
2005-02-08 Dalibor Topic <robilad at kaffe.org>
+ * kaffe/scripts/compat/javac.in: Switched to use jikes
+ with correct bootclasspath.
+
+2005-02-08 Dalibor Topic <robilad at kaffe.org>
+
* config/s390/sysdepCallMethod.h: Added missing semicolon.
2005-02-08 Dalibor Topic <robilad at kaffe.org>
Index: kaffe/kaffe/scripts/compat/javac.in
diff -u kaffe/kaffe/scripts/compat/javac.in:1.8 kaffe/kaffe/scripts/compat/javac.in:1.9
--- kaffe/kaffe/scripts/compat/javac.in:1.8 Fri May 21 14:39:33 2004
+++ kaffe/kaffe/scripts/compat/javac.in Tue Feb 8 23:15:07 2005
@@ -1,28 +1,4 @@
#! /bin/sh
-# We use kjc compiler rather than Sun's.
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-lib_path=@prefix@
-
-# Ensure that /usr/lib/rt.jar is in the classpath.
-for opt in ${1+"$@"}; do
- if [ "x$classpath" = "xtrue" ]; then
- classpath=$opt
- continue
- fi
- if [ $opt = "-classpath" ]; then
- classpath="true"
- continue
- fi
- args="${args} $opt"
-done
-if [ "x$classpath" != "x" ]; then
- echo $classpath | grep -q ${lib_path}/rt.jar
- if [ $? -eq 1 ]; then
- classpath=${lib_path}/rt.jar:${classpath}
- fi
- args="${args} -classpath $classpath"
-fi
-
-exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS at.dms.kjc.Main $args
+# We use the jikes compiler detected by configure
+ at JIKESPROG@ -bootclasspath @prefix@/jre/lib/rt.jar ${1+"$@"}
exit $?
More information about the kaffe
mailing list