diff options
| author | Roel Spilker <r.spilker@gmail.com> | 2017-09-18 23:40:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-18 23:40:08 +0200 |
| commit | 438095f5874015b96deee7a869e214b99316c329 (patch) | |
| tree | 1b27341b29ef5a1ad9be5972b2b713491feb01d8 /build.xml | |
| parent | d9f66583225f265336d19198e35d47361aef35cc (diff) | |
| parent | 1244721734a2025d1e3268f09846f9469f10f415 (diff) | |
| download | lombok-438095f5874015b96deee7a869e214b99316c329.tar.gz lombok-438095f5874015b96deee7a869e214b99316c329.tar.bz2 lombok-438095f5874015b96deee7a869e214b99316c329.zip | |
Merge pull request #1311 from askoning/testsOnLinux
Several minor fixes to make 'ant test' work more reliably on other systems
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 7 |
1 files changed, 4 insertions, 3 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" /> |