summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-09-16 15:32:34 +1000
committerJason Zaugg <jzaugg@gmail.com>2014-09-16 15:32:34 +1000
commit3307e44a9d980eef5a442a688ef22765556f609f (patch)
tree4ed3921c46e13138a0e16735461128ebbe479ce4 /build.xml
parent0e2be38f05a6d3fadd0a6c800604503c72401117 (diff)
parent63207e115a46634d47446a87a7f4bc3c2651b0e7 (diff)
downloadscala-3307e44a9d980eef5a442a688ef22765556f609f.tar.gz
scala-3307e44a9d980eef5a442a688ef22765556f609f.tar.bz2
scala-3307e44a9d980eef5a442a688ef22765556f609f.zip
Merge pull request #3972 from lrytz/BCodeDelambdafyFix
isAnonymousClass/Function for delambdafy classes is not true
Diffstat (limited to 'build.xml')
-rwxr-xr-xbuild.xml9
1 files changed, 7 insertions, 2 deletions
diff --git a/build.xml b/build.xml
index b43d8a826b..a394546b0a 100755
--- a/build.xml
+++ b/build.xml
@@ -1513,7 +1513,12 @@ TODO:
<!-- ===========================================================================
BINARY COMPATIBILITY TESTING
============================================================================ -->
- <target name="bc.init" depends="init" unless="maven-deps-done-mima">
+ <target name="bc.init" depends="init" if="test.bc.skip">
+ <!-- if test.bc.skip is set, make sure that pc.prepare is not executed either -->
+ <property name="maven-deps-done-mima" value="true"/>
+ </target>
+
+ <target name="bc.prepare" depends="bc.init" unless="maven-deps-done-mima">
<property name="bc-reference-version" value="2.11.0"/>
<property name="bc-build.dir" value="${build.dir}/bc"/>
@@ -1531,7 +1536,7 @@ TODO:
</target>
<target name="test.bc-opt" description="Optimized version of test.bc."> <optimized name="test.bc"/></target>
- <target name="test.bc" depends="bc.init, pack.lib, pack.reflect">
+ <target name="test.bc" depends="bc.prepare, pack.lib, pack.reflect" unless="test.bc.skip">
<bc.check project="library"/>
<bc.check project="reflect"/>
</target>