зеркало из https://github.com/mono/ikvm-fork.git
Renamed IKVM.Hybrid.GNU.Classpath.OpenJDK.dll to IKVM.OpenJDK.ClassLibrary.dll and made OpenJDK build the default.
This commit is contained in:
Родитель
567e70a44d
Коммит
902cd58a62
|
@ -50,9 +50,9 @@
|
|||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="IKVM.Hybrid.GNU.Classpath.OpenJDK, Version=0.35.2728.21374, Culture=neutral, processorArchitecture=MSIL">
|
||||
<Reference Include="IKVM.OpenJDK.ClassLibrary, Version=0.35.2790.20823, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\bin\IKVM.Hybrid.GNU.Classpath.OpenJDK.dll</HintPath>
|
||||
<HintPath>..\bin\IKVM.OpenJDK.ClassLibrary.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System">
|
||||
<Name>System</Name>
|
||||
|
@ -71,9 +71,7 @@
|
|||
<Compile Include="converter.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="fonts.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="fonts-0.95.cs" />
|
||||
<Compile Include="graphics.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
|
@ -83,8 +81,8 @@
|
|||
<Compile Include="robot.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="toolkit.cs">
|
||||
<SubType>Component</SubType>
|
||||
<Compile Include="toolkit-0.95.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
@ -1,27 +1,27 @@
|
|||
<?xml version="1.0"?>
|
||||
<project name="awt" default="awt">
|
||||
<target name="hybrid">
|
||||
<property name="hybrid" value="true" />
|
||||
<target name="classpath">
|
||||
<property name="classpath" value="true" />
|
||||
<call target="awt" />
|
||||
</target>
|
||||
<target name="awt">
|
||||
<property overwrite="false" name="signed" value="" />
|
||||
<property overwrite="false" name="hybrid" value="false" />
|
||||
<property overwrite="false" name="classpath" value="false" />
|
||||
<csc target="library" output="../bin/IKVM.AWT.WinForms.dll" define="TRACE;${signed}">
|
||||
<sources>
|
||||
<include name="AssemblyInfo.cs" />
|
||||
<include name="converter.cs" />
|
||||
<include if="${hybrid}" name="fonts-0.95.cs" />
|
||||
<include unless="${hybrid}" name="fonts.cs" />
|
||||
<include unless="${classpath}" name="fonts-0.95.cs" />
|
||||
<include if="${classpath}" name="fonts.cs" />
|
||||
<include name="graphics.cs" />
|
||||
<include name="images.cs" />
|
||||
<include name="robot.cs" />
|
||||
<include if="${hybrid}" name="toolkit-0.95.cs" />
|
||||
<include unless="${hybrid}" name="toolkit.cs" />
|
||||
<include unless="${classpath}" name="toolkit-0.95.cs" />
|
||||
<include if="${classpath}" name="toolkit.cs" />
|
||||
</sources>
|
||||
<references>
|
||||
<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 if="${classpath}" name="../bin/IKVM.GNU.Classpath.dll" asis="true" />
|
||||
<include unless="${classpath}" name="../bin/IKVM.OpenJDK.ClassLibrary.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" />
|
||||
|
|
12
ikvm.build
12
ikvm.build
|
@ -6,18 +6,18 @@
|
|||
<property name="ilasm_signoption" value="/key:@ikvm-key" />
|
||||
<call target="all" />
|
||||
</target>
|
||||
<target name="hybrid">
|
||||
<property name="hybrid" value="true" />
|
||||
<target name="classpath">
|
||||
<property name="classpath" value="true" />
|
||||
<call target="all" />
|
||||
</target>
|
||||
<target name="all">
|
||||
<property overwrite="false" name="hybrid" value="false" />
|
||||
<property overwrite="false" name="classpath" 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 unless="${hybrid}" buildfile="classpath/classpath.build" />
|
||||
<nant if="${hybrid}" buildfile="openjdk/openjdk.build" />
|
||||
<nant if="${classpath}" buildfile="classpath/classpath.build" />
|
||||
<nant unless="${classpath}" buildfile="openjdk/openjdk.build" />
|
||||
<nant buildfile="runtime/runtime.build" />
|
||||
<nant buildfile="ikvm/ikvm.build" />
|
||||
<nant buildfile="ikvmstub/ikvmstub.build" />
|
||||
|
@ -32,7 +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.OpenJDK.ClassLibrary.dll" />
|
||||
<include name="bin/ikvm-native.dll" />
|
||||
<include name="bin/libikvm-native.so" />
|
||||
<include name="bin/ikvm.exe" />
|
||||
|
|
|
@ -51,9 +51,9 @@
|
|||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="IKVM.Hybrid.GNU.Classpath.OpenJDK, Version=0.35.2728.21374, Culture=neutral, processorArchitecture=MSIL">
|
||||
<Reference Include="IKVM.OpenJDK.ClassLibrary, Version=0.35.2790.20823, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\bin\IKVM.Hybrid.GNU.Classpath.OpenJDK.dll</HintPath>
|
||||
<HintPath>..\bin\IKVM.OpenJDK.ClassLibrary.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System">
|
||||
<Name>System</Name>
|
||||
|
|
|
@ -1,19 +1,19 @@
|
|||
<?xml version="1.0"?>
|
||||
<project name="ikvm" default="ikvm">
|
||||
<target name="hybrid">
|
||||
<property name="hybrid" value="true" />
|
||||
<target name="classpath">
|
||||
<property name="classpath" value="true" />
|
||||
<call target="ikvm" />
|
||||
</target>
|
||||
<target name="ikvm">
|
||||
<property overwrite="false" name="hybrid" value="false" />
|
||||
<property overwrite="false" name="classpath" 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 unless="${hybrid}" name="../bin/IKVM.GNU.Classpath.dll" asis="true" />
|
||||
<include if="${hybrid}" name="../bin/IKVM.Hybrid.GNU.Classpath.OpenJDK.dll" asis="true" />
|
||||
<include if="${classpath}" name="../bin/IKVM.GNU.Classpath.dll" asis="true" />
|
||||
<include unless="${classpath}" name="../bin/IKVM.OpenJDK.ClassLibrary.dll" asis="true" />
|
||||
<include name="../bin/IKVM.Runtime.dll" asis="true" />
|
||||
</references>
|
||||
</csc>
|
||||
|
|
|
@ -52,9 +52,9 @@
|
|||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="IKVM.Hybrid.GNU.Classpath.OpenJDK, Version=0.35.2728.21374, Culture=neutral, processorArchitecture=MSIL">
|
||||
<Reference Include="IKVM.OpenJDK.ClassLibrary, Version=0.35.2790.20823, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\bin\IKVM.Hybrid.GNU.Classpath.OpenJDK.dll</HintPath>
|
||||
<HintPath>..\bin\IKVM.OpenJDK.ClassLibrary.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System">
|
||||
<Name>System</Name>
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
<?xml version="1.0"?>
|
||||
<project name="ikvmstub" default="ikvmstub">
|
||||
<target name="hybrid">
|
||||
<property name="hybrid" value="true" />
|
||||
<target name="classpath">
|
||||
<property name="classpath" value="true" />
|
||||
<call target="ikvmstub" />
|
||||
</target>
|
||||
<target name="ikvmstub">
|
||||
<property name="defs" value="TRACE" />
|
||||
<property overwrite="false" name="hybrid" value="false" />
|
||||
<property overwrite="false" name="classpath" value="false" />
|
||||
<if test="${property::exists('signed')}">
|
||||
<property name="defs" value="${defs};${signed}" />
|
||||
</if>
|
||||
|
@ -18,8 +18,8 @@
|
|||
<include name="*.cs" />
|
||||
</sources>
|
||||
<references>
|
||||
<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 if="${classpath}" name="../bin/IKVM.GNU.Classpath.dll" asis="true" />
|
||||
<include unless="${classpath}" name="../bin/IKVM.OpenJDK.ClassLibrary.dll" asis="true" />
|
||||
<include name="../bin/IKVM.Runtime.dll" asis="true" />
|
||||
</references>
|
||||
</csc>
|
||||
|
|
|
@ -5,10 +5,10 @@
|
|||
<property name="REFERENCE_API_NAME" value="JDK-1.6" />
|
||||
<property name="JAPI_HOME" value="c:\japi\japitools" />
|
||||
<property name="IKVM_VERSION" value="0.35" />
|
||||
<property name="CORE_LIBRARY" value="IKVM.GNU.Classpath" />
|
||||
<property name="CORE_LIBRARY" value="IKVM.OpenJDK.ClassLibrary" />
|
||||
|
||||
<target name="hybrid">
|
||||
<property name="CORE_LIBRARY" value="IKVM.Hybrid.GNU.Classpath.OpenJDK" />
|
||||
<target name="classpath">
|
||||
<property name="CORE_LIBRARY" value="IKVM.GNU.Classpath" />
|
||||
<call target="default" />
|
||||
</target>
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0"?>
|
||||
<project name="IKVM.Hybrid.GNU.Classpath.OpenJDK.dll" default="IKVM.Hybrid.GNU.Classpath.OpenJDK.dll">
|
||||
<project name="IKVM.OpenJDK.ClassLibrary.dll" default="IKVM.OpenJDK.ClassLibrary.dll">
|
||||
<property name="pathsep" value=":" />
|
||||
<property overwrite="false" name="signoption" value="" />
|
||||
<property name="Classpath.dir" value="${project::get-base-directory()}/../../classpath-0.95" />
|
||||
|
@ -47,14 +47,14 @@
|
|||
</zip>
|
||||
</target>
|
||||
|
||||
<target name="IKVM.Hybrid.GNU.Classpath.OpenJDK.dll" depends="classes vfs">
|
||||
<target name="IKVM.OpenJDK.ClassLibrary.dll" depends="classes vfs">
|
||||
<exec program="${project::get-base-directory()}/../bin/ikvmc.exe" useruntimeengine="true">
|
||||
<arg value="-version:0.35.*" />
|
||||
<arg value="${signoption}" />
|
||||
<arg value="-compressresources" />
|
||||
<arg value="-opt:fields" />
|
||||
<arg value="-strictfinalfieldsemantics" />
|
||||
<arg value="-out:IKVM.Hybrid.GNU.Classpath.OpenJDK.dll" />
|
||||
<arg value="-out:IKVM.OpenJDK.ClassLibrary.dll" />
|
||||
<arg value="-remap:map.xml" />
|
||||
<arg value="-exclude:exclude.lst" />
|
||||
<arg value="-target:library" />
|
||||
|
@ -71,12 +71,12 @@
|
|||
<arg value="-resource:META-INF/MANIFEST.MF=MANIFEST.MF" />
|
||||
<arg value="${OpenJDK.dir}/control/build/linux-i586/j2re-image/lib/resources.jar" />
|
||||
</exec>
|
||||
<copy file="IKVM.Hybrid.GNU.Classpath.OpenJDK.dll" tofile="../bin/IKVM.Hybrid.GNU.Classpath.OpenJDK.dll.new" />
|
||||
<copy file="IKVM.OpenJDK.ClassLibrary.dll" tofile="../bin/IKVM.OpenJDK.ClassLibrary.dll.new" />
|
||||
<if test="${platform::is-win32()}">
|
||||
<exec program="peverify" commandline="../bin/IKVM.Hybrid.GNU.Classpath.OpenJDK.dll.new" />
|
||||
<exec program="peverify" commandline="../bin/IKVM.OpenJDK.ClassLibrary.dll.new" />
|
||||
</if>
|
||||
<copy file="IKVM.Hybrid.GNU.Classpath.OpenJDK.dll" todir="../bin" />
|
||||
<delete file="../bin/IKVM.Hybrid.GNU.Classpath.OpenJDK.dll.new" />
|
||||
<copy file="IKVM.OpenJDK.ClassLibrary.dll" todir="../bin" />
|
||||
<delete file="../bin/IKVM.OpenJDK.ClassLibrary.dll.new" />
|
||||
</target>
|
||||
|
||||
</project>
|
||||
|
|
|
@ -52,9 +52,9 @@
|
|||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="IKVM.Hybrid.GNU.Classpath.OpenJDK, Version=0.35.2728.21374, Culture=neutral, processorArchitecture=MSIL">
|
||||
<Reference Include="IKVM.OpenJDK.ClassLibrary, Version=0.35.2790.20823, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\bin\IKVM.Hybrid.GNU.Classpath.OpenJDK.dll</HintPath>
|
||||
<HintPath>..\bin\IKVM.OpenJDK.ClassLibrary.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System">
|
||||
<Name>System</Name>
|
||||
|
@ -84,9 +84,6 @@
|
|||
<Compile Include="ClassLoaderWrapper.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="classpath-hybrid.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="classpath.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
|
|
|
@ -4,12 +4,12 @@
|
|||
<property name="first-pass" value="true" />
|
||||
<call target="IKVM.Runtime" />
|
||||
</target>
|
||||
<target name="hybrid">
|
||||
<property name="hybrid" value="true" />
|
||||
<target name="classpath">
|
||||
<property name="classpath" value="true" />
|
||||
<call target="IKVM.Runtime" />
|
||||
</target>
|
||||
<target name="signed">
|
||||
<property name="hybrid" value="false" />
|
||||
<property name="classpath" value="false" />
|
||||
<property name="signed" value="SIGNCODE" />
|
||||
<property name="signoption" value="-key:ikvm-key" />
|
||||
<property name="ilasm_signoption" value="/key:@ikvm-key" />
|
||||
|
@ -17,14 +17,14 @@
|
|||
</target>
|
||||
|
||||
<target name="IKVM.Runtime">
|
||||
<property overwrite="false" name="hybrid" value="false" />
|
||||
<property overwrite="false" name="classpath" 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="${hybrid}">
|
||||
<if test="${not classpath}">
|
||||
<property name="defs" value="${defs};OPENJDK" />
|
||||
</if>
|
||||
<if test="${first-pass}">
|
||||
|
@ -42,8 +42,7 @@
|
|||
<include name="ByteCodeHelper.cs" />
|
||||
<include name="ClassFile.cs" />
|
||||
<include name="ClassLoaderWrapper.cs" />
|
||||
<include unless="${hybrid}" name="classpath.cs" />
|
||||
<include if="${hybrid}" name="classpath-hybrid.cs" />
|
||||
<include if="${classpath}" name="classpath.cs" />
|
||||
<include name="CodeEmitter.cs" />
|
||||
<include name="common.cs" />
|
||||
<include name="compiler.cs" />
|
||||
|
@ -53,8 +52,8 @@
|
|||
<include name="JavaException.cs" />
|
||||
<include name="JniInterface.cs" />
|
||||
<include name="MemberWrapper.cs" />
|
||||
<include if="${hybrid}" name="netinf.cs" />
|
||||
<include if="${hybrid}" name="openjdk.cs" />
|
||||
<include unless="${classpath}" name="netinf.cs" />
|
||||
<include unless="${classpath}" name="openjdk.cs" />
|
||||
<include name="profiler.cs" />
|
||||
<include name="tracer.cs" />
|
||||
<include name="TypeWrapper.cs" />
|
||||
|
@ -62,11 +61,11 @@
|
|||
<include name="vm.cs" />
|
||||
</sources>
|
||||
<resources>
|
||||
<include if="${hybrid and not first-pass}" name="../openjdk/vfs.zip" />
|
||||
<include if="${not classpath and not first-pass}" name="../openjdk/vfs.zip" />
|
||||
</resources>
|
||||
<references>
|
||||
<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" />
|
||||
<include unless="${first-pass or not classpath}" name="../bin/IKVM.GNU.Classpath.dll" asis="true" />
|
||||
<include unless="${first-pass or classpath}" name="../bin/IKVM.OpenJDK.ClassLibrary.dll" asis="true" />
|
||||
<!-- HACK mcs 1.2.3 requires explicit reference to System.Management -->
|
||||
<include name="${framework::get-assembly-directory(framework::get-target-framework())}/System.Management.dll" />
|
||||
</references>
|
||||
|
|
Загрузка…
Ссылка в новой задаче