* gij.cc (help): Document -cp and -classpath.

	(main): Handle -classpath.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@56522 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 2d8e593..e01ab1b 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-22  Tom Tromey  <tromey@redhat.com>
+
+       * gij.cc (help): Document -cp and -classpath.
+       (main): Handle -classpath.
+
 2002-08-21  Tom Tromey  <tromey@redhat.com>
 
        * Makefile.in: Rebuilt.

diff --git a/libjava/gij.cc b/libjava/gij.cc
index bb56b11..47b2d60 100644 (file)
--- a/libjava/gij.cc
+++ b/libjava/gij.cc
@@ -28,11 +28,14 @@ help ()
   printf ("          to interpret Java bytecodes, or\n");
   printf ("       gij -jar [OPTION] ... JARFILE [ARGS] ...\n");
   printf ("          to execute a jar file\n\n");
+  printf ("  --cp LIST         set class path\n");
+  printf ("  --classpath LIST  set class path\n");
   printf ("  -DVAR=VAL         define property VAR with value VAL\n");
   printf ("  --help            print this help, then exit\n");
   printf ("  --ms=NUMBER       set initial heap size\n");
   printf ("  --mx=NUMBER       set maximum heap size\n");
   printf ("  --version         print version number, then exit\n");
+  printf ("\nOptions can be specified with `-' or `--'.\n");
   printf ("\nSee http://gcc.gnu.org/java/ for information on reporting bugs\n");
   exit (0);
 }
@@ -115,6 +118,15 @@ main (int argc, const char **argv)
            goto no_arg;
          _Jv_SetMaximumHeapSize (argv[++i]);
        }
+      else if (! strcmp (arg, "-cp") || ! strcmp (arg, "-classpath"))
+       {
+         if (i >= argc - 1)
+           goto no_arg;
+         // We set _Jv_Jar_Class_Path.  If the user specified `-jar'
+         // then the jar code will override this.  This is the
+         // correct behavior.
+         _Jv_Jar_Class_Path = argv[++i];
+       }
       else
        {
          fprintf (stderr, "gij: unrecognized option -- `%s'\n", argv[i]);