diff options
| author | green <green@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-08-21 06:05:20 +0000 |
|---|---|---|
| committer | green <green@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-08-21 06:05:20 +0000 |
| commit | af63e7f87c4980db71b18dda95cd0b1036347dcf (patch) | |
| tree | f43cbb5fc8ea1cd44134f23db03b2228cc3604df /libjava/include | |
| parent | dff07cdd856af3bd7b1f8339e1665e52c36db5e2 (diff) | |
| download | ppe42-gcc-af63e7f87c4980db71b18dda95cd0b1036347dcf.tar.gz ppe42-gcc-af63e7f87c4980db71b18dda95cd0b1036347dcf.zip | |
Sun Aug 20 21:02:48 2000 Anthony Green <green@redhat.com>
* java/lang/natSystem.cc (init_properties): Change sourceware
reference to sources.redhat.com.
* include/java-props.h: Add _Jv_Jar_Class_Path.
* prims.cc: Ditto. Set it from `gij -jar file' option.
* java/lang/natSystem.cc (init_properties): Set java.class.path
from
{gij -jar file}:{CLASSPATH variable}:{-Djava.class.path= or .}
* java/util/PropertyPermission.java: Import from GNU Classpath.
* Makefile.in: Rebuilt.
* Makefile.am: Add java/util/PropertyPermission.java.
* java/lang/System.java: Add setProperty method.
* gij.cc (main): Add -jar option to execute jar files.
(help): Describe -jar option.
* prims.cc (_Jv_RunMain): Add support for jar execution mode.
* gnu/gcj/tools/Gij.java: New file.
* include/jvm.h: Add is_jar argument to _Jv_RunMain.
* gnu/gcj/runtime/FirstThread.java (main): New method.
* java/util/jar/Attributes.java: Correct comment spelling.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35829 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/include')
| -rw-r--r-- | libjava/include/java-props.h | 3 | ||||
| -rw-r--r-- | libjava/include/jvm.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libjava/include/java-props.h b/libjava/include/java-props.h index f7e6d36f82a..9be30996ebc 100644 --- a/libjava/include/java-props.h +++ b/libjava/include/java-props.h @@ -22,6 +22,9 @@ typedef struct // Set to NULL-terminated list of properties set at compile time. extern const char **_Jv_Compiler_Properties; +// The JAR file to add to the beginning of java.class.path. +extern const char *_Jv_Jar_Class_Path; + // Properties taken from the user's environment. extern property_pair *_Jv_Environment_Properties; diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h index 5d5e0b9b24b..65178851085 100644 --- a/libjava/include/jvm.h +++ b/libjava/include/jvm.h @@ -157,7 +157,7 @@ void _Jv_SetMaximumHeapSize (const char *arg); void *_Jv_AllocBytesChecked (jsize size) __attribute__((__malloc__)); extern "C" void JvRunMain (jclass klass, int argc, const char **argv); -void _Jv_RunMain (const char* name, int argc, const char **argv); +void _Jv_RunMain (const char* name, int argc, const char **argv, bool is_jar); // This function is used to determine the hash code of an object. inline jint |

