зеркало из https://github.com/mono/ikvm-fork.git
Moved VMSystemProperties from gnu.classpath to java.lang.
This commit is contained in:
Родитель
82fb3d2682
Коммит
7a856abc0a
|
@ -148,7 +148,7 @@ public final class Startup
|
||||||
|
|
||||||
public static void setProperties(cli.System.Collections.Hashtable props)
|
public static void setProperties(cli.System.Collections.Hashtable props)
|
||||||
{
|
{
|
||||||
gnu.classpath.VMSystemProperties.props = props;
|
java.lang.VMSystemProperties.props = props;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void enterMainThread()
|
public static void enterMainThread()
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
../classpath/gnu/classpath/VMSystemProperties.java
|
|
||||||
../classpath/gnu/java/net/protocol/ikvmres/Handler.java
|
../classpath/gnu/java/net/protocol/ikvmres/Handler.java
|
||||||
../classpath/ikvm/extensions/ExtensionMethods.java
|
../classpath/ikvm/extensions/ExtensionMethods.java
|
||||||
../classpath/ikvm/internal/__unspecified.java
|
../classpath/ikvm/internal/__unspecified.java
|
||||||
|
@ -63,6 +62,7 @@ java/lang/Shutdown.java
|
||||||
java/lang/StringHelper.java
|
java/lang/StringHelper.java
|
||||||
java/lang/System.java
|
java/lang/System.java
|
||||||
java/lang/Thread.java
|
java/lang/Thread.java
|
||||||
|
java/lang/VMSystemProperties.java
|
||||||
java/lang/VMThread.java
|
java/lang/VMThread.java
|
||||||
java/lang/ref/Reference.java
|
java/lang/ref/Reference.java
|
||||||
java/lang/ref/SoftReference.java
|
java/lang/ref/SoftReference.java
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
|
|
||||||
package java.lang;
|
package java.lang;
|
||||||
|
|
||||||
import gnu.classpath.VMSystemProperties;
|
|
||||||
import ikvm.runtime.AssemblyClassLoader;
|
import ikvm.runtime.AssemblyClassLoader;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.MalformedURLException;
|
import java.net.MalformedURLException;
|
||||||
|
|
|
@ -69,7 +69,7 @@ final class Props
|
||||||
String vfsroot = getVirtualFileSystemRoot();
|
String vfsroot = getVirtualFileSystemRoot();
|
||||||
props.put("java.home", vfsroot.substring(0, vfsroot.length() - 1));
|
props.put("java.home", vfsroot.substring(0, vfsroot.length() - 1));
|
||||||
props.put("sun.boot.library.path", vfsroot + "bin");
|
props.put("sun.boot.library.path", vfsroot + "bin");
|
||||||
gnu.classpath.VMSystemProperties.initOpenJDK(props);
|
VMSystemProperties.initOpenJDK(props);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static native String getVirtualFileSystemRoot();
|
private static native String getVirtualFileSystemRoot();
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2004-2008 Jeroen Frijters
|
Copyright (C) 2004-2009 Jeroen Frijters
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied
|
This software is provided 'as-is', without any express or implied
|
||||||
warranty. In no event will the authors be held liable for any damages
|
warranty. In no event will the authors be held liable for any damages
|
||||||
|
@ -21,8 +21,9 @@
|
||||||
jeroen@frijters.net
|
jeroen@frijters.net
|
||||||
|
|
||||||
*/
|
*/
|
||||||
package gnu.classpath;
|
package java.lang;
|
||||||
|
|
||||||
|
import gnu.classpath.Configuration;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
|
|
||||||
@ikvm.lang.Internal
|
@ikvm.lang.Internal
|
|
@ -26,7 +26,6 @@ assembly.class
|
||||||
sun/net/www/protocol/jar/*.class
|
sun/net/www/protocol/jar/*.class
|
||||||
sun/nio/ch/*.class
|
sun/nio/ch/*.class
|
||||||
sun/reflect/*.class
|
sun/reflect/*.class
|
||||||
../classpath/gnu/classpath/*.class
|
|
||||||
../classpath/gnu/java/net/protocol/ikvmres/*.class
|
../classpath/gnu/java/net/protocol/ikvmres/*.class
|
||||||
../classpath/ikvm/extensions/*.class
|
../classpath/ikvm/extensions/*.class
|
||||||
../classpath/ikvm/internal/*.class
|
../classpath/ikvm/internal/*.class
|
||||||
|
|
|
@ -98,7 +98,7 @@ namespace IKVM.NativeCode.gnu.java.net.protocol.ikvmres
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace IKVM.NativeCode.gnu.classpath
|
namespace IKVM.NativeCode.java.lang
|
||||||
{
|
{
|
||||||
static class VMSystemProperties
|
static class VMSystemProperties
|
||||||
{
|
{
|
||||||
|
|
Загрузка…
Ссылка в новой задаче