+2007-03-06 Tom Tromey <tromey@redhat.com>
+
+ * Makefile.in: Rebuilt.
+ * Makefile.am (bin_PROGRAMS): Added gcjh.
+ (gcjh_SOURCES, gcjh_LDFLAGS, gcjh_LINK, gcjh_LDADD,
+ gcjh_DEPENDENCIES): New variables.
+
2007-03-06 Kyle Galloway <kgallowa@redhat.com>
+
* jvmti.cc(_Jv_JVMTI_GetLocalVariableTable): Fix _Jv_Malloc parameters.
* testsuite/libjava.jvmti/interp/natgetlocalvartable.cc
(do_getlocalvartable_tests): Add Deallocate calls to free strings.
## For now, only on native systems. FIXME.
if NATIVE
bin_PROGRAMS = jv-convert gij grmic grmiregistry gcj-dbtool \
- gappletviewer gjarsigner gkeytool gjar gjavah gnative2ascii \
+ gappletviewer gjarsigner gkeytool gjar gcjh gjavah gnative2ascii \
gorbd grmid gserialver gtnameserv gc-analyze
## It is convenient to actually build and install the default database
gjavah_DEPENDENCIES = libgcj-tools.la
## This is a dummy definition.
+gcjh_SOURCES =
+gcjh_LDFLAGS = --main=gnu.classpath.tools.javah.GcjhMain \
+ -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+gcjh_LINK = $(GCJLINK)
+## See jv_convert_LDADD.
+gcjh_LDADD = -L$(here)/.libs libgcj-tools.la
+gcjh_DEPENDENCIES = libgcj-tools.la
+
+## This is a dummy definition.
gnative2ascii_SOURCES =
gnative2ascii_LDFLAGS = --main=gnu.classpath.tools.native2ascii.Native2ASCII \
-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
@NATIVE_TRUE@ grmic$(EXEEXT) grmiregistry$(EXEEXT) \
@NATIVE_TRUE@ gcj-dbtool$(EXEEXT) gappletviewer$(EXEEXT) \
@NATIVE_TRUE@ gjarsigner$(EXEEXT) gkeytool$(EXEEXT) \
-@NATIVE_TRUE@ gjar$(EXEEXT) gjavah$(EXEEXT) \
+@NATIVE_TRUE@ gjar$(EXEEXT) gcjh$(EXEEXT) gjavah$(EXEEXT) \
@NATIVE_TRUE@ gnative2ascii$(EXEEXT) gorbd$(EXEEXT) \
@NATIVE_TRUE@ grmid$(EXEEXT) gserialver$(EXEEXT) \
@NATIVE_TRUE@ gtnameserv$(EXEEXT) gc-analyze$(EXEEXT)
gc_analyze_OBJECTS = $(am_gc_analyze_OBJECTS)
am_gcj_dbtool_OBJECTS = gnu/gcj/tools/gcj_dbtool/natMain.$(OBJEXT)
gcj_dbtool_OBJECTS = $(am_gcj_dbtool_OBJECTS)
+am_gcjh_OBJECTS =
+gcjh_OBJECTS = $(am_gcjh_OBJECTS)
am__gen_from_JIS_SOURCES_DIST = gnu/gcj/convert/gen-from-JIS.c \
gnu/gcj/convert/make-trie.c
@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@am_gen_from_JIS_OBJECTS = gnu/gcj/convert/gen-from-JIS.$(OBJEXT) \
$(libgcj_la_SOURCES) $(EXTRA_libgcj_la_SOURCES) \
$(libgcj_bc_la_SOURCES) $(libgij_la_SOURCES) \
$(libjvm_la_SOURCES) $(ecjx_SOURCES) $(gappletviewer_SOURCES) \
- $(gc_analyze_SOURCES) $(gcj_dbtool_SOURCES) \
+ $(gc_analyze_SOURCES) $(gcj_dbtool_SOURCES) $(gcjh_SOURCES) \
$(gen_from_JIS_SOURCES) $(gij_SOURCES) $(gjar_SOURCES) \
$(gjarsigner_SOURCES) $(gjavah_SOURCES) $(gkeytool_SOURCES) \
$(gnative2ascii_SOURCES) $(gorbd_SOURCES) $(grmic_SOURCES) \
$(EXTRA_libgcj_la_SOURCES) $(libgcj_bc_la_SOURCES) \
$(libgij_la_SOURCES) $(libjvm_la_SOURCES) $(ecjx_SOURCES) \
$(gappletviewer_SOURCES) $(gc_analyze_SOURCES) \
- $(gcj_dbtool_SOURCES) $(am__gen_from_JIS_SOURCES_DIST) \
- $(gij_SOURCES) $(gjar_SOURCES) $(gjarsigner_SOURCES) \
- $(gjavah_SOURCES) $(gkeytool_SOURCES) $(gnative2ascii_SOURCES) \
- $(gorbd_SOURCES) $(grmic_SOURCES) $(grmid_SOURCES) \
- $(grmiregistry_SOURCES) $(gserialver_SOURCES) \
- $(gtnameserv_SOURCES) $(jv_convert_SOURCES)
+ $(gcj_dbtool_SOURCES) $(gcjh_SOURCES) \
+ $(am__gen_from_JIS_SOURCES_DIST) $(gij_SOURCES) \
+ $(gjar_SOURCES) $(gjarsigner_SOURCES) $(gjavah_SOURCES) \
+ $(gkeytool_SOURCES) $(gnative2ascii_SOURCES) $(gorbd_SOURCES) \
+ $(grmic_SOURCES) $(grmid_SOURCES) $(grmiregistry_SOURCES) \
+ $(gserialver_SOURCES) $(gtnameserv_SOURCES) \
+ $(jv_convert_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-exec-recursive install-info-recursive \
gjavah_LINK = $(GCJLINK)
gjavah_LDADD = -L$(here)/.libs libgcj-tools.la
gjavah_DEPENDENCIES = libgcj-tools.la
+gcjh_SOURCES =
+gcjh_LDFLAGS = --main=gnu.classpath.tools.javah.GcjhMain \
+ -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+
+gcjh_LINK = $(GCJLINK)
+gcjh_LDADD = -L$(here)/.libs libgcj-tools.la
+gcjh_DEPENDENCIES = libgcj-tools.la
gnative2ascii_SOURCES =
gnative2ascii_LDFLAGS = --main=gnu.classpath.tools.native2ascii.Native2ASCII \
-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
gcj-dbtool$(EXEEXT): $(gcj_dbtool_OBJECTS) $(gcj_dbtool_DEPENDENCIES)
@rm -f gcj-dbtool$(EXEEXT)
$(gcj_dbtool_LINK) $(gcj_dbtool_LDFLAGS) $(gcj_dbtool_OBJECTS) $(gcj_dbtool_LDADD) $(LIBS)
+gcjh$(EXEEXT): $(gcjh_OBJECTS) $(gcjh_DEPENDENCIES)
+ @rm -f gcjh$(EXEEXT)
+ $(gcjh_LINK) $(gcjh_LDFLAGS) $(gcjh_OBJECTS) $(gcjh_LDADD) $(LIBS)
gnu/gcj/convert/gen-from-JIS.$(OBJEXT): \
gnu/gcj/convert/$(am__dirstamp) \
gnu/gcj/convert/$(DEPDIR)/$(am__dirstamp)
+2007-03-06 Tom Tromey <tromey@redhat.com>
+
+ * tools/gnu/classpath/tools/javah/Main.java (getName): New
+ method.
+ (getParser): Now protected. Use getName. Add '-v' alias for
+ --verbose.
+ (postParse): New method.
+ (run): Now protected. Use postParse.
+ * tools/gnu/classpath/tools/javah/GcjhMain.java: New file.
+ * tools/Makefile.in: Rebuilt.
+ * tools/Makefile.am: Remove vm-tools.lst before creating it.
+
2007-03-05 Matthias Klose <doko@ubuntu.com>
* doc/Makefile.am(man_MANS): Add $(TOOLS_MANFILES).
find $(srcdir)/external/asm -name '*.java' -print > asm.lst
find $(srcdir)/gnu/classpath/tools -name '*.java' -print > classes.lst
if [ -f $(top_builddir)/../vm-tools-packages ]; then \
+ : > vm-tools.lst; \
for pkg in `cat $(top_builddir)/../vm-tools-packages`; do \
$(FIND) $(top_srcdir)/../$$pkg -follow -name '*.java' -print >> vm-tools.lst; \
done \
find $(srcdir)/external/asm -name '*.java' -print > asm.lst
find $(srcdir)/gnu/classpath/tools -name '*.java' -print > classes.lst
if [ -f $(top_builddir)/../vm-tools-packages ]; then \
+ : > vm-tools.lst; \
for pkg in `cat $(top_builddir)/../vm-tools-packages`; do \
$(FIND) $(top_srcdir)/../$$pkg -follow -name '*.java' -print >> vm-tools.lst; \
done \
--- /dev/null
+/* GcjhMain.java - gcjh main program
+ Copyright (C) 2007 Free Software Foundation, Inc.
+
+ This file is 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, 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; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 51 Franklin Street, 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. */
+
+
+package gnu.classpath.tools.javah;
+
+import gnu.classpath.tools.getopt.Option;
+import gnu.classpath.tools.getopt.OptionException;
+import gnu.classpath.tools.getopt.OptionGroup;
+import gnu.classpath.tools.getopt.Parser;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+public class GcjhMain extends Main
+{
+ ArrayList commands = new ArrayList();
+
+ public GcjhMain()
+ {
+ cni = true;
+ }
+
+ protected String getName()
+ {
+ return "gcjh";
+ }
+
+ protected Parser getParser()
+ {
+ Parser result = super.getParser();
+
+ result.setHeader("usage: gcjh [OPTION]... CLASS...");
+
+ OptionGroup text = new OptionGroup("CNI text options");
+ text.add(new Option("add", "Insert TEXT into class body", "TEXT")
+ {
+ public void parsed(String arg) throws OptionException
+ {
+ commands.add(new Text(Text.ADD, arg));
+ }
+ });
+ text.add(new Option("append", "Append TEXT after class declaration",
+ "TEXT")
+ {
+ public void parsed(String arg) throws OptionException
+ {
+ commands.add(new Text(Text.APPEND, arg));
+ }
+ });
+ text.add(new Option("friend", "Insert TEXT as a 'friend' declaration",
+ "TEXT")
+ {
+ public void parsed(String arg) throws OptionException
+ {
+ commands.add(new Text(Text.FRIEND, arg));
+ }
+ });
+ text.add(new Option("prepend", "Insert TEXT before start of class", "TEXT")
+ {
+ public void parsed(String arg) throws OptionException
+ {
+ commands.add(new Text(Text.PREPEND, arg));
+ }
+ });
+ result.add(text);
+
+ OptionGroup compat = new OptionGroup("Compatibility options (unused)");
+ // gcjh itself had compatibility options -old and -trace. I
+ // didn't add them here since they should really be unused by now.
+ compat.add(new Option("td", "Unused compatibility option", "DIRECTORY")
+ {
+ public void parsed(String arg) throws OptionException
+ {
+ }
+ });
+ // I don't believe anyone ever used these options.
+ compat.add(new Option("M", "Unused compatibility option")
+ {
+ public void parsed(String arg) throws OptionException
+ {
+ }
+ });
+ compat.add(new Option("MM", "Unused compatibility option")
+ {
+ public void parsed(String arg) throws OptionException
+ {
+ }
+ });
+ compat.add(new Option("MD", "Unused compatibility option")
+ {
+ public void parsed(String arg) throws OptionException
+ {
+ }
+ });
+ compat.add(new Option("MMD", "Unused compatibility option")
+ {
+ public void parsed(String arg) throws OptionException
+ {
+ }
+ });
+
+ result.add(compat);
+
+ return result;
+ }
+
+ protected void postParse(String[] names)
+ {
+ for (int i = 0; i < names.length; ++i)
+ textMap.put(names[i].replace('.', '/'), commands);
+ }
+
+ public static void main(String[] args) throws IOException
+ {
+ new GcjhMain().run(args);
+ }
+}
/* Main.java - javah main program
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2007 Free Software Foundation, Inc.
This file is part of GNU Classpath.
results.addAll(Arrays.asList(files));
}
- private Parser getParser()
+ protected String getName()
{
- ClasspathToolParser result = new ClasspathToolParser("javah", true);
+ return "javah";
+ }
+
+ protected Parser getParser()
+ {
+ ClasspathToolParser result = new ClasspathToolParser(getName(), true);
result.setHeader("usage: javah [OPTIONS] CLASS...");
result.add(classpath);
result.add(new Option('d', "Set output directory", "DIR")
cni = true;
}
});
- result.add(new Option("verbose", "Set verbose mode")
+ result.add(new Option('v', "verbose", "Set verbose mode")
{
public void parsed(String arg0) throws OptionException
{
}
}
- private void run(String[] args) throws IOException
+ protected void postParse(String[] names)
+ {
+ // Nothing here.
+ }
+
+ protected void run(String[] args) throws IOException
{
Parser p = getParser();
String[] classNames = p.parse(args);
+ postParse(classNames);
loader = classpath.getLoader();
boolean isDirectory = outFileName == null;