From 2263ca09cbad6f97bf7dcdfeff9560a12184eb42 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 22 Aug 2002 22:44:26 +0000 Subject: [PATCH] gij.cc (help): Document -cp and -classpath. * gij.cc (help): Document -cp and -classpath. (main): Handle -classpath. From-SVN: r56522 --- libjava/ChangeLog | 5 +++++ libjava/gij.cc | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 2d8e5931f72..e01ab1ba9ae 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2002-08-22 Tom Tromey + + * gij.cc (help): Document -cp and -classpath. + (main): Handle -classpath. + 2002-08-21 Tom Tromey * Makefile.in: Rebuilt. diff --git a/libjava/gij.cc b/libjava/gij.cc index bb56b112b6d..47b2d6028de 100644 --- 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]);