re PR java/20309 (gcjh needs a -force option)

2005-05-03  Thomas Fitzsimmons  <fitzsim@redhat.com>

        PR java/20309
        * Make-lang.in (java): Add gjnih.
        (JAVA_TARGET_INDEPENDENT_BIN_TOOLS): Likewise.
        (GJNIH_OBJS): New variable.
        (gjnih$(exeext)): New target.
        (JAVA_MANFILES): Add gjnih.1.
        (java.uninstall): Add gjnih.1.
        (java.mostlyclean): Add gjnih.
        (java.maintainer-clean): Add gjnih.1.
        (java/gjavah-jni.o): New target.
        (.INTERMEDIATE): Add gjnih.pod.
        (gjnih.pod): New target.
        * config-lang.in (stagestuff): Add gjnih.
        * gcj.texi (Top): Add gjnih node.
        (Invoking gcjh): Add descriptions of -force, -old, -trace, -J and
        -bootclasspath options.
        (Invoking gjnih): New node.
        * gjavah.c Initialize flag_jni to 1 if JNI_DEFAULT is defined.
        (TOOLNAME): New macro.
        (error): Replace hard-coded gcjh with TOOLNAME.
        (process_file): Likewise.
        (usage): Likewise.
        (version): Likewise.
        (help): Likewise.  Add help output for -force, -old, -trace and -J
        options.
        (OPT_FORCE, OPT_OLD, OPT_TRACE): New macros.
        (options): Add force, old, trace and J fields.
        (main): Handle -force, -old, -trace and -J options.

From-SVN: r99206

1 files changed, 133 insertions, 1 deletions

diff --git a/gcc/java/gcj.texi b/gcc/java/gcj.texi
index 53e2616..b5fc57a 100644
--- a/gcc/java/gcj.texi
+++ b/gcc/java/gcj.texi
@@ -59,6 +59,8 @@ man page gfdl(7).
 @direntry
 * gcjh: (gcj)Invoking gcjh.
                             Generate header files from Java class files
+* gjnih: (gcj)Invoking gjnih.
+                            Generate JNI header files from Java class files
 * jv-scan: (gcj)Invoking jv-scan.
                             Print information about Java source files
 * jcf-dump: (gcj)Invoking jcf-dump.
@@ -111,6 +113,7 @@ files and object files, and it can read both Java source code and
 * Invoking gcj::	Compiler options supported by @command{gcj}
 * Compatibility::	Compatibility between gcj and other tools for Java
 * Invoking gcjh::       Generate header files from class files
+* Invoking gjnih::      Generate JNI header files from class files
 * Invoking jv-scan::    Print information about source files
 * Invoking jcf-dump::   Print information about class files
 * Invoking gij::	Interpreting Java bytecodes
@@ -145,7 +148,7 @@ gcj [@option{-I}@var{dir}@dots{}] [@option{-d} @var{dir}@dots{}]
     @var{sourcefile}@dots{}
 @c man end
 @c man begin SEEALSO gcj
-gcc(1), gcjh(1), gij(1), jv-scan(1), jcf-dump(1), gfdl(7),
+gcc(1), gcjh(1), gjnih(1), gij(1), jv-scan(1), jcf-dump(1), gfdl(7),
 and the Info entries for @file{gcj} and @file{gcc}.
 @c man end
 @end ignore
@@ -673,9 +676,11 @@ required native methods.
 @ignore
 @c man begin SYNOPSIS gcjh
 gcjh [@option{-stubs}] [@option{-jni}]
+    [@option{-force}] [@option{-old}] [@option{-trace}] [@option{-J} @var{option}]
     [@option{-add} @var{text}] [@option{-append} @var{text}] [@option{-friend} @var{text}]
     [@option{-preprend} @var{text}]
     [@option{--classpath}=@var{path}] [@option{--CLASSPATH}=@var{path}]
+    [@option{--bootclasspath}=@var{path}]
     [@option{-I}@var{dir}@dots{}] [@option{-d} @var{dir}@dots{}]
     [@option{-o} @var{file}] [@option{-td} @var{dir}]
     [@option{-M}] [@option{-MM}] [@option{-MD}] [@option{-MMD}]
@@ -701,6 +706,18 @@ By default the stub file will be named after the class, with a suffix of
 This tells @code{gcjh} to generate a JNI header or stub.  By default,
 CNI headers are generated.
 
