diff options
| author | jfrijters <jfrijters> | 2010-04-23 08:58:36 +0400 |
|---|---|---|
| committer | jfrijters <jfrijters> | 2010-04-23 08:58:36 +0400 |
| commit | c773ca69868d68fcb18fe01e64446c5f6d6903f0 (patch) | |
| tree | d152fecd1ff8c9153af940f4376087fe73490f89 /openjdk/openjdk.build | |
| parent | b366e8e9b3133fc9e6d454ce08976d92b3339306 (diff) | |
- Rewrote assembly loading for ikvmc and ikvmstub (and unified it). It now no longer depends on the runtime to do assembly name to path resolution and behaves more csc like.
- Added -nostdlib and -lib options to ikvmc and ikvmstub.
- openjdk.build now uses our System.Core.dll (unless we're building on .NET 4.0).
Diffstat (limited to 'openjdk/openjdk.build')
| -rw-r--r-- | openjdk/openjdk.build | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openjdk/openjdk.build b/openjdk/openjdk.build index 9b03f944..3823f7e6 100644 --- a/openjdk/openjdk.build +++ b/openjdk/openjdk.build @@ -47,7 +47,7 @@ </if> </target> - <target name="classes" depends="version allsources.gen.lst"> + <target name="classes" depends="version allsources.gen.lst System.Core"> <delete> <fileset basedir="../classpath"> <include name="**.class"/> @@ -74,7 +74,7 @@ <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" /> + <exec program="${project::get-base-directory()}/../bin/ikvmstub.exe" commandline="../bin/IKVM.Runtime.dll" useruntimeengine="true" /> <property name="IKVM.Runtime" value="IKVM.Runtime" /> <if test="${signoption != ''}"> <loadfile file="../tools/pubkey.txt" property="publickey" /> @@ -165,6 +165,7 @@ </target> <target name="core" depends="version response.gen.txt"> + <copy file="../bin/IKVM.Runtime.dll" todir="." /> <exec program="${project::get-base-directory()}/../bin/ikvmc.exe" useruntimeengine="true"> <arg value="-version:${VERSION}" /> <arg value="${signoption}" /> @@ -183,7 +184,6 @@ <arg value="@response.gen.txt" /> </exec> <if test="${platform::is-win32()}"> - <copy file="../bin/IKVM.Runtime.dll" tofile="IKVM.Runtime.dll" /> <exec program="peverify" commandline="-nologo IKVM.OpenJDK.Beans.dll" /> <exec program="peverify" commandline="-nologo IKVM.OpenJDK.Charsets.dll" /> <exec program="peverify" commandline="-nologo IKVM.OpenJDK.Corba.dll" /> |