diff options
| -rw-r--r-- | build.xml | 7 | ||||
| -rw-r--r-- | test/core/src/lombok/RunTestsViaEcj.java | 2 | ||||
| -rw-r--r-- | test/transform/resource/after-delombok/EqualsAndHashCodeOfAndExclude.java (renamed from test/transform/resource/after-delombok/EqualsAndHashcodeOfExclude.java) | 0 | ||||
| -rw-r--r-- | test/transform/resource/after-ecj/EqualsAndHashCodeOfAndExclude.java (renamed from test/transform/resource/after-ecj/EqualsAndHashcodeOfExclude.java) | 2 | ||||
| -rw-r--r-- | test/transform/resource/before/EqualsAndHashCodeOfAndExclude.java (renamed from test/transform/resource/before/EqualsAndHashCodeOfExclude.java) | 2 |
5 files changed, 7 insertions, 6 deletions
@@ -28,7 +28,8 @@ the common tasks and can be called on to run the main aspects of all the sub-scr <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" /> - + <available file="lib/openJDK6Environment/rt-openjdk6.jar" property="rt-openjdk6.available" /> + <path id="build.path"> <fileset dir="lib/build"> <include name="*.jar" /> @@ -101,8 +102,8 @@ the common tasks and can be called on to run the main aspects of all the sub-scr <ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="contrib, ecj7, ecj8" /> <ivy:retrieve /> </target> - - <target name="ensureBuildDeps" depends="config-ivy"> + + <target name="ensureBuildDeps" depends="config-ivy" unless="rt-openjdk6.available"> <mkdir dir="lib/openJDK6Environment" /> <get src="https://projectlombok.org/ivyrepo/langtools/rt-openjdk6.jar" dest="lib/openJDK6Environment/rt-openjdk6.jar" verbose="true" usetimestamp="true" /> <ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="build, javac7" /> diff --git a/test/core/src/lombok/RunTestsViaEcj.java b/test/core/src/lombok/RunTestsViaEcj.java index 3f2698bb..775e825c 100644 --- a/test/core/src/lombok/RunTestsViaEcj.java +++ b/test/core/src/lombok/RunTestsViaEcj.java @@ -137,7 +137,7 @@ public class RunTestsViaEcj extends AbstractRunTests { i.remove(); } } - classpath.add("bin"); + if (new File("bin").exists()) classpath.add("bin"); classpath.add("dist/lombok.jar"); classpath.add("lib/test/commons-logging-commons-logging.jar"); classpath.add("lib/test/org.slf4j-slf4j-api.jar"); diff --git a/test/transform/resource/after-delombok/EqualsAndHashcodeOfExclude.java b/test/transform/resource/after-delombok/EqualsAndHashCodeOfAndExclude.java index 8b9888e9..8b9888e9 100644 --- a/test/transform/resource/after-delombok/EqualsAndHashcodeOfExclude.java +++ b/test/transform/resource/after-delombok/EqualsAndHashCodeOfAndExclude.java diff --git a/test/transform/resource/after-ecj/EqualsAndHashcodeOfExclude.java b/test/transform/resource/after-ecj/EqualsAndHashCodeOfAndExclude.java index 283c5430..30de15cf 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashcodeOfExclude.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeOfAndExclude.java @@ -43,4 +43,4 @@ final @lombok.EqualsAndHashCode(exclude = {"y"}) class EqualsAndHashCodeExclude result = ((result * PRIME) + this.x); return result; } -}
\ No newline at end of file +} diff --git a/test/transform/resource/before/EqualsAndHashCodeOfExclude.java b/test/transform/resource/before/EqualsAndHashCodeOfAndExclude.java index 0625ba52..b8ba21fb 100644 --- a/test/transform/resource/before/EqualsAndHashCodeOfExclude.java +++ b/test/transform/resource/before/EqualsAndHashCodeOfAndExclude.java @@ -8,4 +8,4 @@ final class EqualsAndHashCodeOf { final class EqualsAndHashCodeExclude { int x; int y; -}
\ No newline at end of file +} |