diff options
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 23 |
1 files changed, 8 insertions, 15 deletions
@@ -195,7 +195,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr </ivy:compile> <mkdir dir="build/lombok/META-INF" /> <mkdir dir="build/lombok/META-INF/services" /> - <echo file="build/lombok/META-INF/services/javax.annotation.processing.Processor">lombok.launch.AnnotationProcessorHider.AnnotationProcessor</echo> + <echo file="build/lombok/META-INF/services/javax.annotation.processing.Processor">lombok.launch.AnnotationProcessorHider$AnnotationProcessor</echo> </target> <target name="dist" description="Builds THE lombok.jar file which contains everything." depends="version, compile"> @@ -215,6 +215,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr <include name="lombok/experimental/**" /> <include name="lombok/extern/**" /> <include name="lombok/launch/**" /> + <include name="lombok/delombok/ant/Tasks*" /> </fileset> <mappedresources> <fileset dir="build/lombok"> @@ -223,6 +224,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr <exclude name="lombok/experimental/**" /> <exclude name="lombok/extern/**" /> <exclude name="lombok/launch/**" /> + <exclude name="lombok/delombok/ant/Tasks*" /> </fileset> <firstmatchmapper> <globmapper from="*.class" to="*.SCL.lombok" /> @@ -458,7 +460,7 @@ ${sourceWarning}</echo> <echo>WARNING: If you wish to test JDK8 features in eclipse, there must be a JDK8 installation configured in your eclipse, and it must be called 'JavaSE-1.8'.</echo> </target> - <target name="setupJavaOpenJDK6TestEnvironment" depends="contrib" description="Sets up the test so that 'ant test' will test against OpenJDK6."> + <target name="setupJavaOpenJDK6TestEnvironment" depends="ensureTestDeps, contrib" description="Sets up the test so that 'ant test' will test against OpenJDK6."> <mkdir dir="lib/openJDK6Environment" /> <get src="http://projectlombok.org/ivyrepo/langtools/javac-1.6.0.18.jar" dest="lib/openJDK6Environment/javac6.jar" verbose="true" usetimestamp="true" /> <get src="http://projectlombok.org/ivyrepo/langtools/rt-openjdk6.jar" dest="lib/openJDK6Environment/rt-openjdk6.jar" verbose="true" usetimestamp="true" /> @@ -473,7 +475,7 @@ ${sourceWarning}</echo> <antcall target="-createEclipseLaunchForTestEnvironmentIfEclipseProject" /> </target> - <target name="setupJavaOpenJDK7TestEnvironment" depends="contrib" description="Sets up the test so that 'ant test' will test against OpenJDK7."> + <target name="setupJavaOpenJDK7TestEnvironment" depends="ensureTestDeps, contrib" description="Sets up the test so that 'ant test' will test against OpenJDK7."> <mkdir dir="lib/openJDK7Environment" /> <get src="http://projectlombok.org/ivyrepo/langtools/javac-1.7.0.jar" dest="lib/openJDK7Environment/javac7.jar" verbose="true" usetimestamp="true" /> <get src="http://projectlombok.org/ivyrepo/langtools/rt-openjdk7.jar" dest="lib/openJDK7Environment/rt-openjdk7.jar" verbose="true" usetimestamp="true" /> @@ -488,7 +490,7 @@ ${sourceWarning}</echo> <antcall target="-createEclipseLaunchForTestEnvironmentIfEclipseProject" /> </target> - <target name="setupJavaOracle7TestEnvironment" depends="contrib" description="Sets up the test so that 'ant test' will test against OpenJDK7."> + <target name="setupJavaOracle7TestEnvironment" depends="ensureTestDeps, contrib" description="Sets up the test so that 'ant test' will test against OpenJDK7."> <mkdir dir="lib/oracleJDK7Environment" /> <get src="http://projectlombok.org/ivyrepo/langtools/oracle-jdk7-tools.jar" dest="lib/oracleJDK7Environment/tools.jar" verbose="true" usetimestamp="true" /> <get src="http://projectlombok.org/ivyrepo/langtools/oracle-jdk7-rt.jar" dest="lib/oracleJDK7Environment/rt.jar" verbose="true" usetimestamp="true" /> @@ -503,7 +505,7 @@ ${sourceWarning}</echo> <antcall target="-createEclipseLaunchForTestEnvironmentIfEclipseProject" /> </target> - <target name="setupJavaOracle8TestEnvironment" depends="contrib" description="Sets up the test so that 'ant test' will test against OpenJDK8."> + <target name="setupJavaOracle8TestEnvironment" depends="ensureTestDeps, contrib" description="Sets up the test so that 'ant test' will test against OpenJDK8."> <mkdir dir="lib/oracleJDK8Environment" /> <get src="http://projectlombok.org/ivyrepo/langtools/jdk8-javac.jar" dest="lib/oracleJDK8Environment/javac8.jar" verbose="true" usetimestamp="true" /> <get src="http://projectlombok.org/ivyrepo/langtools/oracle-jdk8-rt.jar" dest="lib/oracleJDK8Environment/rt.jar" verbose="true" usetimestamp="true" /> @@ -556,16 +558,7 @@ You can also create your own by writing a 'testenvironment.properties' file. The <classpath path="build/tests" /> <batchtest> <fileset dir="test/core/src"> - <include name="**/Test*.java" /> - </fileset> - <fileset dir="test/transform/src"> - <include name="**/Test*.java" /> - </fileset> - <fileset dir="test/bytecode/src"> - <include name="**/Test*.java" /> - </fileset> - <fileset dir="test/configuration/src"> - <include name="**/Test*.java" /> + <include name="lombok/RunAllTests.java" /> </fileset> </batchtest> </junit> |