Integrated GNU Classpath / OpenJDK hybrid build.

This commit is contained in:
jfrijters 2007-05-24 12:17:38 +00:00
Родитель 30602ad394
Коммит 595e22437e
6 изменённых файлов: 35 добавлений и 11 удалений

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

@ -2,12 +2,14 @@
<project name="awt" default="awt">
<target name="awt">
<property overwrite="false" name="signed" value="" />
<property overwrite="false" name="hybrid" value="" />
<csc target="library" output="../bin/IKVM.AWT.WinForms.dll" define="TRACE;${signed}">
<sources>
<include name="*.cs" />
</sources>
<references>
<include name="../bin/IKVM.GNU.Classpath.dll" asis="true" />
<include unless="${hybrid}" name="../bin/IKVM.GNU.Classpath.dll" asis="true" />
<include if="${hybrid}" name="../bin/IKVM.Hybrid.GNU.Classpath.OpenJDK.dll" asis="true" />
<include name="../bin/IKVM.Runtime.dll" asis="true" />
<include name="System.Windows.Forms.dll" asis="true" />
<include name="System.Drawing.dll" asis="true" />

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

@ -6,12 +6,18 @@
<property name="ilasm_signoption" value="/key:@ikvm-key" />
<call target="all" />
</target>
<target name="hybrid">
<property name="hybrid" value="true" />
<call target="all" />
</target>
<target name="all">
<property overwrite="false" name="hybrid" value="false" />
<nant buildfile="tools/tools.build" />
<nant buildfile="runtime/runtime.build" target="first-pass" />
<nant buildfile="native/native.build" />
<nant buildfile="ikvmc/ikvmc.build" />
<nant buildfile="classpath/classpath.build" />
<nant unless="${hybrid}" buildfile="classpath/classpath.build" />
<nant if="${hybrid}" buildfile="openjdk/openjdk.build" />
<nant buildfile="runtime/runtime.build" />
<nant buildfile="ikvm/ikvm.build" />
<nant buildfile="ikvmstub/ikvmstub.build" />
@ -26,6 +32,7 @@
<include name="bin/IKVM.AWT.WinForms.dll" />
<include name="bin/IKVM.Runtime.dll" />
<include name="bin/IKVM.GNU.Classpath.dll" />
<include name="bin/IKVM.Hybrid.GNU.Classpath.OpenJDK.dll" />
<include name="bin/ikvm-native.dll" />
<include name="bin/libikvm-native.so" />
<include name="bin/ikvm.exe" />

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

@ -1,13 +1,19 @@
<?xml version="1.0"?>
<project name="ikvm" default="ikvm">
<target name="hybrid">
<property name="hybrid" value="true" />
<call target="ikvm" />
</target>
<target name="ikvm">
<property overwrite="false" name="hybrid" value="false" />
<property overwrite="false" name="signed" value="" />
<csc target="exe" output="../bin/ikvm.exe" define="TRACE;${signed}">
<sources>
<include name="*.cs" />
</sources>
<references>
<include name="../bin/IKVM.GNU.Classpath.dll" asis="true" />
<include unless="${hybrid}" name="../bin/IKVM.GNU.Classpath.dll" asis="true" />
<include if="${hybrid}" name="../bin/IKVM.Hybrid.GNU.Classpath.OpenJDK.dll" asis="true" />
<include name="../bin/IKVM.Runtime.dll" asis="true" />
</references>
</csc>

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

@ -1,7 +1,12 @@
<?xml version="1.0"?>
<project name="ikvmstub" default="ikvmstub">
<target name="hybrid">
<property name="hybrid" value="true" />
<call target="ikvmstub" />
</target>
<target name="ikvmstub">
<property name="defs" value="TRACE" />
<property overwrite="false" name="hybrid" value="false" />
<if test="${property::exists('signed')}">
<property name="defs" value="${defs};${signed}" />
</if>
@ -13,7 +18,8 @@
<include name="*.cs" />
</sources>
<references>
<include name="../bin/IKVM.GNU.Classpath.dll" asis="true" />
<include unless="${hybrid}" name="../bin/IKVM.GNU.Classpath.dll" asis="true" />
<include if="${hybrid}" name="../bin/IKVM.Hybrid.GNU.Classpath.OpenJDK.dll" asis="true" />
<include name="../bin/IKVM.Runtime.dll" asis="true" />
</references>
</csc>

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

@ -109,6 +109,7 @@
<Compile Include="MemberWrapper.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="openjdk.cs" />
<Compile Include="profiler.cs">
<SubType>Code</SubType>
</Compile>

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

@ -4,12 +4,12 @@
<property name="first-pass" value="true" />
<call target="IKVM.Runtime" />
</target>
<target name="generics">
<property name="generics" value="true" />
<target name="hybrid">
<property name="hybrid" value="true" />
<call target="IKVM.Runtime" />
</target>
<target name="signed">
<property name="generics" value="false" />
<property name="hybrid" value="false" />
<property name="signed" value="SIGNCODE" />
<property name="signoption" value="-key:ikvm-key" />
<property name="ilasm_signoption" value="/key:@ikvm-key" />
@ -17,15 +17,15 @@
</target>
<target name="IKVM.Runtime">
<property overwrite="false" name="generics" value="false" />
<property overwrite="false" name="hybrid" value="false" />
<property overwrite="false" name="cfnet" value="false" />
<property overwrite="false" name="first-pass" value="false" />
<property name="defs" value="TRACE" />
<if test="${property::exists('signed')}">
<property name="defs" value="${defs};${signed}" />
</if>
<if test="${generics}">
<property name="defs" value="${defs};GENERICS" />
<if test="${hybrid}">
<property name="defs" value="${defs};OPENJDK" />
</if>
<if test="${first-pass}">
<property name="defs" value="${defs};FIRST_PASS" />
@ -51,6 +51,7 @@
<include name="JavaException.cs" />
<include name="JniInterface.cs" />
<include name="MemberWrapper.cs" />
<include if="${hybrid}" name="openjdk.cs" />
<include name="profiler.cs" />
<include name="tracer.cs" />
<include name="TypeWrapper.cs" />
@ -58,7 +59,8 @@
<include name="vm.cs" />
</sources>
<references>
<include unless="${first-pass}" name="../bin/IKVM.GNU.Classpath.dll" asis="true" />
<include unless="${first-pass or hybrid}" name="../bin/IKVM.GNU.Classpath.dll" asis="true" />
<include unless="${first-pass or not hybrid}" name="../bin/IKVM.Hybrid.GNU.Classpath.OpenJDK.dll" asis="true" />
</references>
</csc>
<copy file="IKVM.Runtime.dll" todir="../bin" />