PatchSet 4763
Date: 2004/05/21 14:38:53
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Fixed scripts to return exit code of invoked programs and added JAVA_OPTS
2004-05-21 Dalibor Topic <[EMAIL PROTECTED]>
kaffe/scripts/appletviewer.in,
kaffe/scripts/jar.in,
kaffe/scripts/javac.in,
kaffe/scripts/javadoc.in,
kaffe/scripts/javah.in,
kaffe/scripts/javakey.in,
kaffe/scripts/javap.in,
kaffe/scripts/jdb.in,
kaffe/scripts/kjc.in,
kaffe/scripts/kopi.in,
kaffe/scripts/native2ascii.in,
kaffe/scripts/rmic.in,
kaffe/scripts/rmiregistry.in,
kaffe/scripts/serialver.in,
kaffe/scripts/compat/appletviewer.in,
kaffe/scripts/compat/java.in,
kaffe/scripts/compat/javac.in,
kaffe/scripts/compat/javadoc.in:
Return exit value of invoked kaffe, so that make scripts
using them bail out on build failure. Added support for
JAVA_OPTS environment variable to pass options to kaffe
when it's invoked to run java apps.
Reported by: Michael Koch <[EMAIL PROTECTED]>
Members:
ChangeLog:1.2334->1.2335
kaffe/scripts/appletviewer.in:1.3->1.4
kaffe/scripts/jar.in:1.4->1.5
kaffe/scripts/javac.in:1.3->1.4
kaffe/scripts/javadoc.in:1.4->1.5
kaffe/scripts/javah.in:1.1->1.2
kaffe/scripts/javakey.in:1.3->1.4
kaffe/scripts/javap.in:1.5->1.6
kaffe/scripts/jdb.in:1.3->1.4
kaffe/scripts/kjc.in:1.1->1.2
kaffe/scripts/kopi.in:1.1->1.2
kaffe/scripts/native2ascii.in:1.4->1.5
kaffe/scripts/rmic.in:1.6->1.7
kaffe/scripts/rmiregistry.in:1.5->1.6
kaffe/scripts/serialver.in:1.4->1.5
kaffe/scripts/compat/appletviewer.in:1.3->1.4
kaffe/scripts/compat/java.in:1.3->1.4
kaffe/scripts/compat/javac.in:1.7->1.8
kaffe/scripts/compat/javadoc.in:1.5->1.6
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2334 kaffe/ChangeLog:1.2335
--- kaffe/ChangeLog:1.2334 Fri May 21 13:24:18 2004
+++ kaffe/ChangeLog Fri May 21 14:38:53 2004
@@ -1,5 +1,32 @@
2004-05-21 Dalibor Topic <[EMAIL PROTECTED]>
+ kaffe/scripts/appletviewer.in,
+ kaffe/scripts/jar.in,
+ kaffe/scripts/javac.in,
+ kaffe/scripts/javadoc.in,
+ kaffe/scripts/javah.in,
+ kaffe/scripts/javakey.in,
+ kaffe/scripts/javap.in,
+ kaffe/scripts/jdb.in,
+ kaffe/scripts/kjc.in,
+ kaffe/scripts/kopi.in,
+ kaffe/scripts/native2ascii.in,
+ kaffe/scripts/rmic.in,
+ kaffe/scripts/rmiregistry.in,
+ kaffe/scripts/serialver.in,
+ kaffe/scripts/compat/appletviewer.in,
+ kaffe/scripts/compat/java.in,
+ kaffe/scripts/compat/javac.in,
+ kaffe/scripts/compat/javadoc.in:
+ Return exit value of invoked kaffe, so that make scripts
+ using them bail out on build failure. Added support for
+ JAVA_OPTS environment variable to pass options to kaffe
+ when it's invoked to run java apps.
+
+ Reported by: Michael Koch <[EMAIL PROTECTED]>
+
+2004-05-21 Dalibor Topic <[EMAIL PROTECTED]>
+
* libraries/javalib/java/awt/peer/FontPeer.java,
libraries/javalib/java/awt/peer/MenuComponentPeer.java:
Replaced by implemntations from GNU Classpath.
Index: kaffe/kaffe/scripts/appletviewer.in
diff -u kaffe/kaffe/scripts/appletviewer.in:1.3 kaffe/kaffe/scripts/appletviewer.in:1.4
--- kaffe/kaffe/scripts/appletviewer.in:1.3 Sun Feb 21 00:25:43 1999
+++ kaffe/kaffe/scripts/appletviewer.in Fri May 21 14:39:32 2004
@@ -2,4 +2,6 @@
# Script to run Appletviewer
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-exec @bindir@/@kaffe_TRANSF@ sun.applet.AppletViewer ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS kaffe.applet.AppletViewer ${1+"$@"}
+exit $?
+
Index: kaffe/kaffe/scripts/jar.in
diff -u kaffe/kaffe/scripts/jar.in:1.4 kaffe/kaffe/scripts/jar.in:1.5
--- kaffe/kaffe/scripts/jar.in:1.4 Sat Jul 3 22:33:45 1999
+++ kaffe/kaffe/scripts/jar.in Fri May 21 14:39:32 2004
@@ -1,4 +1,6 @@
#! /bin/sh
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-exec @bindir@/@kaffe_TRANSF@ kaffe.tools.jar.Jar ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS kaffe.tools.jar.Jar ${1+"$@"}
+exit $?
+
Index: kaffe/kaffe/scripts/javac.in
diff -u kaffe/kaffe/scripts/javac.in:1.3 kaffe/kaffe/scripts/javac.in:1.4
--- kaffe/kaffe/scripts/javac.in:1.3 Sun Feb 21 00:25:44 1999
+++ kaffe/kaffe/scripts/javac.in Fri May 21 14:39:32 2004
@@ -3,3 +3,5 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
exec @bindir@/@kaffe_TRANSF@ sun.tools.javac.Main ${1+"$@"}
+exit $?
+
Index: kaffe/kaffe/scripts/javadoc.in
diff -u kaffe/kaffe/scripts/javadoc.in:1.4 kaffe/kaffe/scripts/javadoc.in:1.5
--- kaffe/kaffe/scripts/javadoc.in:1.4 Wed Apr 14 19:40:05 2004
+++ kaffe/kaffe/scripts/javadoc.in Fri May 21 14:39:32 2004
@@ -3,4 +3,6 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
export CLASSPATH=$CLASSPATH:@prefix@/lib/gjdoc.jar
-exec @bindir@/@kaffe_TRANSF@
-Djavax.xml.transform.TransformerFactory=gnu.xml.libxmlj.transform.TransformerFactoryImpl
gnu.classpath.tools.gjdoc.Main ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@
-Djavax.xml.transform.TransformerFactory=gnu.xml.libxmlj.transform.TransformerFactoryImpl
$JAVA_OPTS gnu.classpath.tools.gjdoc.Main ${1+"$@"}
+exit $?
+
Index: kaffe/kaffe/scripts/javah.in
diff -u kaffe/kaffe/scripts/javah.in:1.1 kaffe/kaffe/scripts/javah.in:1.2
--- kaffe/kaffe/scripts/javah.in:1.1 Mon May 19 08:03:25 2003
+++ kaffe/kaffe/scripts/javah.in Fri May 21 14:39:32 2004
@@ -3,4 +3,5 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
exec @bindir@/@kaffeh_TRANSF@ -jni ${1+"$@"}
+exit $?
Index: kaffe/kaffe/scripts/javakey.in
diff -u kaffe/kaffe/scripts/javakey.in:1.3 kaffe/kaffe/scripts/javakey.in:1.4
--- kaffe/kaffe/scripts/javakey.in:1.3 Sun Feb 21 00:25:44 1999
+++ kaffe/kaffe/scripts/javakey.in Fri May 21 14:39:32 2004
@@ -1,4 +1,6 @@
#! /bin/sh
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-exec @bindir@/@kaffe_TRANSF@ sun.security.provider.Main ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS sun.security.provider.Main ${1+"$@"}
+exit $?
+
Index: kaffe/kaffe/scripts/javap.in
diff -u kaffe/kaffe/scripts/javap.in:1.5 kaffe/kaffe/scripts/javap.in:1.6
--- kaffe/kaffe/scripts/javap.in:1.5 Sat Oct 19 18:46:40 2002
+++ kaffe/kaffe/scripts/javap.in Fri May 21 14:39:32 2004
@@ -1,5 +1,6 @@
#! /bin/sh
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-exec @bindir@/@kaffe_TRANSF@ at.dms.dis.Main ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS at.dms.dis.Main ${1+"$@"}
+exit $?
Index: kaffe/kaffe/scripts/jdb.in
diff -u kaffe/kaffe/scripts/jdb.in:1.3 kaffe/kaffe/scripts/jdb.in:1.4
--- kaffe/kaffe/scripts/jdb.in:1.3 Sun Feb 21 00:25:44 1999
+++ kaffe/kaffe/scripts/jdb.in Fri May 21 14:39:32 2004
@@ -1,5 +1,6 @@
#! /bin/sh
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-exec @bindir@/@kaffe_TRANSF@ sun.tools.ttydebug.TTY ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS sun.tools.ttydebug.TTY ${1+"$@"}
+exit $?
Index: kaffe/kaffe/scripts/kjc.in
diff -u kaffe/kaffe/scripts/kjc.in:1.1 kaffe/kaffe/scripts/kjc.in:1.2
--- kaffe/kaffe/scripts/kjc.in:1.1 Wed Oct 13 19:07:26 1999
+++ kaffe/kaffe/scripts/kjc.in Fri May 21 14:39:32 2004
@@ -2,5 +2,6 @@
# Script to run kjc Java compiler
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-exec @bindir@/@kaffe_TRANSF@ at.dms.kjc.Main ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS at.dms.kjc.Main ${1+"$@"}
+exit $?
Index: kaffe/kaffe/scripts/kopi.in
diff -u kaffe/kaffe/scripts/kopi.in:1.1 kaffe/kaffe/scripts/kopi.in:1.2
--- kaffe/kaffe/scripts/kopi.in:1.1 Mon Jan 10 10:40:22 2000
+++ kaffe/kaffe/scripts/kopi.in Fri May 21 14:39:32 2004
@@ -2,4 +2,6 @@
# Script to run KOPI generic wrapper
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-exec @bindir@/@kaffe_TRANSF@ at.dms.kopi.Main ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS at.dms.kopi.Main ${1+"$@"}
+exit $?
+
Index: kaffe/kaffe/scripts/native2ascii.in
diff -u kaffe/kaffe/scripts/native2ascii.in:1.4 kaffe/kaffe/scripts/native2ascii.in:1.5
--- kaffe/kaffe/scripts/native2ascii.in:1.4 Wed May 7 08:00:56 2003
+++ kaffe/kaffe/scripts/native2ascii.in Fri May 21 14:39:32 2004
@@ -1,5 +1,6 @@
#! /bin/sh
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-exec @bindir@/@kaffe_TRANSF@ kaffe.tools.native2ascii.Native2ASCII ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS kaffe.tools.native2ascii.Native2ASCII
${1+"$@"}
+exit $?
Index: kaffe/kaffe/scripts/rmic.in
diff -u kaffe/kaffe/scripts/rmic.in:1.6 kaffe/kaffe/scripts/rmic.in:1.7
--- kaffe/kaffe/scripts/rmic.in:1.6 Thu Aug 28 21:21:20 2003
+++ kaffe/kaffe/scripts/rmic.in Fri May 21 14:39:32 2004
@@ -5,5 +5,6 @@
PATH=${PATH}:@bindir@
export PATH
-exec @bindir@/@kaffe_TRANSF@ -Dclasspath.compiler=kjc gnu.java.rmi.rmic.RMIC ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ -Dclasspath.compiler=kjc $JAVA_OPTS
gnu.java.rmi.rmic.RMIC ${1+"$@"}
+exit $?
Index: kaffe/kaffe/scripts/rmiregistry.in
diff -u kaffe/kaffe/scripts/rmiregistry.in:1.5 kaffe/kaffe/scripts/rmiregistry.in:1.6
--- kaffe/kaffe/scripts/rmiregistry.in:1.5 Mon Aug 18 17:40:29 2003
+++ kaffe/kaffe/scripts/rmiregistry.in Fri May 21 14:39:32 2004
@@ -1,5 +1,6 @@
#! /bin/sh
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-exec @bindir@/@kaffe_TRANSF@ gnu.java.rmi.registry.RegistryImpl ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS gnu.java.rmi.registry.RegistryImpl ${1+"$@"}
+exit $?
Index: kaffe/kaffe/scripts/serialver.in
diff -u kaffe/kaffe/scripts/serialver.in:1.4 kaffe/kaffe/scripts/serialver.in:1.5
--- kaffe/kaffe/scripts/serialver.in:1.4 Sat Oct 9 19:56:38 1999
+++ kaffe/kaffe/scripts/serialver.in Fri May 21 14:39:33 2004
@@ -1,5 +1,6 @@
#! /bin/sh
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-exec @bindir@/@kaffe_TRANSF@ kaffe.tools.serialver.SerialVer ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS kaffe.tools.serialver.SerialVer ${1+"$@"}
+exit $?
Index: kaffe/kaffe/scripts/compat/appletviewer.in
diff -u kaffe/kaffe/scripts/compat/appletviewer.in:1.3
kaffe/kaffe/scripts/compat/appletviewer.in:1.4
--- kaffe/kaffe/scripts/compat/appletviewer.in:1.3 Sun Feb 21 00:25:46 1999
+++ kaffe/kaffe/scripts/compat/appletviewer.in Fri May 21 14:39:33 2004
@@ -2,5 +2,5 @@
# Script to run Appletviewer
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-exec @bindir@/@kaffe_TRANSF@ kaffe.applet.AppletViewer ${1+"$@"}
-
+exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS kaffe.applet.AppletViewer ${1+"$@"}
+exit $?
Index: kaffe/kaffe/scripts/compat/java.in
diff -u kaffe/kaffe/scripts/compat/java.in:1.3 kaffe/kaffe/scripts/compat/java.in:1.4
--- kaffe/kaffe/scripts/compat/java.in:1.3 Sun Feb 21 00:25:46 1999
+++ kaffe/kaffe/scripts/compat/java.in Fri May 21 14:39:33 2004
@@ -2,5 +2,5 @@
# Pretend Kaffe is Java
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-exec @bindir@/@kaffe_TRANSF@ ${1+"$@"}
-
+exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS ${1+"$@"}
+exit $?
Index: kaffe/kaffe/scripts/compat/javac.in
diff -u kaffe/kaffe/scripts/compat/javac.in:1.7 kaffe/kaffe/scripts/compat/javac.in:1.8
--- kaffe/kaffe/scripts/compat/javac.in:1.7 Fri Nov 22 18:35:34 2002
+++ kaffe/kaffe/scripts/compat/javac.in Fri May 21 14:39:33 2004
@@ -24,5 +24,5 @@
args="${args} -classpath $classpath"
fi
-exec @bindir@/@kaffe_TRANSF@ at.dms.kjc.Main $args
-
+exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS at.dms.kjc.Main $args
+exit $?
Index: kaffe/kaffe/scripts/compat/javadoc.in
diff -u kaffe/kaffe/scripts/compat/javadoc.in:1.5
kaffe/kaffe/scripts/compat/javadoc.in:1.6
--- kaffe/kaffe/scripts/compat/javadoc.in:1.5 Wed Apr 14 19:40:08 2004
+++ kaffe/kaffe/scripts/compat/javadoc.in Fri May 21 14:39:33 2004
@@ -3,4 +3,5 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
export CLASSPATH=$CLASSPATH:@prefix@/lib/gjdoc.jar
-exec @bindir@/@kaffe_TRANSF@
-Djavax.xml.transform.TransformerFactory=gnu.xml.libxmlj.transform.TransformerFactoryImpl
gnu.classpath.tools.gjdoc.Main ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS
-Djavax.xml.transform.TransformerFactory=gnu.xml.libxmlj.transform.TransformerFactoryImpl
gnu.classpath.tools.gjdoc.Main ${1+"$@"}
+exit $?
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
