- Enable ikvmc support for class file version 51.

- Change build to support hybrid OpenJDK 6 & 7 build.

1 files changed, 21 insertions, 12 deletions

diff --git a/openjdk/openjdk.build b/openjdk/openjdk.build
index 17a78242..f9da6041 100644
--- a/openjdk/openjdk.build
+++ b/openjdk/openjdk.build
@@ -3,7 +3,8 @@
     <include buildfile="../ikvm.include" />
     <property name="pathsep" value=":" />
     <property overwrite="false" name="signoption" value="" />
-    <property name="OpenJDK.dir" value="${project::get-base-directory()}/../../openjdk6-b22" />
+    <property name="OpenJDK6.dir" value="${project::get-base-directory()}/../../openjdk6-b22" />
+    <property name="OpenJDK7.dir" value="${project::get-base-directory()}/../../openjdk7-b145" />
     <if test="${platform::is-win32()}">
         <property name="pathsep" value=";" />
     </if>
@@ -13,14 +14,15 @@
 
     <target name="version">
         <property name="VERSION" value="${assemblyname::get-version(assemblyname::get-assembly-name(path::combine(project::get-base-directory(), '../bin/IKVM.Runtime.dll')))}" />
-        <property name="OPENJDK_VERSION" value="OpenJDK 6 b22" />
+        <property name="OPENJDK_VERSION" value="OpenJDK 6 b22 / 7 b145 hybrid" />
     </target>
 
     <target name="allsources.gen.lst">
         <copy file="allsources.lst" tofile="allsources.gen.lst" outputencoding="ascii" overwrite="true">
             <filterchain>
                 <replacetokens>
-                    <token key="OPENJDK" value="${OpenJDK.dir}" />
+                    <token key="OPENJDK6" value="${OpenJDK6.dir}" />
+                    <token key="OPENJDK7" value="${OpenJDK7.dir}" />
                 </replacetokens>
             </filterchain>
         </copy>
@@ -55,7 +57,12 @@
             </fileset>
         </delete>
         <delete>
-            <fileset basedir="${OpenJDK.dir}">
+            <fileset basedir="${OpenJDK6.dir}">
+                <include name="**.class"/>
+            </fileset>
+        </delete>
+        <delete>
+            <fileset basedir="${OpenJDK7.dir}">
                 <include name="**.class"/>
             </fileset>
         </delete>
@@ -102,8 +109,8 @@
 
     <target name="rmi">
         <property name="VMARGS" value="-J-client -J-Xmx896m -J-Xms128m -J-XX:PermSize=32m -J-XX:MaxPermSize=160m" />
-        <property name="CLASSPATH" value="${OpenJDK.dir}/jdk/src/share/classes/${pathsep}${OpenJDK.dir}/build/linux-amd64/impsrc/${pathsep}." />
-        <property name="OUTPUT" value="${OpenJDK.dir}/build/linux-amd64/classes/" />
+        <property name="CLASSPATH" value="${OpenJDK6.dir}/jdk/src/share/classes/${pathsep}${OpenJDK6.dir}/build/linux-amd64/impsrc/${pathsep}." />
+        <property name="OUTPUT" value="${OpenJDK6.dir}/build/linux-amd64/classes/" />
         <property name="ARGS" value="${VMARGS} -bootclasspath ${CLASSPATH} -d ${OUTPUT}" />
         <exec program="rmic" commandline="${ARGS} -v1.1 sun.rmi.registry.RegistryImpl" />
         <exec program="rmic" commandline="${ARGS} -v1.1 sun.rmi.transport.DGCImpl" />
@@ -125,7 +132,7 @@
     <target name="vfs">
         <!-- This file is generated here, but it is added as a resource to IKVM.Runtime.dll, because Ref.Emit on .NET 1.1 doesn't support adding a raw resource. -->
         <zip zipfile="vfs.zip">
-            <fileset basedir="${OpenJDK.dir}/build/linux-amd64/j2re-image">
+            <fileset basedir="${OpenJDK6.dir}/build/linux-amd64/j2re-image">
                 <include name="lib/calendars.properties" />
                 <include name="lib/logging.properties" />
                 <include name="lib/net.properties" />
@@ -143,7 +150,7 @@
                 -->
                 <include name="lib/security/US_export_policy.jar" />
             </fileset>
-            <fileset basedir="${OpenJDK.dir}/jdk/src/windows">
+            <fileset basedir="${OpenJDK6.dir}/jdk/src/windows">
                 <include name="lib/flavormap.properties" />
                 <include name="lib/content-types.properties" />
             </fileset>
@@ -151,9 +158,9 @@
         </target>
 
     <target name="resources">
-        <!-- resources that are not in @OPENJDK@/build/linux-amd64/j2re-image/lib/resources.jar -->
+        <!-- resources that are not in @OPENJDK6@/build/linux-amd64/j2re-image/lib/resources.jar -->
         <zip zipfile="resources.zip">
-            <fileset basedir="${OpenJDK.dir}/jdk/src/share/classes">
+            <fileset basedir="${OpenJDK6.dir}/jdk/src/share/classes">
                 <include name="com/sun/swing/internal/plaf/**/*" />
                 <include name="com/sun/java/swing/plaf/**/*.properties" />
                 <include name="com/sun/java/swing/plaf/**/*.gif" />
@@ -165,7 +172,8 @@
         <copy file="response.txt" tofile="response.gen.txt" outputencoding="ascii" overwrite="true">
             <filterchain>
                 <replacetokens>
-                    <token key="OPENJDK" value="${OpenJDK.dir}" />
+                    <token key="OPENJDK6" value="${OpenJDK6.dir}" />
+                    <token key="OPENJDK7" value="${OpenJDK7.dir}" />
                 </replacetokens>
             </filterchain>
         </copy>
@@ -239,7 +247,8 @@
         <copy file="tools.rsp" tofile="tools.gen.rsp" outputencoding="ascii" overwrite="true">
             <filterchain>
                 <replacetokens>
-                    <token key="OPENJDK" value="${OpenJDK.dir}" />
+                    <token key="OPENJDK6" value="${OpenJDK6.dir}" />
+                    <token key="OPENJDK7" value="${OpenJDK7.dir}" />
                 </replacetokens>
             </filterchain>
         </copy>