Changeset 3579 in josm

Timestamp:

2010-10-02T09:06:47+02:00 (14 years ago)

Author:

jttt

Message:

Use josm-custom.jar in test classpath (because ProjectionTest needs file from /data directory)

File:

• trunk/build.xml (modified) (3 diffs)

trunk/build.xml

@@ -143 +143 @@
                         <include name="**/*.jar"/>
                 </fileset>
+                <pathelement path="dist/josm-custom.jar"/>
         </path>
 
@@ -155 +156 @@
         </target>
 
-        <target name="test-compile" depends="test-init">
-                <javac srcdir="${src.dir}:${test.dir}/unit" classpathref="test.classpath" destdir="${test.dir}/${build.dir}"
+        <target name="test-compile" depends="test-init,dist">
+                <javac srcdir="${test.dir}/unit" classpathref="test.classpath" destdir="${test.dir}/${build.dir}"
                                 target="1.5" source="1.5" debug="on" encoding="UTF-8">
                         <compilerarg value="-Xlint:deprecation"/>
                         <compilerarg value="-Xlint:unchecked"/>
                 </javac>
-                <javac srcdir="${src.dir}:${test.dir}/functional" classpathref="test.classpath" destdir="${test.dir}/${build.dir}"
+                <javac srcdir="${test.dir}/functional" classpathref="test.classpath" destdir="${test.dir}/${build.dir}"
                                                 target="1.5" source="1.5" debug="on" encoding="UTF-8">
                         <compilerarg value="-Xlint:deprecation"/>
@@ -195 +196 @@
                 -dontoptimize
                 -dontobfuscate
-                
+
                 -dontskipnonpubliclibraryclasses