diff options
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 27 |
1 files changed, 16 insertions, 11 deletions
@@ -25,6 +25,8 @@ This buildfile is part of projectlombok.org. It is the main entry point that con the common tasks and can be called on to run the main aspects of all the sub-scripts. </description> + <property name="pattern.jdk9Plus" value="^(9|[1-9][0-9])(\..*)?$" /> + <property name="pattern.jdkUpto8" value="^(1\.)?[2-8](\..*)?$" /> <property name="build.compiler" value="javac1.6" /> <property name="ivy.retrieve.pattern" value="lib/[conf]/[organisation]-[artifact].[ext]" /> <available file="lib/ivyplusplus.jar" property="ivyplusplus.available" /> @@ -163,7 +165,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr <target name="-ensureJdk9"> <condition property="java.version.insufficient"> - <matches string="${java.version}" pattern="^1\.[2-8](\..*)?" /> + <matches string="${ant.java.version}" pattern="${pattern.jdkUpto8}" /> </condition> <fail if="java.version.insufficient">To compile lombok, you need JDK9 or higher; lombok requires this version because it's rather difficult to produce lombok builds that are compatible on JDK9 without at least building with JDK9. Sorry about that.</fail> </target> @@ -543,6 +545,7 @@ ${sourceWarning}</echo> <classpath refid="test.path" /> <classpath refid="build.path" /> <classpath path="build/lombok" /> + <classpath path="build/tests" /> <src path="test/core/src" /> <src path="test/transform/src" /> <src path="test/bytecode/src" /> @@ -551,11 +554,11 @@ ${sourceWarning}</echo> </target> <target name="test-ecj" depends="dist, contrib, setupJavaOracle8TestEnvironment" unless="tests.skip"> - <condition property="ecj.loc" value="lib/ecj9/*" else="lib/ecj8/*"> - <equals arg1="${ant.java.version}" arg2="9" /> + <condition property="ecj.loc" value="lib/ecj9/org.eclipse.jdt-ecj.jar" else="lib/ecj8/org.eclipse.jdt.core.compiler-ecj.jar"> + <matches string="${ant.java.version}" pattern="${pattern.jdk9Plus}" /> </condition> - <java classname="org.eclipse.jdt.internal.compiler.batch.Main" fork="true" failonerror="true"> - <classpath path="${ecj.loc}" /> + <echo>Testing ECJ using ECJ: ${ecj.loc}</echo> + <java jar="${ecj.loc}" fork="true" failonerror="true"> <jvmarg value="-javaagent:dist/lombok.jar=ecj" /> <arg value="-source" /> <arg value="1.6" /> @@ -645,7 +648,7 @@ ${sourceWarning}</echo> <get src="https://projectlombok.org/ivyrepo/langtools/jdk8-javac-sources.zip" dest="lib/oracleJDK8Environment/javac8-sources.zip" verbose="true" usetimestamp="true" /> <propertyfile file="testenvironment.properties"> <entry key="test.location.javac" value="lib/oracleJDK8Environment/javac8.jar" /> - <entry key="test.location.ecj" value="lib/ecj8/org.eclipse.custom-ecj.jar" /> + <entry key="test.location.ecj" value="lib/ecj8/org.eclipse.jdt.core.compiler-ecj.jar" /> <entry key="test.location.bootclasspath" value="lib/oracleJDK8Environment/rt.jar" /> <entry key="test.location.name" value="OracleJDK8" /> <entry key="test.javaversion" value="8" /> @@ -679,24 +682,26 @@ You can also create your own by writing a 'testenvironment.properties' file. The </fail> </target> - <target name="test" depends="-loadTestEnvironmentProperties, -failIfNoTestEnvironmentProperties, -test-compile, dist, test-ecj, -test-check, -test8, -test9" /> + <target name="test" depends="-loadTestEnvironmentProperties, -failIfNoTestEnvironmentProperties, -test-compile, dist, test-ecj, -test-check, -test8, -test9" description="Runs all tests." /> + + <target name="testfast" depends="-loadTestEnvironmentProperties, -failIfNoTestEnvironmentProperties, -test-compile, -test-check, -test8, -test9" /> <target name="-test-check"> <condition property="test9.run"> <and> <not><isset property="tests.skip" /></not> - <equals arg1="${ant.java.version}" arg2="9" /> + <matches string="${ant.java.version}" pattern="${pattern.jdk9Plus}" /> </and> </condition> <condition property="test8.run"> <and> <not><isset property="tests.skip" /></not> - <not><equals arg1="${ant.java.version}" arg2="9" /></not> + <matches string="${ant.java.version}" pattern="${pattern.jdkUpto8}" /> </and> </condition> </target> - <target name="-test9" depends="-loadTestEnvironmentProperties, -failIfNoTestEnvironmentProperties, -test-compile, dist, test-ecj" if="test9.run"> + <target name="-test9" if="test9.run"> <echo>Running test suite in JDK9+ mode</echo> <junit haltonfailure="no" fork="true"> <jvmarg value="-javaagent:dist/lombok.jar" /> @@ -731,7 +736,7 @@ You can also create your own by writing a 'testenvironment.properties' file. The </junit> </target> - <target name="-test8" depends="-loadTestEnvironmentProperties, -failIfNoTestEnvironmentProperties, -test-compile, dist, test-ecj" if="test8.run" description="Runs the tests."> + <target name="-test8" if="test8.run"> <echo>Running test suite in JDK6-8 mode</echo> <junit haltonfailure="no" fork="true"> <jvmarg value="-javaagent:dist/lombok.jar" /> |