[kaffe] CVS kaffe (robilad): removed kaffe-specific appletviewer script in favour of Classpath's

Kaffe CVS cvs-commits at kaffe.org
Mon Jun 5 08:33:55 PDT 2006 

PatchSet 7304 
Date: 2006/06/05 15:21:19
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed kaffe-specific appletviewer script in favour of Classpath's

2006-06-05  Dalibor Topic  <robilad at kaffe.org>

        * kaffe/scripts/appletviewer: Removed. Replaced by
        GNU Classpath's version.

        * configure.ac (AC_CONFIG_FILES) Removed
        kaffe/scripts/appletviewer.

        * kaffe/scripts/Makefile.am (COND_NATIVE_AWT): Removed,
        since appletviewer is now coming from GNU Classpath.

Members: 
	ChangeLog:1.4808->1.4809 
	configure:1.542->1.543 
	configure.ac:1.220->1.221 
	kaffe/scripts/Makefile.am:1.15->1.16 
	kaffe/scripts/Makefile.in:1.200->1.201 
	kaffe/scripts/appletviewer.in:1.5->1.6(DEAD) 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4808 kaffe/ChangeLog:1.4809
--- kaffe/ChangeLog:1.4808	Sun Jun  4 23:51:26 2006
+++ kaffe/ChangeLog	Mon Jun  5 15:21:19 2006
@@ -1,3 +1,14 @@
+2006-06-05  Dalibor Topic  <robilad at kaffe.org>
+
+	* kaffe/scripts/appletviewer: Removed. Replaced by 
+	GNU Classpath's version.
+
+	* configure.ac (AC_CONFIG_FILES) Removed 
+	kaffe/scripts/appletviewer.
+
+	* kaffe/scripts/Makefile.am (COND_NATIVE_AWT): Removed,
+	since appletviewer is now coming from GNU Classpath.
+
 2006-06-04  Dalibor Topic  <robilad at kaffe.org>
 
 	* libraries/clib/net/java_net_VMURLConnection.c,
Index: kaffe/configure
diff -u kaffe/configure:1.542 kaffe/configure:1.543
--- kaffe/configure:1.542	Sun Jun  4 17:14:21 2006
+++ kaffe/configure	Mon Jun  5 15:21:22 2006
@@ -50975,8 +50975,6 @@
 
           ac_config_files="$ac_config_files kaffe/scripts/javadoc"
 
-          ac_config_files="$ac_config_files kaffe/scripts/appletviewer"
-
           ac_config_files="$ac_config_files kaffe/scripts/rmic"
 
           ac_config_files="$ac_config_files kaffe/scripts/rmiregistry"
@@ -51924,7 +51922,6 @@
   "kaffe/scripts/javap" ) CONFIG_FILES="$CONFIG_FILES kaffe/scripts/javap" ;;
   "kaffe/scripts/jdb" ) CONFIG_FILES="$CONFIG_FILES kaffe/scripts/jdb" ;;
   "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" ;;
   "kaffe/scripts/rmiregistry" ) CONFIG_FILES="$CONFIG_FILES kaffe/scripts/rmiregistry" ;;
   "kaffe/scripts/serialver" ) CONFIG_FILES="$CONFIG_FILES kaffe/scripts/serialver" ;;
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.220 kaffe/configure.ac:1.221
--- kaffe/configure.ac:1.220	Sun Jun  4 17:14:28 2006
+++ kaffe/configure.ac	Mon Jun  5 15:21:25 2006
@@ -2580,7 +2580,6 @@
 AC_CONFIG_FILES([kaffe/scripts/javap])
 AC_CONFIG_FILES([kaffe/scripts/jdb])
 AC_CONFIG_FILES([kaffe/scripts/javadoc])
-AC_CONFIG_FILES([kaffe/scripts/appletviewer])
 AC_CONFIG_FILES([kaffe/scripts/rmic])
 AC_CONFIG_FILES([kaffe/scripts/rmiregistry])
 AC_CONFIG_FILES([kaffe/scripts/serialver])
Index: kaffe/kaffe/scripts/Makefile.am
diff -u kaffe/kaffe/scripts/Makefile.am:1.15 kaffe/kaffe/scripts/Makefile.am:1.16
--- kaffe/kaffe/scripts/Makefile.am:1.15	Tue Oct 18 21:23:24 2005
+++ kaffe/kaffe/scripts/Makefile.am	Mon Jun  5 15:21:26 2006
@@ -3,6 +3,9 @@
 # Copyright (c) 1996, 1997, 1998, 1999
 #	Transvirtual Technologies, Inc.  All rights reserved.
 #
