Adding JDK7 friendly build.

Essentially this just disables swing if you're on JDK7 so you can actually build and use Scala.

Author: jsuereth

build.xml

@@ -334,16 +334,31 @@ INITIALISATION
   <target name="init.version.done" depends="init.version.release, init.version.snapshot"/>
 
   <target name="init.testjava6">
-    <fail message="This build requires JDK 1.6">
-      <condition>
-        <not>
+      <condition property="has.java6">
           <equals arg1="${ant.java.version}" arg2="1.6"/>
-        </not>
       </condition>
-    </fail>
+      <condition property="has.java7">
+          <equals arg1="${ant.java.version}" arg2="1.7"/>
+      </condition>
+      <condition property="has.unsupported.jdk">
+         <not><or>
+           <isset property="has.java7" />
+           <isset property="has.java6" />
+         </or></not>
+      </condition>
   </target>
 
-  <target name="init" depends="init.jars, init.maven.jars, init.version.done">
+  <target name="init.fail.bad.jdk" depends="init.testjava6">
+    <fail if="has.unsupported.jdk"
+          message="JDK ${ant.java.version} is not supported by this build!"/>
+  </target>
+  <target name="init.warn.jdk7" depends="init.testjava6" if="has.java7">
+     <echo level="warning"> You are using JDK7 for this build.  While this will be able to build most of Scala, it will
+       not build the Swing project.   You will be unable to create a distribution.
+     </echo>
+  </target>
+
+  <target name="init" depends="init.jars, init.maven.jars, init.version.done, init.fail.bad.jdk, init.warn.jdk7">
     <property name="scalac.args.always" value="" />
   <!-- scalac.args.optimise is selectively overridden in certain antcall tasks. -->
     <property name="scalac.args.optimise" value=""/>
@@ -467,7 +482,7 @@ LOCAL DEPENDENCY (Adapted ASM)
 <!-- ===========================================================================
 LOCAL DEPENDENCY (FORKJOIN)
 ============================================================================ -->
-  <target name="forkjoin.start" depends="init, init.testjava6">
+  <target name="forkjoin.start" depends="init">
     <uptodate property="forkjoin.available" targetfile="${build-libs.dir}/forkjoin.complete">
       <srcfiles dir="${src.dir}/forkjoin">
         <include name="**/*.java"/>
@@ -978,15 +993,6 @@ QUICK BUILD (QUICK)
       <include name="**/*.scala"/>
       <compilationpath refid="quick.compilation.path"/>
     </scalacfork>
-    <scalacfork
-      destdir="${build-quick.dir}/classes/library"
-      compilerpathref="locker.classpath"
-      params="${scalac.args.quick}"
-      srcdir="${src.dir}/swing"
-      jvmargs="${scalacfork.jvmargs}">
-      <include name="**/*.scala"/>
-      <compilationpath refid="quick.compilation.path"/>
-    </scalacfork>
     <propertyfile file="${build-quick.dir}/classes/library/library.properties">
       <entry key="version.number" value="${version.number}"/>
       <entry key="maven.version.number" value="${maven.version.number}"/>
@@ -1001,12 +1007,26 @@ QUICK BUILD (QUICK)
         <include name="**/*.css"/>
       </fileset>
     </copy>
-    <touch file="${build-quick.dir}/library.complete" verbose="no"/>
-    <stopwatch name="quick.lib.timer" action="total"/>
   </target>
 
+  <target name="quick.swing" depends="quick.lib" if="has.java6" unless="quick.lib.available">
+    <scalacfork
+      destdir="${build-quick.dir}/classes/library"
+      compilerpathref="locker.classpath"
+      params="${scalac.args.quick}"
+      srcdir="${src.dir}/swing"
+      jvmargs="${scalacfork.jvmargs}">
+      <include name="**/*.scala"/>
+      <compilationpath refid="quick.compilation.path"/>
+    </scalacfork>
+  </target>
+
+  <target name="quick.lib.done" depends="quick.swing, quick.lib">
+    <stopwatch name="quick.lib.timer" action="total"/>
+    <touch file="${build-quick.dir}/library.complete" verbose="no"/>
+  </target>
 
