This commit is contained in:
jfrijters 2005-09-07 07:02:48 +00:00
Родитель 643436b805
Коммит b8d8624779
13 изменённых файлов: 3563 добавлений и 3556 удалений

Просмотреть файл

@ -49,7 +49,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("0.19.*")] [assembly: AssemblyVersion("0.20.0.0")]
// //
// In order to sign your assembly you must specify a key to use. Refer to the // In order to sign your assembly you must specify a key to use. Refer to the

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -9,7 +9,7 @@
<property name="ecj.compiler" value="true" /> <property name="ecj.compiler" value="true" />
<target name="HEAD"> <target name="HEAD">
<property name="Classpath.dir" value="${nant.project.basedir}/../../classpath" /> <property name="Classpath.dir" value="${nant.project.basedir}/../../classpath-0.18" />
<property name="allsources" value="allsources.lst" /> <property name="allsources" value="allsources.lst" />
<call target="IKVM.GNU.Classpath.dll" /> <call target="IKVM.GNU.Classpath.dll" />
</target> </target>
@ -48,7 +48,7 @@
<target name="IKVM.GNU.Classpath.dll" depends="classes"> <target name="IKVM.GNU.Classpath.dll" depends="classes">
<exec program="${nant.project.basedir}/../bin/ikvmc.exe" useruntimeengine="true"> <exec program="${nant.project.basedir}/../bin/ikvmc.exe" useruntimeengine="true">
<arg value="-version:0.19.*" /> <arg value="-version:0.20.0.0" />
<arg value="${signoption}" /> <arg value="${signoption}" />
<arg value="-compressresources" /> <arg value="-compressresources" />
<arg value="-opt:fields" /> <arg value="-opt:fields" />

Просмотреть файл

@ -45,7 +45,7 @@ public interface Configuration
{ {
// TODO // TODO
String CLASSPATH_HOME = ""; String CLASSPATH_HOME = "";
String CLASSPATH_VERSION = "0.17"; String CLASSPATH_VERSION = "0.18";
/** /**

Просмотреть файл

@ -248,7 +248,7 @@ public class VMSystemProperties
{ {
p.setProperty("user.dir", "."); p.setProperty("user.dir", ".");
} }
p.setProperty("awt.toolkit", "ikvm.awt.NetToolkit, IKVM.AWT.WinForms"); p.setProperty("awt.toolkit", "ikvm.awt.NetToolkit, IKVM.AWT.WinForms, Version=0.20.0.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58");
// HACK since we cannot use URL here (it depends on the properties being set), we manually encode the spaces in the assembly name // HACK since we cannot use URL here (it depends on the properties being set), we manually encode the spaces in the assembly name
p.setProperty("gnu.classpath.home.url", "ikvmres://" + ((cli.System.String)(Object)cli.System.Reflection.Assembly.GetExecutingAssembly().get_FullName()).Replace(" ", "%20") + "/lib"); p.setProperty("gnu.classpath.home.url", "ikvmres://" + ((cli.System.String)(Object)cli.System.Reflection.Assembly.GetExecutingAssembly().get_FullName()).Replace(" ", "%20") + "/lib");
p.setProperty("gnu.cpu.endian", cli.System.BitConverter.IsLittleEndian ? "little" : "big"); p.setProperty("gnu.cpu.endian", cli.System.BitConverter.IsLittleEndian ? "little" : "big");

Просмотреть файл

@ -34,7 +34,7 @@ final class ExceptionHelper
// able to distinguish it from a user specified blank string // able to distinguish it from a user specified blank string
private static final String NULL_STRING = new String(); private static final String NULL_STRING = new String();
private static final java.util.WeakHashMap exceptions = new java.util.WeakHashMap(); private static final java.util.WeakHashMap exceptions = new java.util.WeakHashMap();
private static final boolean cleanStackTrace = SystemProperties.getProperty("ikvm.cleanstacktrace", "1").equals("1"); private static final boolean cleanStackTrace = SafeGetEnvironmentVariable("IKVM_DISABLE_STACKTRACE_CLEANING") == null;
private static cli.System.Type System_Reflection_MethodBase = cli.System.Type.GetType("System.Reflection.MethodBase, mscorlib"); private static cli.System.Type System_Reflection_MethodBase = cli.System.Type.GetType("System.Reflection.MethodBase, mscorlib");
private static cli.System.Type System_Exception = cli.System.Type.GetType("System.Exception, mscorlib"); private static cli.System.Type System_Exception = cli.System.Type.GetType("System.Exception, mscorlib");
private static final Throwable NOT_REMAPPED = new cli.System.Exception(); private static final Throwable NOT_REMAPPED = new cli.System.Exception();
@ -288,6 +288,8 @@ final class ExceptionHelper
static native Throwable MapExceptionImpl(Throwable t); static native Throwable MapExceptionImpl(Throwable t);
static native cli.System.Type getTypeFromObject(Object o); static native cli.System.Type getTypeFromObject(Object o);
private static native String SafeGetEnvironmentVariable(String name);
static void printStackTrace(Throwable x) static void printStackTrace(Throwable x)
{ {
printStackTrace(x, System.err); printStackTrace(x, System.err);

Просмотреть файл

@ -49,7 +49,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("0.19.*")] [assembly: AssemblyVersion("0.20.0.0")]
// //
// In order to sign your assembly you must specify a key to use. Refer to the // In order to sign your assembly you must specify a key to use. Refer to the

Просмотреть файл

@ -49,7 +49,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("0.19.*")] [assembly: AssemblyVersion("0.20.0.0")]
// //
// In order to sign your assembly you must specify a key to use. Refer to the // In order to sign your assembly you must specify a key to use. Refer to the

Просмотреть файл

@ -49,7 +49,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("0.19.*")] [assembly: AssemblyVersion("0.20.0.0")]
// //
// In order to sign your assembly you must specify a key to use. Refer to the // In order to sign your assembly you must specify a key to use. Refer to the

Просмотреть файл

@ -8,7 +8,7 @@
<property name="REFERENCE_API_NAME" value="JDK-1.5" /> <property name="REFERENCE_API_NAME" value="JDK-1.5" />
--> -->
<property name="JAPI_HOME" value="c:\japi\japitools" /> <property name="JAPI_HOME" value="c:\japi\japitools" />
<property name="IKVM_VERSION" value="0.18.0.0" /> <property name="IKVM_VERSION" value="0.20.0.0" />
<target name="default"> <target name="default">
<call target="status" /> <call target="status" />

Просмотреть файл

@ -23,7 +23,7 @@
*/ */
.assembly JVM .assembly JVM
{ {
.ver 0:19:0:0 .ver 0:20:0:0
} }
.module JVM.DLL .module JVM.DLL

Просмотреть файл

@ -49,7 +49,7 @@ using System.Runtime.CompilerServices;
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("0.19.*")] [assembly: AssemblyVersion("0.20.0.0")]
// //
// In order to sign your assembly you must specify a key to use. Refer to the // In order to sign your assembly you must specify a key to use. Refer to the

Просмотреть файл

@ -34,6 +34,11 @@ namespace IKVM.NativeCode.java.lang
{ {
public class ExceptionHelper public class ExceptionHelper
{ {
public static string SafeGetEnvironmentVariable(string name)
{
return JVM.SafeGetEnvironmentVariable(name);
}
public static Exception getInnerException(Exception t) public static Exception getInnerException(Exception t)
{ {
return t.InnerException; return t.InnerException;