PatchSet 5506
Date: 2005/02/08 21:14:11
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Cleaned up scripts
2005-02-08 Dalibor Topic <[EMAIL PROTECTED]>
* kaffe/scripts/javac.in,
kaffe/scripts/javakey.in,
kaffe/scripts/jdb.in,
kaffe/scripts/kjc.in,
kaffe/scripts/kopi.in:
Removed unused scripts or scripts using sun.* classes.
* kaffe/scripts/Makefile.am,
configure.ac: Removed the deleted files.
Members:
ChangeLog:1.3550->1.3551
configure:1.422->1.423
configure.ac:1.112->1.113
kaffe/scripts/Makefile.am:1.11->1.12
kaffe/scripts/Makefile.in:1.164->1.165
kaffe/scripts/javac.in:1.4->1.5(DEAD)
kaffe/scripts/javakey.in:1.4->1.5(DEAD)
kaffe/scripts/jdb.in:1.4->1.5(DEAD)
kaffe/scripts/kjc.in:1.2->1.3(DEAD)
kaffe/scripts/kopi.in:1.2->1.3(DEAD)
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3550 kaffe/ChangeLog:1.3551
--- kaffe/ChangeLog:1.3550 Tue Feb 8 19:33:56 2005
+++ kaffe/ChangeLog Tue Feb 8 21:14:11 2005
@@ -1,5 +1,17 @@
2005-02-08 Dalibor Topic <[EMAIL PROTECTED]>
+ * kaffe/scripts/javac.in,
+ kaffe/scripts/javakey.in,
+ kaffe/scripts/jdb.in,
+ kaffe/scripts/kjc.in,
+ kaffe/scripts/kopi.in:
+ Removed unused scripts or scripts using sun.* classes.
+
+ * kaffe/scripts/Makefile.am,
+ configure.ac: Removed the deleted files.
+
+2005-02-08 Dalibor Topic <[EMAIL PROTECTED]>
+
* configure.ac: Added PTHREAD_CFLAGS to CFLAGS back.
That fixes FreeBSD again. 'make CFLAGS=-Wall' still works now,
though.
Index: kaffe/configure
diff -u kaffe/configure:1.422 kaffe/configure:1.423
--- kaffe/configure:1.422 Tue Feb 8 19:33:59 2005
+++ kaffe/configure Tue Feb 8 21:14:12 2005
@@ -59177,22 +59177,12 @@
ac_config_files="$ac_config_files kaffe/scripts/kaffexprof"
- ac_config_files="$ac_config_files kaffe/scripts/javac"
-
- ac_config_files="$ac_config_files kaffe/scripts/javakey"
-
ac_config_files="$ac_config_files kaffe/scripts/jar"
ac_config_files="$ac_config_files kaffe/scripts/javah"
ac_config_files="$ac_config_files kaffe/scripts/javap"
- ac_config_files="$ac_config_files kaffe/scripts/jdb"
-
- ac_config_files="$ac_config_files kaffe/scripts/kjc"
-
- ac_config_files="$ac_config_files kaffe/scripts/kopi"
-
ac_config_files="$ac_config_files kaffe/scripts/javadoc"
ac_config_files="$ac_config_files kaffe/scripts/appletviewer"
@@ -60081,14 +60071,9 @@
"kaffe/scripts/install-jar" ) CONFIG_FILES="$CONFIG_FILES
kaffe/scripts/install-jar" ;;
"kaffe/scripts/kaffe" ) CONFIG_FILES="$CONFIG_FILES kaffe/scripts/kaffe" ;;
"kaffe/scripts/kaffexprof" ) CONFIG_FILES="$CONFIG_FILES
kaffe/scripts/kaffexprof" ;;
- "kaffe/scripts/javac" ) CONFIG_FILES="$CONFIG_FILES kaffe/scripts/javac" ;;
- "kaffe/scripts/javakey" ) CONFIG_FILES="$CONFIG_FILES kaffe/scripts/javakey"
;;
"kaffe/scripts/jar" ) CONFIG_FILES="$CONFIG_FILES kaffe/scripts/jar" ;;
"kaffe/scripts/javah" ) CONFIG_FILES="$CONFIG_FILES kaffe/scripts/javah" ;;
"kaffe/scripts/javap" ) CONFIG_FILES="$CONFIG_FILES kaffe/scripts/javap" ;;
- "kaffe/scripts/jdb" ) CONFIG_FILES="$CONFIG_FILES kaffe/scripts/jdb" ;;
- "kaffe/scripts/kjc" ) CONFIG_FILES="$CONFIG_FILES kaffe/scripts/kjc" ;;
- "kaffe/scripts/kopi" ) CONFIG_FILES="$CONFIG_FILES kaffe/scripts/kopi" ;;
"kaffe/scripts/javadoc" ) CONFIG_FILES="$CONFIG_FILES kaffe/scripts/javadoc"
;;
"kaffe/scripts/appletviewer" ) CONFIG_FILES="$CONFIG_FILES
kaffe/scripts/appletviewer" ;;
"kaffe/scripts/rmic" ) CONFIG_FILES="$CONFIG_FILES kaffe/scripts/rmic" ;;
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.112 kaffe/configure.ac:1.113
--- kaffe/configure.ac:1.112 Tue Feb 8 19:34:04 2005
+++ kaffe/configure.ac Tue Feb 8 21:14:19 2005
@@ -2264,14 +2264,9 @@
AC_CONFIG_FILES([kaffe/scripts/install-jar])
AC_CONFIG_FILES([kaffe/scripts/kaffe])
AC_CONFIG_FILES([kaffe/scripts/kaffexprof])
-AC_CONFIG_FILES([kaffe/scripts/javac])
-AC_CONFIG_FILES([kaffe/scripts/javakey])
AC_CONFIG_FILES([kaffe/scripts/jar])
AC_CONFIG_FILES([kaffe/scripts/javah])
AC_CONFIG_FILES([kaffe/scripts/javap])
-AC_CONFIG_FILES([kaffe/scripts/jdb])
-AC_CONFIG_FILES([kaffe/scripts/kjc])
-AC_CONFIG_FILES([kaffe/scripts/kopi])
AC_CONFIG_FILES([kaffe/scripts/javadoc])
AC_CONFIG_FILES([kaffe/scripts/appletviewer])
AC_CONFIG_FILES([kaffe/scripts/rmic])
Index: kaffe/kaffe/scripts/Makefile.am
diff -u kaffe/kaffe/scripts/Makefile.am:1.11
kaffe/kaffe/scripts/Makefile.am:1.12
--- kaffe/kaffe/scripts/Makefile.am:1.11 Thu Jul 22 19:03:50 2004
+++ kaffe/kaffe/scripts/Makefile.am Tue Feb 8 21:14:20 2005
@@ -10,11 +10,8 @@
EXTRA_DIST = nm2as.awk
-SCRIPTFILES_KJC=\
- kjc kopi
-
SCRIPTFILES_SUN=\
- jar javah javakey javap jdb \
+ jar javah javap \
native2ascii rmic serialver
if SUN_COMPAT
Index: kaffe/kaffe/scripts/Makefile.in
diff -u kaffe/kaffe/scripts/Makefile.in:1.164
kaffe/kaffe/scripts/Makefile.in:1.165
--- kaffe/kaffe/scripts/Makefile.in:1.164 Mon Feb 7 15:47:09 2005
+++ kaffe/kaffe/scripts/Makefile.in Tue Feb 8 21:14:20 2005
@@ -47,12 +47,10 @@
subdir = kaffe/scripts
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/appletviewer.in $(srcdir)/install-jar.in \
- $(srcdir)/jar.in $(srcdir)/javac.in $(srcdir)/javadoc.in \
- $(srcdir)/javah.in $(srcdir)/javakey.in $(srcdir)/javap.in \
- $(srcdir)/jdb.in $(srcdir)/kaffe.in $(srcdir)/kaffexprof.in \
- $(srcdir)/kjc.in $(srcdir)/kopi.in $(srcdir)/native2ascii.in \
- $(srcdir)/rmic.in $(srcdir)/rmiregistry.in \
- $(srcdir)/serialver.in
+ $(srcdir)/jar.in $(srcdir)/javadoc.in $(srcdir)/javah.in \
+ $(srcdir)/javap.in $(srcdir)/kaffe.in $(srcdir)/kaffexprof.in \
+ $(srcdir)/native2ascii.in $(srcdir)/rmic.in \
+ $(srcdir)/rmiregistry.in $(srcdir)/serialver.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \
$(top_srcdir)/m4/ac_prog_antlr.m4 \
@@ -78,9 +76,8 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config/config.h \
$(top_builddir)/include/kaffe/jni_md.h
-CONFIG_CLEAN_FILES = install-jar kaffe kaffexprof javac javakey jar \
- javah javap jdb kjc kopi javadoc appletviewer rmic rmiregistry \
- serialver native2ascii
+CONFIG_CLEAN_FILES = install-jar kaffe kaffexprof jar javah javap \
+ javadoc appletviewer rmic rmiregistry serialver native2ascii
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(jrebindir)"
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
jrebinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
@@ -370,11 +367,8 @@
with_engine = @with_engine@
DIST_SUBDIRS = bat compat
EXTRA_DIST = nm2as.awk
-SCRIPTFILES_KJC = \
- kjc kopi
-
SCRIPTFILES_SUN = \
- jar javah javakey javap jdb \
+ jar javah javap \
native2ascii rmic serialver
@[EMAIL PROTECTED] = compat
@@ -429,21 +423,11 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
kaffexprof: $(top_builddir)/config.status $(srcdir)/kaffexprof.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-javac: $(top_builddir)/config.status $(srcdir)/javac.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-javakey: $(top_builddir)/config.status $(srcdir)/javakey.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
jar: $(top_builddir)/config.status $(srcdir)/jar.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
javah: $(top_builddir)/config.status $(srcdir)/javah.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
javap: $(top_builddir)/config.status $(srcdir)/javap.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-jdb: $(top_builddir)/config.status $(srcdir)/jdb.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-kjc: $(top_builddir)/config.status $(srcdir)/kjc.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-kopi: $(top_builddir)/config.status $(srcdir)/kopi.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
javadoc: $(top_builddir)/config.status $(srcdir)/javadoc.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
===================================================================
Checking out kaffe/kaffe/scripts/javac.in
RCS: /home/cvs/kaffe/kaffe/kaffe/scripts/Attic/javac.in,v
VERS: 1.4
***************
--- kaffe/kaffe/scripts/javac.in Tue Feb 8 21:19:26 2005
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,7 +0,0 @@
-#! /bin/sh
-# Script to run Sun's compiler
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-exec @bindir@/@kaffe_TRANSF@ sun.tools.javac.Main ${1+"$@"}
-exit $?
-
===================================================================
Checking out kaffe/kaffe/scripts/javakey.in
RCS: /home/cvs/kaffe/kaffe/kaffe/scripts/Attic/javakey.in,v
VERS: 1.4
***************
--- kaffe/kaffe/scripts/javakey.in Tue Feb 8 21:19:27 2005
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,6 +0,0 @@
-#! /bin/sh
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS sun.security.provider.Main ${1+"$@"}
-exit $?
-
===================================================================
Checking out kaffe/kaffe/scripts/jdb.in
RCS: /home/cvs/kaffe/kaffe/kaffe/scripts/Attic/jdb.in,v
VERS: 1.4
***************
--- kaffe/kaffe/scripts/jdb.in Tue Feb 8 21:19:27 2005
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,6 +0,0 @@
-#! /bin/sh
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS sun.tools.ttydebug.TTY ${1+"$@"}
-exit $?
-
===================================================================
Checking out kaffe/kaffe/scripts/kjc.in
RCS: /home/cvs/kaffe/kaffe/kaffe/scripts/Attic/kjc.in,v
VERS: 1.2
***************
--- kaffe/kaffe/scripts/kjc.in Tue Feb 8 21:19:27 2005
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,7 +0,0 @@
-#! /bin/sh
-# Script to run kjc Java compiler
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS at.dms.kjc.Main ${1+"$@"}
-exit $?
-
===================================================================
Checking out kaffe/kaffe/scripts/kopi.in
RCS: /home/cvs/kaffe/kaffe/kaffe/scripts/Attic/kopi.in,v
VERS: 1.2
***************
--- kaffe/kaffe/scripts/kopi.in Tue Feb 8 21:19:27 2005
+++ /dev/null Sun Aug 4 19:57:58 2002
@@ -1,7 +0,0 @@
-#! /bin/sh
-# Script to run KOPI generic wrapper
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS at.dms.kopi.Main ${1+"$@"}
-exit $?
-
_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
