* src/scripts/rmic.in: Removed.

* src/scripts/rmiregistry.in: Likewise.

* src/scripts/Makefile.am (bin_SCRIPTS) Removed rmi.in and
rmiregistry.in.
* src/scripts/.cvsignore: Likewise.

* src/scripts/java.in: Don't call cacao with an absolute path, this
would break WITH_JRE_LAYOUT.  I think we can expect cacao to be in the
PATH.

diff --git a/src/scripts/.cvsignore b/src/scripts/.cvsignore
index 9a84573fd8a4c2e9189d02d3330de70f4699f4fd..dfd259fc98b3797fcf0d47588837ed8badafd4c9 100644 (file)
--- a/src/scripts/.cvsignore
+++ b/src/scripts/.cvsignore
@@ -1,5 +1,3 @@
 Makefile
 Makefile.in
 java
-rmic
-rmiregistry

diff --git a/src/scripts/Makefile.am b/src/scripts/Makefile.am
index 20bfd467386aa0b1d18f732b6209be0543f30491..8341e83f362ebabbbb5ac56e53a5d4bcc9309e2a 100644 (file)
--- a/src/scripts/Makefile.am
+++ b/src/scripts/Makefile.am
@@ -28,14 +28,12 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 5050 2006-06-28 08:24:35Z twisti $
+## $Id: Makefile.am 5659 2006-10-04 10:37:09Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
 bin_SCRIPTS = \
        java \
-       rmic \
-       rmiregistry
 
 
 ## Local variables:

diff --git a/src/scripts/java.in b/src/scripts/java.in
index cf73617e29804d4914e087a1cad3b651816eb95e..8a402e48f99ad6945c15667d271fe70d03251502 100644 (file)
--- a/src/scripts/java.in
+++ b/src/scripts/java.in
@@ -30,10 +30,6 @@
 ##
 ## Changes:
 ##
-## $Id: java.in 4846 2006-04-26 09:02:39Z twisti $
+## $Id: java.in 5659 2006-10-04 10:37:09Z twisti $
 
-prefix="@prefix@"
-exec_prefix="@exec_prefix@"
-bindir="@bindir@"
-
-exec ${bindir}/cacao ${1+"$@"}
+exec cacao ${1+"$@"}

diff --git a/src/scripts/rmic.in b/src/scripts/rmic.in
deleted file mode 100644 (file)
index 8f1fcbd..0000000
--- a/src/scripts/rmic.in
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-## src/scripts/rmic.in
-##
-## Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
-## C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-## E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-## J. Wenninger, Institut f. Computersprachen - TU Wien
-##
-## This file is part of CACAO.
-##
-## This program is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2, or (at
-## your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-## 02110-1301, USA.
-##
-## Contact: cacao@cacaojvm.org
-##
-## Authors: Christian Thalinger
-##
-## Changes:
-##
-## $Id: rmic.in 4846 2006-04-26 09:02:39Z twisti $
-
-prefix="@prefix@"
-exec_prefix="@exec_prefix@"
-bindir="@bindir@"
-libdir="@CLASSPATH_PREFIX@/share/classpath"
-
-exec ${bindir}/cacao -cp ${libdir}/tools.zip gnu.classpath.tools.rmi.RMIC ${1+"$@"}

diff --git a/src/scripts/rmiregistry.in b/src/scripts/rmiregistry.in
deleted file mode 100644 (file)
index f1bbf28..0000000
--- a/src/scripts/rmiregistry.in
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-## src/scripts/rmiregistry.in
-##
-## Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
-## C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-## E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-## J. Wenninger, Institut f. Computersprachen - TU Wien
-##
-## This file is part of CACAO.
-##
-## This program is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2, or (at
-## your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-## 02110-1301, USA.
-##
-## Contact: cacao@cacaojvm.org
-##
-## Authors: Christian Thalinger
-##
-## Changes:
-##
-## $Id: rmiregistry.in 4846 2006-04-26 09:02:39Z twisti $
-
-prefix="@prefix@"
-exec_prefix="@exec_prefix@"
-bindir="@bindir@"
-
-exec ${bindir}/cacao gnu.java.rmi.registry.RegistryImpl ${1+"$@"}