diff options
| author | Roel Spilker <r.spilker@gmail.com> | 2013-11-19 21:02:59 +0100 |
|---|---|---|
| committer | Roel Spilker <r.spilker@gmail.com> | 2013-11-19 21:02:59 +0100 |
| commit | 78b2d6919e35887940f9f11b6ae1731245739b83 (patch) | |
| tree | 0dc305883c19a862a38669374c5614e26480d4b8 /build.xml | |
| parent | 5deb185591904d275cb06eea85c0d739587fc738 (diff) | |
| parent | 83b7e77b0cce6cd5993b17f36164271accdd281c (diff) | |
| download | lombok-78b2d6919e35887940f9f11b6ae1731245739b83.tar.gz lombok-78b2d6919e35887940f9f11b6ae1731245739b83.tar.bz2 lombok-78b2d6919e35887940f9f11b6ae1731245739b83.zip | |
Merge branch 'master' of github.com:rzwitserloot/lombok
Conflicts:
src/delombok/lombok/delombok/DelombokApp.java
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 36 |
1 files changed, 32 insertions, 4 deletions
@@ -332,7 +332,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr </copy> </target> - <target name="setupJava6TestEnvironment" description="Sets up the test so that 'ant test' will test against OpenJDK6."> + <target name="setupJavaOpenJDK6TestEnvironment" 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" /> @@ -345,7 +345,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr <antcall target="-createEclipseLaunchForTestEnvironmentIfEclipseProject" /> </target> - <target name="setupJava7TestEnvironment" description="Sets up the test so that 'ant test' will test against OpenJDK7."> + <target name="setupJavaOpenJDK7TestEnvironment" 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" /> @@ -357,6 +357,32 @@ the common tasks and can be called on to run the main aspects of all the sub-scr <echo>Tests will now run against OpenJDK7</echo> <antcall target="-createEclipseLaunchForTestEnvironmentIfEclipseProject" /> </target> + + <target name="setupJavaOracle7TestEnvironment" 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" /> + <propertyfile file="testenvironment.properties"> + <entry key="test.location.javac" value="lib/oracleJDK7Environment/tools.jar" /> + <entry key="test.location.bootclasspath" value="lib/oracleJDK7Environment/rt.jar" /> + <entry key="test.location.name" value="OracleJDK7" /> + </propertyfile> + <echo>Tests will now run against Oracle JDK7</echo> + <antcall target="-createEclipseLaunchForTestEnvironmentIfEclipseProject" /> + </target> + + <target name="setupJavaOracle8TestEnvironment" description="Sets up the test so that 'ant test' will test against OpenJDK8."> + <mkdir dir="lib/oracleJDK8Environment" /> + <get src="http://projectlombok.org/ivyrepo/langtools/oracle-jdk8-tools.jar" dest="lib/oracleJDK8Environment/tools.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" /> + <propertyfile file="testenvironment.properties"> + <entry key="test.location.javac" value="lib/oracleJDK8Environment/tools.jar" /> + <entry key="test.location.bootclasspath" value="lib/oracleJDK8Environment/rt.jar" /> + <entry key="test.location.name" value="OracleJDK8" /> + </propertyfile> + <echo>Tests will now run against Oracle JDK8</echo> + <antcall target="-createEclipseLaunchForTestEnvironmentIfEclipseProject" /> + </target> <target name="-failIfNoTestEnvironmentProperties" unless="test.location.javac"> <fail>ERROR: No test environment set up. @@ -366,8 +392,10 @@ Eventually, this environment concept will be extended to also include an ecj and You can let this ant script set them up for you: -* ant setupJava6TestEnvironment -* ant setupJava7TestEnvironment +* ant setupJavaOpenJDK6TestEnvironment +* ant setupJavaOpenJDK7TestEnvironment +* ant setupJavaOracle7TestEnvironment +* ant setupJavaOracle8TestEnvironment These will set up test environments based on OpenJDK6 and OpenJDK7, and download all required files automatically. This will be a relatively large download. You can switch by running this command again; the downloads are cached so switching is fast. |