FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Makefile.in: Rebuilt.

Browse source 
2000-08-26  Anthony Green  <green@redhat.com>

        * Makefile.in: Rebuilt.
        * Makefile.am (java/lang/ClassLoader.h): Make _Jv_RunMain a
        friend.

        * prims.cc: Include ClassLoader.h.
        (_Jv_RunMain): When executing jar files, classpath must be the jar
        file only.  Lose our reference to the system ClassLoader in order
        to get a new one with the correct classpath.
        * java/lang/natSystem.cc (init_properties): When executing a jar
        file, only use the jar file for java.class.path.

        * gnu/gcj/runtime/VMClassLoader.java: Use the canonical file name
        for bytecode archives.

        * gnu/gcj/runtime/FirstThread.java: Handle case where manifest
        exists, but not Main-Class.

From-SVN: r35999
This commit is contained in:
Anthony Green 2000-08-26 19:25:13 +00:00 • committed by Anthony Green
parent 14fdf4b67e
commit 6aaeb97551
10 changed files with 102 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

53
libjava/java/lang/natSystem.cc
View file

@ -348,34 +348,31 @@ java::lang::System::init_properties (void)
}
}
// FIXME: find libgcj.zip and append its path?
char *classpath = ::getenv("CLASSPATH");
jstring cp = properties->getProperty (JvNewStringLatin1("java.class.path"));
java::lang::StringBuffer *sb = new java::lang::StringBuffer ();
if (_Jv_Jar_Class_Path)
{
sb->append (JvNewStringLatin1 (_Jv_Jar_Class_Path));
#ifdef WIN32
sb->append ((jchar) ';');
#else
sb->append ((jchar) ':');
#endif;
}
if (classpath)
{
sb->append (JvNewStringLatin1 (classpath));
#ifdef WIN32
sb->append ((jchar) ';');
#else
sb->append ((jchar) ':');
#endif;
}
if (cp != NULL)
sb->append (cp);
properties->put(JvNewStringLatin1 ("java.class.path"),
JvNewStringLatin1 (_Jv_Jar_Class_Path));
else
sb->append ((jchar) '.');
properties->put(JvNewStringLatin1 ("java.class.path"),
sb->toString ());
{
// FIXME: find libgcj.zip and append its path?
char *classpath = ::getenv("CLASSPATH");
jstring cp = properties->getProperty (JvNewStringLatin1("java.class.path"));
java::lang::StringBuffer *sb = new java::lang::StringBuffer ();
if (classpath)
{
sb->append (JvNewStringLatin1 (classpath));
#ifdef WIN32
sb->append ((jchar) ';');
#else
sb->append ((jchar) ':');
#endif;
}
if (cp != NULL)
sb->append (cp);
else
sb->append ((jchar) '.');
properties->put(JvNewStringLatin1 ("java.class.path"),
sb->toString ());
}
}