-  <target name="quick.pre-reflect" depends="quick.lib">
+  <target name="quick.pre-reflect" depends="quick.lib.done">
     <uptodate property="quick.reflect.available" targetfile="${build-quick.dir}/reflect.complete">
       <srcfiles dir="${src.dir}">
         <include name="reflect/**"/>
@@ -1412,11 +1432,6 @@ PACKED QUICK BUILD (PACK)
       </fileset>
       <fileset dir="${build-libs.dir}/classes/forkjoin"/>
     </jar>
-    <jar destfile="${build-pack.dir}/lib/scala-swing.jar">
-      <fileset dir="${build-quick.dir}/classes/library">
-        <include name="scala/swing/**"/>
-      </fileset>
-    </jar>
   <jar destfile="${build-pack.dir}/lib/scala-actors.jar">
       <fileset dir="${build-quick.dir}/classes/library">
         <include name="scala/actors/**"/>
@@ -1427,7 +1442,15 @@ PACKED QUICK BUILD (PACK)
   </jar>
   </target>
 
-  <target name="pack.pre-reflect" depends="pack.lib">
+  <target name="pack.swing" depends="pack.lib" if="has.java6">
+    <jar destfile="${build-pack.dir}/lib/scala-swing.jar">
+      <fileset dir="${build-quick.dir}/classes/library">
+        <include name="scala/swing/**"/>
+      </fileset>
+    </jar>
+  </target>
+
+  <target name="pack.pre-reflect" depends="pack.lib, pack.swing">
     <uptodate
       property="pack.reflect.available"
       targetfile="${build-pack.dir}/lib/scala-reflect.jar"
@@ -1643,15 +1666,6 @@ BOOTSTRAPPING BUILD (STRAP)
       <include name="**/*.scala"/>
       <compilationpath refid="strap.compilation.path"/>
     </scalacfork>
-    <scalacfork
-      destdir="${build-strap.dir}/classes/library"
-      compilerpathref="pack.classpath"
-      params="${scalac.args.quick}"
-      srcdir="${src.dir}/swing"
-      jvmargs="${scalacfork.jvmargs}">
-      <include name="**/*.scala"/>
-      <compilationpath refid="strap.compilation.path"/>
-    </scalacfork>
     <propertyfile file="${build-strap.dir}/classes/library/library.properties">
       <entry key="version.number" value="${version.number}"/>
       <entry key="maven.version.number" value="${maven.version.number}"/>
@@ -1666,11 +1680,26 @@ BOOTSTRAPPING BUILD (STRAP)
         <include name="**/*.css"/>
       </fileset>
     </copy>
+  </target>
+
+  <target name="strap.swing" if="has.java6" unless="strap.lib.available" depends="strap.lib">
+    <scalacfork
+      destdir="${build-strap.dir}/classes/library"
+      compilerpathref="pack.classpath"
+      params="${scalac.args.quick}"
+      srcdir="${src.dir}/swing"
+      jvmargs="${scalacfork.jvmargs}">
+      <include name="**/*.scala"/>
+      <compilationpath refid="strap.compilation.path"/>
+    </scalacfork>
+  </target>
+
+  <target name="strap.lib.done" depends="strap.swing, strap.lib">
     <touch file="${build-strap.dir}/library.complete" verbose="no"/>
     <stopwatch name="strap.lib.timer" action="total"/>
   </target>
 
-  <target name="strap.pre-reflect" depends="strap.lib">
+  <target name="strap.pre-reflect" depends="strap.lib.done">
     <uptodate property="strap.reflect.available" targetfile="${build-strap.dir}/reflect.complete">
       <srcfiles dir="${src.dir}/reflect"/>
     </uptodate>