diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-18 15:06:13 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-18 15:06:13 -0700 |
| commit | bbd69f5dd1d5b7eb6a90aa7d59df9c491d112d4d (patch) | |
| tree | 4dfb1bdee9e97a7deeb399b2560a592a992b1e08 | |
| parent | 144671eb943dc689e555ddc50d0d4c045182b6c8 (diff) | |
| parent | e90efd6b09ea8839f04550e5ca6fadc410545e46 (diff) | |
| download | scala-bbd69f5dd1d5b7eb6a90aa7d59df9c491d112d4d.tar.gz scala-bbd69f5dd1d5b7eb6a90aa7d59df9c491d112d4d.tar.bz2 scala-bbd69f5dd1d5b7eb6a90aa7d59df9c491d112d4d.zip | |
Merge pull request #2271 from retronym/topic/mima-refactor
Reduce duplication and increase verbosity in MiMa execution.
| -rw-r--r-- | build.xml | 135 |
1 files changed, 44 insertions, 91 deletions
@@ -2665,100 +2665,53 @@ Binary compatibility testing </artifact:dependencies> </target> + <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="bc.run" depends="bc.init, pack.done"> - <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"/> - <arg value="--filters"/> - <arg value="${basedir}/bincompat-backward.whitelist.conf"/> - <arg value="--generate-filters"/> - <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"/> - <arg value="--filters"/> - <arg value="${basedir}/bincompat-backward.whitelist.conf"/> - <arg value="--generate-filters"/> - <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-swing:jar}"/> - <arg value="--curr"/> - <arg value="${build-pack.dir}/lib/scala-swing.jar"/> - <arg value="--filters"/> - <arg value="${basedir}/bincompat-backward.whitelist.conf"/> - <arg value="--generate-filters"/> - <classpath> - <path refid="mima.classpath"/> - </classpath> - </java> - <java - fork="true" - failonerror="true" - classname="com.typesafe.tools.mima.cli.Main"> - <arg value="--curr"/> - <arg value="${org.scala-lang:scala-library:jar}"/> - <arg value="--prev"/> - <arg value="${build-pack.dir}/lib/scala-library.jar"/> - <arg value="--filters"/> - <arg value="${basedir}/bincompat-forward.whitelist.conf"/> - <arg value="--generate-filters"/> - <classpath> - <path refid="mima.classpath"/> - </classpath> - </java> - <java - fork="true" - failonerror="true" - classname="com.typesafe.tools.mima.cli.Main"> - <arg value="--curr"/> - <arg value="${org.scala-lang:scala-reflect:jar}"/> - <arg value="--prev"/> - <arg value="${build-pack.dir}/lib/scala-reflect.jar"/> - <arg value="--filters"/> - <arg value="${basedir}/bincompat-forward.whitelist.conf"/> - <arg value="--generate-filters"/> - <classpath> - <path refid="mima.classpath"/> - </classpath> - </java> - <java - fork="true" - failonerror="true" - classname="com.typesafe.tools.mima.cli.Main"> - <arg value="--curr"/> - <arg value="${org.scala-lang:scala-swing:jar}"/> - <arg value="--prev"/> - <arg value="${build-pack.dir}/lib/scala-swing.jar"/> - <arg value="--filters"/> - <arg value="${basedir}/bincompat-forward.whitelist.conf"/> - <arg value="--generate-filters"/> - <classpath> - <path refid="mima.classpath"/> - </classpath> - </java> + <bc.check jar-name="scala-library"/> + <bc.check jar-name="scala-reflect"/> + <bc.check jar-name="scala-swing"/> </target> - <!-- =========================================================================== DISTRIBUTION ============================================================================ --> |