diff --git a/core/java/build.xml b/core/java/build.xml index 7f18a1bcc2c23d299e6bfdb3d4bcd48ac7f06781..c52df80d319d580b1ff8d0fbb5dbd5130ea3aaf7 100644 --- a/core/java/build.xml +++ b/core/java/build.xml @@ -105,7 +105,20 @@ </target> <!-- jars with tests --> <target name="jarScalaTest" depends="scalatest.compileTest"> - <jar destfile="./build/i2pscalatest.jar" basedir="./build/obj" includes="**/*.class ../obj_scala/**/*.class" /> + <mkdir dir="./build/obj_scala_jar" /> + <copy todir="./build/obj_scala_jar"> + <fileset dir="./build/"> + <include name="obj/**/*.class"/> + </fileset> + <mapper type="glob" from="obj/*" to="*" /> + </copy> + <copy todir="./build/obj_scala_jar"> + <fileset dir="./build/"> + <include name="obj_scala/**/*.class"/> + </fileset> + <mapper type="glob" from="obj_scala/*" to="*" /> + </copy> + <jar destfile="./build/i2pscalatest.jar" basedir="./build/obj_scala_jar" includes="**/*.class" /> </target> <target name="jarTest" depends="junit.compileTest"> <jar destfile="./build/i2ptest.jar" basedir="./build/obj" includes="**/*.class" /> diff --git a/router/java/build.xml b/router/java/build.xml index cbccfd1d1f8f24c8cd5ec74781733828f2ca7bf8..6b49c9530cecd9b515006e1f5c6717d7d1d50e18 100644 --- a/router/java/build.xml +++ b/router/java/build.xml @@ -131,7 +131,20 @@ </target> <!-- jars with tests --> <target name="jarScalaTest" depends="scalatest.compileTest"> - <jar destfile="./build/routerscalatest.jar" basedir="./build/obj" includes="**/*.class ../obj_scala/**/*.class" /> + <mkdir dir="./build/obj_scala_jar" /> + <copy todir="./build/obj_scala_jar"> + <fileset dir="./build/"> + <include name="obj/**/*.class"/> + </fileset> + <mapper type="glob" from="obj/*" to="*" /> + </copy> + <copy todir="./build/obj_scala_jar"> + <fileset dir="./build/"> + <include name="obj_scala/**/*.class"/> + </fileset> + <mapper type="glob" from="obj_scala/*" to="*" /> + </copy> + <jar destfile="./build/routerscalatest.jar" basedir="./build/obj_scala_jar" includes="**/*.class" /> </target> <target name="jarTest" depends="junit.compileTest"> <jar destfile="./build/routertest.jar" basedir="./build/obj" includes="**/*.class" />