Okay, now the build should be truly fixed again... at least, if you're running on a 1.6 VM.

The test run now has more fine-grained dependency control, in preparation for running tests against multiple different platform versions (javac1.6, old eclipse, new eclipse, etc)
This commit is contained in:
Reinier Zwitserloot authored and Roel Spilker committed 2012-01-23 20:21:55 +01:00
1 parent b3a55b0c6c
commit b8049aa1c7
1 file changed
+9 -1
+9 -1
View File
@@ -48,6 +48,12 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
</fileset>
</path>
<path id="eclipseBuild.path">
<fileset dir="lib/eclipseBuild">
<include name="*.jar" />
</fileset>
</path>
<target name="-defSSH" depends="ensureBuildDeps">
<taskdef name="scp" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.Scp" classpathref="build.path" />
<taskdef name="sshexec" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.SSHExec" classpathref="build.path" />
@@ -108,7 +114,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
</target>
<target name="ensureTestDeps" depends="config-ivy">
<ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="test, javac6" />
<ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="test, javac6, eclipseBuild" />
<ivy:retrieve />
</target>
@@ -298,6 +304,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
<mkdir dir="build/tests" />
<ivy:compile destdir="build/tests" source="1.5" target="1.5" includeantruntime="false">
<classpath refid="test.path" />
<classpath refid="build.path" />
<classpath path="build/lombok" />
<src path="test/core/src" />
<src path="test/transform/src" />
@@ -325,6 +332,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
<jvmarg value="-javaagent:dist/lombok.jar" />
<formatter type="plain" usefile="false" unless="tests.quiet" />
<classpath refid="test.path" />
<classpath refid="eclipseBuild.path" />
<classpath path="lib/javac6/javac6.jar" />
<classpath path="build/lombok" />
<classpath path="build/tests" />