Merge branch 'merge-wip-into-2.10.x' into merge-2.10-into-master

* merge-wip-into-2.10.x: (44 commits)
  Cleanups of reifyBoundTerm and reifyBoundType
  SI-5841 reification of renamed imports
  Share the empty LinkedList between first0/last0.
  SI-4922 Show default in Scaladoc for generic methods.
  SI-6614 Test case for fixed ArrayStack misconduct.
  SI-6690 Release reference to last dequeued element.
  SI-5789 Use the ReplTest framework in the test
  SI-5789 Checks in the right version of the test
  SI-5789 Removes assertion about implclass flag in Mixin.scala
  SI-6766 Makes the -Pcontinuations:enable flag a project specific preference
  more ListOfNil => Nil
  DummyTree => CannotHaveAttrs
  evicts assert(false) from the compiler
  introduces global.pendingSuperCall
  refactors handling of parent types
  unifies approaches to call analysis in TreeInfo
  TypeApply + Select and their type-level twins
  SI-6696 removes "helper" tree factory methods
  SI-6766 Create a continuations project in eclipse
  Now the test suite runs MIMA for compatibility testing.
  ...

Conflicts:
	src/compiler/scala/reflect/reify/codegen/GenUtils.scala
	src/compiler/scala/tools/nsc/ast/Trees.scala
	src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
	src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala
	src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
	src/compiler/scala/tools/nsc/typechecker/Contexts.scala
	src/compiler/scala/tools/nsc/typechecker/Namers.scala
	src/compiler/scala/tools/nsc/typechecker/Typers.scala
	src/eclipse/scala-compiler/.classpath
	src/eclipse/scalap/.classpath
	src/reflect/scala/reflect/internal/StdNames.scala
	src/reflect/scala/reflect/internal/TreeInfo.scala

1 files changed, 35 insertions, 1 deletions

diff --git a/build.xml b/build.xml
index 68fcc46478..0052b8914d 100644
--- a/build.xml
+++ b/build.xml
@@ -22,7 +22,7 @@ END-USER TARGETS
   <target name="clean" depends="quick.clean"
     description="Removes binaries of compiler and library. Distributions are untouched."/>
 
-  <target name="test" depends="test.done, osgi.test"
+  <target name="test" depends="test.done, osgi.test, bc.run"
     description="Runs test suite and bootstrapping test on Scala compiler and library."/>
 
   <target name="test-opt"
@@ -2488,6 +2488,40 @@ BOOTRAPING TEST AND TEST SUITE
 
   <target name="test.done" depends="test.suite, test.continuations.suite, test.scaladoc, test.stability, test.sbt"/>
 
+
+<!-- ===========================================================================
+Binary compatibility testing
+============================================================================ -->
+
+  <target name="bc.init" depends="init">
+    <property name="bc-build.dir" value="${build.dir}/bc"/>
+    <!-- Obtain mima -->
+    <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"/>
+    </artifact:dependencies>
+    <artifact:dependencies pathId="old.bc.classpath">
+      <dependency groupId="org.scala-lang" artifactId="scala-library" version="2.10.0-RC2"/>
+    </artifact:dependencies>
+  </target>
+
+  <target name="bc.run" 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>
+  </target>
+
+
 <!-- ===========================================================================
 DISTRIBUTION
 ============================================================================ -->