+# Copyright (c) 2006
+#       Kaffe.org contributors. See ChangeLog for details.
+#
 # See the file "license.terms" for information on usage and redistribution 
 # of this file. 
 
@@ -22,12 +25,7 @@
 KAFFE_JAVADOC = javadoc
 endif
 
-if COND_NATIVE_AWT
-KAFFE_APPLETVIEWER = appletviewer
-endif
-
 SCRIPTFILES_COMPAT= \
-	$(KAFFE_APPLETVIEWER) \
 	$(KAFFE_JAVADOC) 
 
 if ENABLE_XPROF
Index: kaffe/kaffe/scripts/Makefile.in
diff -u kaffe/kaffe/scripts/Makefile.in:1.200 kaffe/kaffe/scripts/Makefile.in:1.201
--- kaffe/kaffe/scripts/Makefile.in:1.200	Sun Jun  4 17:14:48 2006
+++ kaffe/kaffe/scripts/Makefile.in	Mon Jun  5 15:21:26 2006
@@ -19,6 +19,9 @@
 # Copyright (c) 1996, 1997, 1998, 1999
 #	Transvirtual Technologies, Inc.  All rights reserved.
 #
+# Copyright (c) 2006
+#       Kaffe.org contributors. See ChangeLog for details.
+#
 # See the file "license.terms" for information on usage and redistribution 
 # of this file. 
 
@@ -46,12 +49,11 @@
 host_triplet = @host@
 subdir = kaffe/scripts
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/appletviewer.in $(srcdir)/install-jar.in \
-	$(srcdir)/jar.in $(srcdir)/javadoc.in $(srcdir)/javah.in \
-	$(srcdir)/javap.in $(srcdir)/jdb.in $(srcdir)/kaffe.in \
-	$(srcdir)/kaffexprof.in $(srcdir)/native2ascii.in \
-	$(srcdir)/rmic.in $(srcdir)/rmiregistry.in \
-	$(srcdir)/serialver.in
+	$(srcdir)/install-jar.in $(srcdir)/jar.in $(srcdir)/javadoc.in \
+	$(srcdir)/javah.in $(srcdir)/javap.in $(srcdir)/jdb.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/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \
@@ -78,7 +80,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config/config.h
 CONFIG_CLEAN_FILES = install-jar kaffe kaffexprof jar javah javap jdb \
-	javadoc appletviewer rmic rmiregistry serialver native2ascii
+	javadoc rmic rmiregistry serialver native2ascii
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(jrebindir)"
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 jrebinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
@@ -376,9 +378,7 @@
 
 @SUN_COMPAT_TRUE at SUBDIRS = compat
 @COND_GJDOC_TRUE at KAFFE_JAVADOC = javadoc
- at COND_NATIVE_AWT_TRUE@KAFFE_APPLETVIEWER = appletviewer
 SCRIPTFILES_COMPAT = \
-	$(KAFFE_APPLETVIEWER) \
 	$(KAFFE_JAVADOC) 
 
 @ENABLE_XPROF_FALSE at SCRIPTFILES_XPROF = 
@@ -441,8 +441,6 @@
 jdb: $(top_builddir)/config.status $(srcdir)/jdb.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 javadoc: $(top_builddir)/config.status $(srcdir)/javadoc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-appletviewer: $(top_builddir)/config.status $(srcdir)/appletviewer.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 rmic: $(top_builddir)/config.status $(srcdir)/rmic.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
===================================================================
Checking out kaffe/kaffe/scripts/appletviewer.in
RCS:  /home/cvs/kaffe/kaffe/kaffe/scripts/Attic/appletviewer.in,v
VERS: 1.5
***************
--- kaffe/kaffe/scripts/appletviewer.in	Mon Jun  5 15:33:53 2006
+++ /dev/null	Sun Aug  4 19:57:58 2002
@@ -1,7 +0,0 @@
-#! /bin/sh
-# Script to run Appletviewer
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS org.kaffe.applet.AppletViewer ${1+"$@"}
-exit $?
-

More information about the kaffe mailing list