+@item -force
+This option forces @code{gcjh} to write the output file.
+
+@item -old
+This option is accepted but ignored for compatibility.
+
+@item -trace
+This option is accepted but ignored for compatibility.
+
+@item -J @var{option}
+This option is accepted but ignored for compatibility.
+
 @item -add @var{text}
 Inserts @var{text} into the class body.  This is ignored in JNI mode.
 
@@ -718,6 +735,7 @@ This is ignored in JNI mode.
 
 @item --classpath=@var{path}
 @itemx --CLASSPATH=@var{path}
+@itemx --bootclasspath=@var{path}
 @itemx -I@var{directory}
 @itemx -d @var{directory}
 @itemx -o @var{file}
@@ -757,6 +775,120 @@ All remaining options are considered to be names of classes.
 
 @c man end
 
+@node Invoking gjnih
+@chapter Invoking gjnih
+
+@c man title gjnih generate JNI header files from Java class files
+
+@c man begin DESCRIPTION gjnih
+
+The @code{gjnih} program is used to generate JNI header files from class
+files.  Running it is equivalent to running @code{gcjh -jni}.
+
+@c man end
+
+@ignore
+@c man begin SYNOPSIS gjnih
+gjnih [@option{-stubs}] [@option{-jni}]
+    [@option{-force}] [@option{-old}] [@option{-trace}] [@option{-J} @var{option}]
+    [@option{-add} @var{text}] [@option{-append} @var{text}] [@option{-friend} @var{text}]
+    [@option{-preprend} @var{text}]
+    [@option{--classpath}=@var{path}] [@option{--CLASSPATH}=@var{path}]
+    [@option{--bootclasspath}=@var{path}]
+    [@option{-I}@var{dir}@dots{}] [@option{-d} @var{dir}@dots{}]
+    [@option{-o} @var{file}] [@option{-td} @var{dir}]
+    [@option{-M}] [@option{-MM}] [@option{-MD}] [@option{-MMD}]
+    [@option{--version}] [@option{--help}] [@option{-v}] [@option{--verbose}]
+    @var{classname}@dots{}
+@c man end
+@c man begin SEEALSO gjnih
+gcc(1), gcj(1), gcjh(1), gij(1), jv-scan(1), jcf-dump(1), gfdl(7),
+and the Info entries for @file{gcj} and @file{gcc}.
+@c man end
+@end ignore
+
+@c man begin OPTIONS gjnih
+
+@table @gcctabopt
+@item -stubs
+This causes @code{gjnih} to generate stub files instead of header files.
+By default the stub file will be named after the class, with a suffix of
+@samp{.c}.
+
+@item -jni
+This option specifies the default behavior which is to generate a JNI
+header or stub.
+
+@item -force
+This option forces @code{gjnih} to write the output file.
+
+@item -old
+This option is accepted but ignored for compatibility.
+
+@item -trace
+This option is accepted but ignored for compatibility.
+
+@item -J @var{option}
+This option is accepted but ignored for compatibility.
+
+@item -add @var{text}
+Inserts @var{text} into the class body.  This is ignored in by
+@code{gjnih}.
+
+@item -append @var{text}
+Inserts @var{text} into the header file after the class declaration.
+This is ignored in by @code{gjnih}.
+
+@item -friend @var{text}
+Inserts @var{text} into the class as a @code{friend} declaration.
+This is ignored by @code{gjnih}.
+
+@item -prepend @var{text}
+Inserts @var{text} into the header file before the class declaration.
+This is ignored in by @code{gjnih}.
+
+@item --classpath=@var{path}
+@itemx --CLASSPATH=@var{path}
+@itemx --bootclasspath=@var{path}
+@itemx -I@var{directory}
+@itemx -d @var{directory}
+@itemx -o @var{file}
+These options are all identical to the corresponding @command{gcj} options.
+
+@item -o @var{file}
+Sets the output file name.  This cannot be used if there is more than
+one class on the command line.
+
+@item -td @var{directory}
+Sets the name of the directory to use for temporary files.
+
+@item -M
+Print all dependencies to stdout; suppress ordinary output.
+
+@item -MM
+Print non-system dependencies to stdout; suppress ordinary output.
+
+@item -MD
+Print all dependencies to stdout.
+
+@item -MMD
+Print non-system dependencies to stdout.
+
+@item --help
+Print help about @code{gjnih} and exit.  No further processing is done.
+
+@item --version
+Print version information for @code{gjnih} and exit.  No further
+processing is done.
+
+@item -v, --verbose
+Print extra information while running.
+@end table
+
+All remaining options are considered to be names of classes.
+
+@c man end
+
 @node Invoking jv-scan
 @chapter Invoking jv-scan