зеркало из https://github.com/mono/ikvm-fork.git
Removed pre-generated stub jars from cvs and modified build process to generate them during the build.
This commit is contained in:
Родитель
e5bea7a81b
Коммит
19be487fe0
Двоичные данные
classpath/IKVM.Runtime.jar
Двоичные данные
classpath/IKVM.Runtime.jar
Двоичный файл не отображается.
Двоичные данные
classpath/System.Core.jar
Двоичные данные
classpath/System.Core.jar
Двоичный файл не отображается.
Двоичные данные
classpath/System.Data.jar
Двоичные данные
classpath/System.Data.jar
Двоичный файл не отображается.
Двоичные данные
classpath/System.Drawing.jar
Двоичные данные
classpath/System.Drawing.jar
Двоичный файл не отображается.
Двоичные данные
classpath/System.jar
Двоичные данные
classpath/System.jar
Двоичный файл не отображается.
Двоичные данные
classpath/mscorlib.jar
Двоичные данные
classpath/mscorlib.jar
Двоичный файл не отображается.
|
@ -12,11 +12,11 @@
|
||||||
<nant buildfile="native/native.build" />
|
<nant buildfile="native/native.build" />
|
||||||
<nant buildfile="reflect/reflect.build" />
|
<nant buildfile="reflect/reflect.build" />
|
||||||
<nant buildfile="ikvmc/ikvmc.build" />
|
<nant buildfile="ikvmc/ikvmc.build" />
|
||||||
|
<nant buildfile="ikvmstub/ikvmstub.build" />
|
||||||
<nant buildfile="openjdk/openjdk.build" />
|
<nant buildfile="openjdk/openjdk.build" />
|
||||||
<nant buildfile="runtime/runtime.build" />
|
<nant buildfile="runtime/runtime.build" />
|
||||||
<nant buildfile="openjdk/openjdk.build" target="tools" />
|
<nant buildfile="openjdk/openjdk.build" target="tools" />
|
||||||
<nant buildfile="ikvm/ikvm.build" />
|
<nant buildfile="ikvm/ikvm.build" />
|
||||||
<nant buildfile="ikvmstub/ikvmstub.build" />
|
|
||||||
<nant buildfile="awt/awt.build" />
|
<nant buildfile="awt/awt.build" />
|
||||||
<if test="${platform::is-win32()}">
|
<if test="${platform::is-win32()}">
|
||||||
<nant buildfile="jvm/jvm.build" />
|
<nant buildfile="jvm/jvm.build" />
|
||||||
|
|
|
@ -29,8 +29,20 @@
|
||||||
<delete>
|
<delete>
|
||||||
<fileset basedir=".">
|
<fileset basedir=".">
|
||||||
<include name="**.class"/>
|
<include name="**.class"/>
|
||||||
|
<include name="mscorlib.jar" />
|
||||||
|
<include name="System.jar" />
|
||||||
|
<include name="System.Core.jar" />
|
||||||
|
<include name="System.Data.jar" />
|
||||||
|
<include name="System.Drawing.jar" />
|
||||||
|
<include name="IKVM.Runtime.jar" />
|
||||||
</fileset>
|
</fileset>
|
||||||
</delete>
|
</delete>
|
||||||
|
<exec program="${project::get-base-directory()}/../bin/ikvmstub.exe" commandline="mscorlib" useruntimeengine="true" />
|
||||||
|
<exec program="${project::get-base-directory()}/../bin/ikvmstub.exe" commandline="System" useruntimeengine="true" />
|
||||||
|
<exec program="${project::get-base-directory()}/../bin/ikvmstub.exe" commandline="System.Core" useruntimeengine="true" />
|
||||||
|
<exec program="${project::get-base-directory()}/../bin/ikvmstub.exe" commandline="System.Data" useruntimeengine="true" />
|
||||||
|
<exec program="${project::get-base-directory()}/../bin/ikvmstub.exe" commandline="System.Drawing" useruntimeengine="true" />
|
||||||
|
<exec program="${project::get-base-directory()}/../bin/ikvmstub.exe" commandline="IKVM.Runtime" useruntimeengine="true" />
|
||||||
<property name="IKVM.Runtime" value="IKVM.Runtime" />
|
<property name="IKVM.Runtime" value="IKVM.Runtime" />
|
||||||
<if test="${signoption != ''}">
|
<if test="${signoption != ''}">
|
||||||
<loadfile file="../tools/pubkey.txt" property="publickey" />
|
<loadfile file="../tools/pubkey.txt" property="publickey" />
|
||||||
|
@ -52,7 +64,7 @@
|
||||||
</replacetokens>
|
</replacetokens>
|
||||||
</filterchain>
|
</filterchain>
|
||||||
</copy>
|
</copy>
|
||||||
<exec program="javac" commandline="-J-Xmx1536M -g -nowarn -bootclasspath ../classpath/mscorlib.jar${pathsep}../classpath/System.jar${pathsep}../classpath/System.Core.jar${pathsep}../classpath/System.Data.jar${pathsep}../classpath/System.Drawing.jar${pathsep}../classpath/IKVM.Runtime.jar @allsources.lst" useruntimeengine="false" />
|
<exec program="javac" commandline="-J-Xmx1536M -g -nowarn -bootclasspath mscorlib.jar${pathsep}System.jar${pathsep}System.Core.jar${pathsep}System.Data.jar${pathsep}System.Drawing.jar${pathsep}IKVM.Runtime.jar @allsources.lst" useruntimeengine="false" />
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="rmi">
|
<target name="rmi">
|
||||||
|
@ -117,13 +129,9 @@
|
||||||
<arg value="-target:library" />
|
<arg value="-target:library" />
|
||||||
<arg value="-sharedclassloader" />
|
<arg value="-sharedclassloader" />
|
||||||
<arg value="-r:mscorlib" />
|
<arg value="-r:mscorlib" />
|
||||||
|
<arg value="-r:System" />
|
||||||
|
<arg value="-r:System.Core" />
|
||||||
<arg value="-r:IKVM.Runtime" />
|
<arg value="-r:IKVM.Runtime" />
|
||||||
<!-- Instead of using -r:System.Core we add System.Core.jar (in response.txt)
|
|
||||||
(containing only System.Runtime.CompilerServices.ExtensionAttribute).
|
|
||||||
This allows compilation to succeed (though with warnings) when System.Core.dll is not available.
|
|
||||||
It also prevents accidentally taking additional dependencies on System.Core.dll.
|
|
||||||
-->
|
|
||||||
<arg value="-r:${framework::get-assembly-directory(framework::get-target-framework())}/System.dll" />
|
|
||||||
<!-- we already know that the JNI assembly is not available, so suppress the warning -->
|
<!-- we already know that the JNI assembly is not available, so suppress the warning -->
|
||||||
<arg value="-nowarn:110" />
|
<arg value="-nowarn:110" />
|
||||||
<arg value="@response.txt" />
|
<arg value="@response.txt" />
|
||||||
|
|
|
@ -37,7 +37,6 @@ assembly.class
|
||||||
../classpath/java/lang/*.class
|
../classpath/java/lang/*.class
|
||||||
../classpath/java/util/concurrent/atomic/*.class
|
../classpath/java/util/concurrent/atomic/*.class
|
||||||
../classpath/sun/misc/*.class
|
../classpath/sun/misc/*.class
|
||||||
../classpath/System.Core.jar
|
|
||||||
../../openjdk6-b16/jdk/src/share/classes/java/awt/AWTPermission.class
|
../../openjdk6-b16/jdk/src/share/classes/java/awt/AWTPermission.class
|
||||||
../../openjdk6-b16/build/linux-amd64/gensrc/java/lang/*.class
|
../../openjdk6-b16/build/linux-amd64/gensrc/java/lang/*.class
|
||||||
../../openjdk6-b16/build/linux-amd64/gensrc/java/nio/*.class
|
../../openjdk6-b16/build/linux-amd64/gensrc/java/nio/*.class
|
||||||
|
|
Загрузка…
Ссылка в новой задаче