* src/scripts/.cvsignore: Removed cacao, jarsigner, javac and keytool.

* src/scripts: Updated svn:ignore.

* src/scripts/Makefile.am (bin_SCRIPTS): Removed jarsigner and
keytool, there are now wrappers in GNU Classpath.

* src/scripts/javac.in: Removed.
* src/scripts/jarsigner.in: Likewise.
* src/scripts/cacao.in: Likewise.
* src/scripts/keytool.in: Likewise.

* configure.ac (AC_CONFIG_FILES): Removed src/scripts/jarsigner and
src/scripts/keytool.

diff --git a/configure.ac b/configure.ac
index 2137a6b83d38ae4e21c139f34416fb3c234f299d..5a48967570aa26453daf82225d4fdd73d936d89c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -792,9 +792,7 @@ AC_CONFIG_FILES([Makefile]
                [src/native/tools/Makefile]
                [src/native/vm/Makefile]
                [src/scripts/Makefile]
-               [src/scripts/jarsigner]
                [src/scripts/java]
-               [src/scripts/keytool]
                [src/scripts/rmic]
                [src/scripts/rmiregistry]
                [src/threads/Makefile]

diff --git a/src/scripts/.cvsignore b/src/scripts/.cvsignore
index f69067a56bc1b75da7e3394b6931e7037266777f..9a84573fd8a4c2e9189d02d3330de70f4699f4fd 100644 (file)
--- a/src/scripts/.cvsignore
+++ b/src/scripts/.cvsignore
@@ -1,9 +1,5 @@
 Makefile
 Makefile.in
-cacao
-jarsigner
 java
-javac
-keytool
 rmic
 rmiregistry

diff --git a/src/scripts/Makefile.am b/src/scripts/Makefile.am
index d81d4471969fac31d21ec4ef9ce249b97ea0cdc7..20bfd467386aa0b1d18f732b6209be0543f30491 100644 (file)
--- a/src/scripts/Makefile.am
+++ b/src/scripts/Makefile.am
@@ -28,14 +28,12 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4895 2006-05-08 11:09:18Z twisti $
+## $Id: Makefile.am 5050 2006-06-28 08:24:35Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
 bin_SCRIPTS = \
-       jarsigner \
        java \
-       keytool \
        rmic \
        rmiregistry
 

diff --git a/src/scripts/cacao.in b/src/scripts/cacao.in
deleted file mode 100644 (file)
index aca54f1..0000000
--- a/src/scripts/cacao.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-## src/scripts/cacao.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: cacao.in 4357 2006-01-22 23:33:38Z twisti $
-
-prefix="@prefix@"
-
-exec ${prefix}/jre/bin/cacao $@

diff --git a/src/scripts/jarsigner.in b/src/scripts/jarsigner.in
deleted file mode 100644 (file)
index faf69cf..0000000
--- a/src/scripts/jarsigner.in
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-## src/scripts/jarsigner.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.jarsigner.Main ${1+"$@"}

diff --git a/src/scripts/javac.in b/src/scripts/javac.in
deleted file mode 100644 (file)
index 2db2e1c..0000000
--- a/src/scripts/javac.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-## src/scripts/javac.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: javac.in 4357 2006-01-22 23:33:38Z twisti $
-
-prefix="@prefix@"
-
-exec ${prefix}/jre/bin/cacao -cp ${prefix}/lib/java-getopt-1.0.11.jar -jar ${prefix}/lib/kjc-2.2C-bin.jar $@

diff --git a/src/scripts/keytool.in b/src/scripts/keytool.in
deleted file mode 100644 (file)
index b329678..0000000
--- a/src/scripts/keytool.in
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-## src/scripts/keytool.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.keytool.Main ${1+"$@"}