Hi list.
A couple of simple patches for consideration for cp-tools.
The first is to remove gjavah from cp-tools since a javah tool is now in
Classpath so gjavah in cp-tools is no longer needed.
2008-07-12 Paul Jenner [EMAIL PROTECTED]
* bin/gjavah.in,
* configure.ac,
* Makefile.am,
* src/gnu/classpath/tools/javah/GnuByteCodeJavah.java,
* src/gnu/classpath/tools/javah/Javah.java,
* src/gnu/classpath/tools/javah/JavahMain.java:
Removed gjavah.
The second is to correct the classpath in the gjavap wrapper script - it
points to cptools.zip instead of cptools.jar which is what is built.
2008-07-12 Paul Jenner [EMAIL PROTECTED]
* bin/gjavap.in: Corrected cptools.jar classpath.
If acceptable, could someone with access commit these?
Hope this helps,
Paul
--
Paul Jenner [EMAIL PROTECTED]
diff -Naur cp-tools/bin/gjavah.in cp-tools-psj/bin/gjavah.in
--- cp-tools/bin/gjavah.in 2008-07-12 16:08:00.0 +0100
+++ cp-tools-psj/bin/gjavah.in 1970-01-01 01:00:00.0 +0100
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-## Copyright (C) 2008 Free Software Foundation, Inc.
-##
-## This file is a part of GNU Classpath.
-##
-## GNU Classpath 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 of the License, or (at
-## your option) any later version.
-##
-## GNU Classpath 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 GNU Classpath; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
-## USA.
-##
-## Linking this library statically or dynamically with other modules is
-## making a combined work based on this library. Thus, the terms and
-## conditions of the GNU General Public License cover the whole
-## combination.
-##
-## As a special exception, the copyright holders of this library give you
-## permission to link this library with independent modules to produce an
-## executable, regardless of the license terms of these independent
-## modules, and to copy and distribute the resulting executable under
-## terms of your choice, provided that you also meet, for each linked
-## independent module, the terms and conditions of the license of that
-## module. An independent module is a module which is not derived from
-## or based on this library. If you modify this library, you may extend
-## this exception to your version of the library, but you are not
-## obligated to do so. If you do not wish to do so, delete this
-## exception statement from your version.
-##
-##
-## A simple shell script to launch the GNU Classpath javah tool.
-##
-
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@/@PACKAGE@
-tools_cp=${tools_dir}/cptools.zip
-
-exec @JAVA@ -classpath ${tools_cp} gnu.classpath.tools.javah.JavahMain $@
diff -Naur cp-tools/configure.ac cp-tools-psj/configure.ac
--- cp-tools/configure.ac 2008-07-12 16:08:00.0 +0100
+++ cp-tools-psj/configure.ac 2008-07-12 21:06:54.0 +0100
@@ -110,9 +110,8 @@
AC_CONFIG_COMMANDS([supplementgen],[chmod 755 bin/supplementgen])
if test x${with_gnubytecode} = xyes
then
-AC_CONFIG_FILES([bin/gjavap bin/gjavah])
+AC_CONFIG_FILES([bin/gjavap])
AC_CONFIG_COMMANDS([gjavap], [chmod 755 bin/gjavap])
-AC_CONFIG_COMMANDS([gjavah], [chmod 755 bin/gjavah])
fi
fi
AC_OUTPUT
diff -Naur cp-tools/Makefile.am cp-tools-psj/Makefile.am
--- cp-tools/Makefile.am 2008-07-12 16:08:00.0 +0100
+++ cp-tools-psj/Makefile.am 2008-07-12 21:10:23.0 +0100
@@ -22,7 +22,7 @@
bin_PROGRAMS = localegen supplementgen
lib_LTLIBRARIES = libcpgenerators.la
if USE_GNUBYTECODE
-bin_PROGRAMS += gjavap gjavah
+bin_PROGRAMS += gjavap
lib_LTLIBRARIES += libcptools.la libbytecode.la
libbytecode_la_LINK = $(GCJLINK)
nodist_libbytecode_la_SOURCES = $(BYTECODE_JAR)
@@ -32,7 +32,7 @@
data_JARS = cpgenerators-$(VERSION).jar
BUILT_SOURCES = $(data_JARS)
if USE_GNUBYTECODE
-bin_SCRIPTS += bin/gjavap bin/gjavah
+bin_SCRIPTS += bin/gjavap
data_JARS += cptools-$(VERSION).jar
endif
endif
@@ -45,13 +45,6 @@
gjavap_LDADD += libbytecode.la
gjavap_LDFLAGS = --main=gnu.classpath.tools.javap.JavapMain \
-Dgnu.gcj.runtime.VMClassLoader.library_control=never
-
-gjavah_SOURCES =
-gjavah_LINK = $(GCJLINK)
-gjavah_LDADD = libcptools.la
-gjavah_LDADD += libbytecode.la
-gjavah_LDFLAGS = --main=gnu.classpath.tools.javah.JavahMain \
- -Dgnu.gcj.runtime.VMClassLoader.library_control=never
endif
localegen_SOURCES =
@@ -69,7 +62,6 @@
else
gjavap: $(srcdir)/bin/gjavap.in
-gjavah: $(srcdir)/bin/gjavah.in
localegen: $(srcdir)/bin/localegen.in
