Added (optional) support for building without System.Core.dll depende…

…ncy.

openjdk/ExtensionAttribute.java

@@ -0,0 +1,39 @@
+/*
+  Copyright (C) 2012 Jeroen Frijters
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jeroen Frijters
+  jeroen@frijters.net
+  
+*/
+package cli.System.Runtime.CompilerServices;
+
+import java.lang.annotation.*;
+
+//
+// This is a dummy ExtensionAttribute class to enable building without
+// introducing a dependency on System.Core.dll
+//
+// To build without System.Core.dll dependency use this:
+//    nant -t:net-2.0 -D:SkipSystemCoreDependency=true
+//
+public class ExtensionAttribute
+{
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface Annotation { }
+}

openjdk/openjdk.build

@@ -3,6 +3,7 @@
     <include buildfile="../ikvm.include" />
     <property name="pathsep" value=":" />
     <property overwrite="false" name="signoption" value="" />
+    <property overwrite="false" name="SkipSystemCoreDependency" value="false" />
     <property name="OPENJDK_VERSION" value="OpenJDK 7u6 b24" />
     <property name="OpenJDK7.dir" value="${project::get-base-directory()}/../../openjdk-7u6-b24" />
     <if test="${platform::is-win32()}">
@@ -26,7 +27,7 @@
         </copy>
     </target>
 
-    <target name="System.Core">
+    <target name="System.Core" unless="${SkipSystemCoreDependency}">
         <delete file="System.Core.dll" />
         <if test="${version::get-major(framework::get-version(framework::get-target-framework() )) &lt; 4}">
             <copy file="../bin/IKVM.Reflection.dll" todir="." overwrite="true" />
@@ -48,6 +49,22 @@
         </if>
     </target>
 
+    <target name="DummySystemCoreJar">
+        <exec program="javac" commandline="-implicit:none ExtensionAttribute.java" useruntimeengine="false" />
+        <zip zipfile="System.Core.jar">
+            <fileset prefix="cli/System/Runtime/CompilerServices">
+                <include name="ExtensionAttribute.class" />
+                <include name="ExtensionAttribute$Annotation.class" />
+            </fileset>
+        </zip>
+        <delete>
+            <fileset basedir=".">
+                <include name="ExtensionAttribute.class" />
+                <include name="ExtensionAttribute$Annotation.class" />
+            </fileset>
+        </delete>
+    </target>
+
     <target name="classes" depends="version allsources.gen.lst System.Core">
         <delete>
             <fileset basedir="../classpath">
@@ -71,7 +88,10 @@
         </delete>
         <exec program="${project::get-base-directory()}/../bin/ikvmstub.exe" commandline="-bootstrap mscorlib" useruntimeengine="true" />
         <exec program="${project::get-base-directory()}/../bin/ikvmstub.exe" commandline="-bootstrap System" useruntimeengine="true" />
-        <exec program="${project::get-base-directory()}/../bin/ikvmstub.exe" commandline="-bootstrap System.Core" useruntimeengine="true" />
+        <exec program="${project::get-base-directory()}/../bin/ikvmstub.exe" commandline="-bootstrap System.Core" useruntimeengine="true" unless="${SkipSystemCoreDependency}" />
+        <if test="${SkipSystemCoreDependency}">
+            <call target="DummySystemCoreJar" />
+        </if>
         <exec program="${project::get-base-directory()}/../bin/ikvmstub.exe" commandline="-bootstrap System.Data" useruntimeengine="true" />
         <exec program="${project::get-base-directory()}/../bin/ikvmstub.exe" commandline="-bootstrap System.Drawing" useruntimeengine="true" />
         <property name="IKVM.Runtime" value="IKVM.Runtime" />
@@ -185,7 +205,7 @@
             <arg value="-sharedclassloader" />
             <arg value="-r:mscorlib.dll" />
             <arg value="-r:System.dll" />
-            <arg value="-r:System.Core.dll" />
+            <arg value="-r:System.Core.dll" unless="${SkipSystemCoreDependency}" />
             <arg value="-r:IKVM.Runtime.dll" />
             <!-- we already know that the JNI assembly is not available, so suppress the warning -->
             <arg value="-nowarn:110" />