|
37 | 37 |
|
38 | 38 | <property environment="env" /> |
39 | 39 | <property name="java-home" value="${env.JAVA_HOME}" /> |
| 40 | + <property name="java8-home" value="${env.JAVA8_HOME}" /> |
40 | 41 | <property name="findbugs-home" value="${env.FINDBUGS_HOME}" /> |
41 | 42 |
|
42 | 43 | <property name="is-development" value="yes" /> <!-- Development or stable release --> |
|
178 | 179 | Compilation Targets |
179 | 180 | ******************* --> |
180 | 181 |
|
181 | | - <!-- The following target assumes that javac resolves to a Java 8 compiler --> |
| 182 | + <!-- The following target assumes that java.home resolves to a Java 8 JDK distro --> |
182 | 183 | <target name="compile" depends="generate-source, do-compile, copy-resources, unjar-libs" |
183 | 184 | description="Compile all source files (after generating the source)"> |
184 | 185 | </target> |
|
189 | 190 |
|
190 | 191 | <mkdir dir="classes/base" /> |
191 | 192 | <mkdir dir="classes/test" /> |
192 | | - |
| 193 | + |
193 | 194 | <!-- Move any test classes back to base to prevent recompilation --> |
194 | 195 | <move todir="classes/base"> |
195 | 196 | <fileset dir="classes/test" includes="**/*" /> |
|
229 | 230 | <!-- Additional test classes should be listed here --> |
230 | 231 | </fileset> |
231 | 232 | </move> |
232 | | - |
233 | 233 | </target> |
234 | 234 |
|
235 | 235 | <target name="copy-resources"> |
|
364 | 364 |
|
365 | 365 | </target> |
366 | 366 |
|
367 | | - |
368 | 367 | <target name="do-test" depends="resolve-jvm-args"> |
369 | 368 | <echo message="Running all tests matching '${test-filter-string}' with command '${test-jvm}', using '${junit-jar-to-include}' and '${test-tools}'" /> |
370 | 369 | <jacoco:coverage xmlns:jacoco="antlib:org.jacoco.ant"> |
|
422 | 421 | </jacoco:report> |
423 | 422 | </target> |
424 | 423 |
|
425 | | - |
426 | 424 | <target name="run" depends="compile" description="Run the main class (after compiling)"> |
427 | 425 | <antcall target="do-run"> |
428 | 426 | <param name="run-jvm" value="java" /> |
|
893 | 891 | <property name="current-tools-2" location="${java.home}/lib/tools.jar" /> |
894 | 892 | <available property="current-tools" value="${current-tools-2}" file="${current-tools-2}" /> |
895 | 893 |
|
896 | | - <fail message="Can't find tools.jar in extib or the Java home: ${java.home}" unless="current-tools" /> |
| 894 | + <fail message="Can't find tools.jar in extlib or the Java home: ${java.home}" unless="current-tools" /> |
897 | 895 | </target> |
898 | 896 |
|
899 | 897 | <target name="assert-jar-exists"> |
|
0 commit comments