diff options
Diffstat (limited to 'libjava/classpath')
25 files changed, 182 insertions, 5 deletions
diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index f7d7868..6bb8214 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,15 @@ +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). diff --git a/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am index 8ba984b..a719b1d 100755 --- a/libjava/classpath/tools/Makefile.am +++ b/libjava/classpath/tools/Makefile.am @@ -156,6 +156,7 @@ $(TOOLS_ZIP): $(TOOLS_JAVA_FILES) 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 \ diff --git a/libjava/classpath/tools/Makefile.in b/libjava/classpath/tools/Makefile.in index 960dc6e..4558f8a 100644 --- a/libjava/classpath/tools/Makefile.in +++ b/libjava/classpath/tools/Makefile.in @@ -1080,6 +1080,7 @@ $(TOOLS_ZIP): $(TOOLS_JAVA_FILES) 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 \ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$1.class Binary files differnew file mode 100644 index 0000000..12eb315 --- /dev/null +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$1.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$2.class Binary files differnew file mode 100644 index 0000000..3163e84 --- /dev/null +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$3.class Binary files differnew file mode 100644 index 0000000..0dbe2c8 --- /dev/null +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$4.class Binary files differnew file mode 100644 index 0000000..56d4887 --- /dev/null +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$5.class Binary files differnew file mode 100644 index 0000000..362d0e0 --- /dev/null +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$6.class Binary files differnew file mode 100644 index 0000000..9544202 --- /dev/null +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$7.class Binary files differnew file mode 100644 index 0000000..7617743 --- /dev/null +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$7.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$8.class Binary files differnew file mode 100644 index 0000000..5412b9d --- /dev/null +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$8.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$9.class Binary files differnew file mode 100644 index 0000000..0a7b34f --- /dev/null +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain$9.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain.class Binary files differnew file mode 100644 index 0000000..961fa5c --- /dev/null +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/GcjhMain.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class Binary files differindex 6ec567c..8c33dd3 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class Binary files differindex a4a19b4..7bebfc8 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class Binary files differindex 68e8f83..b59e017 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class Binary files differindex ef7248b..db5582d 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class Binary files differindex 0bcc044..ef70381 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class Binary files differindex 9b90b1e..e2e627d 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class Binary files differindex 8d0e8b0..249ec5c 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class Binary files differindex ba3351c..001bfa0 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class Binary files differindex 4f71d9e..aee9be7 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class Binary files differindex c20b0af..27c3b7e 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/GcjhMain.java b/libjava/classpath/tools/gnu/classpath/tools/javah/GcjhMain.java new file mode 100644 index 0000000..7faed16 --- /dev/null +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/GcjhMain.java @@ -0,0 +1,152 @@ +/* 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); + } +} diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java b/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java index 2cddbaa..729af47 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java +++ b/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java @@ -1,5 +1,5 @@ /* 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. @@ -179,9 +179,14 @@ public class Main 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") @@ -249,7 +254,7 @@ public class Main 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 { @@ -317,10 +322,16 @@ public class Main } } - 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; |