Merge scala/2.10.x into build-cleanup-2.10

Conflicts:
	build.xml

1 files changed, 49 insertions, 28 deletions

diff --git a/build.xml b/build.xml
index c30dde55ac..6baf56c97e 100644
--- a/build.xml
+++ b/build.xml
@@ -1464,40 +1464,61 @@ targets exercised:
     <mkdir dir="${bc-build.dir}"/>
     <!-- Pull down MIMA -->
     <artifact:dependencies pathId="mima.classpath">
-      <dependency groupId="com.typesafe" artifactId="mima-reporter_2.9.2" version="0.1.4"/>
+      <dependency groupId="com.typesafe" artifactId="mima-reporter_2.9.2" version="0.1.5"/>
     </artifact:dependencies>
     <artifact:dependencies pathId="old.bc.classpath">
-      <dependency groupId="org.scala-lang" artifactId="scala-library" version="2.10.0-RC2"/>
-      <dependency groupId="org.scala-lang" artifactId="scala-reflect" version="2.10.0-RC2"/>
+      <dependency groupId="org.scala-lang" artifactId="scala-swing" version="2.10.0"/>
+      <dependency groupId="org.scala-lang" artifactId="scala-library" version="2.10.0"/>
+      <dependency groupId="org.scala-lang" artifactId="scala-reflect" version="2.10.0"/>
     </artifact:dependencies>
     <property name="maven-deps-done-mima" value="true"/>
   </target>
 
-  <target name="test.bc" depends="bc.init, pack.lib">
-    <java
-       fork="true"
-       failonerror="true"
-       classname="com.typesafe.tools.mima.cli.Main">
-         <arg value="--prev"/>
-         <arg value="${org.scala-lang:scala-library:jar}"/>
-         <arg value="--curr"/>
-         <arg value="${build-pack.dir}/lib/scala-library.jar"/>
-         <classpath>
-           <path refid="mima.classpath"/>
-         </classpath>
-    </java>
-    <java
-       fork="true"
-       failonerror="true"
-       classname="com.typesafe.tools.mima.cli.Main">
-         <arg value="--prev"/>
-         <arg value="${org.scala-lang:scala-reflect:jar}"/>
-         <arg value="--curr"/>
-         <arg value="${build-pack.dir}/lib/scala-reflect.jar"/>
-         <classpath>
-           <path refid="mima.classpath"/>
-         </classpath>
-    </java>
+  <macrodef name="bc.run-mima">
+    <attribute name="jar-name"/>
+    <attribute name="prev"/>
+    <attribute name="curr"/>
+    <attribute name="direction"/>
+    <sequential>
+      <echo message="Checking @{direction} binary compatibility for @{jar-name}"/>
+      <java
+         fork="true"
+         failonerror="true"
+         classname="com.typesafe.tools.mima.cli.Main">
+           <arg value="--prev"/>
+           <arg value="@{prev}"/>
+           <arg value="--curr"/>
+           <arg value="@{curr}"/>
+           <arg value="--filters"/>
+           <arg value="${basedir}/bincompat-@{direction}.whitelist.conf"/>
+           <arg value="--generate-filters"/>
+           <classpath>
+             <path refid="mima.classpath"/>
+           </classpath>
+      </java>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="bc.check">
+    <attribute name="jar-name"/>
+    <sequential>
+        <bc.run-mima
+                jar-name="@{jar-name}"
+                prev="${org.scala-lang:@{jar-name}:jar}"
+                curr="${build-pack.dir}/lib/@{jar-name}.jar"
+                direction="backward"/>
+        <bc.run-mima
+                jar-name="@{jar-name}"
+                prev="${build-pack.dir}/lib/@{jar-name}.jar"
+                curr="${org.scala-lang:@{jar-name}:jar}"
+                direction="forward"/>
+    </sequential>
+  </macrodef>
+
+  <target name="test.bc" depends="bc.init, pack.lib, pack.reflect, pack.swing">
+    <bc.check jar-name="scala-library"/>
+    <bc.check jar-name="scala-reflect"/>
+    <bc.check jar-name="scala-swing"/>
   </target>
 
 <!-- ===========================================================================