marek/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fixed jarScalaTest targets to actually package all classes

Browse Source
This commit is contained in:
str4d
2012-08-08 00:07:17 +00:00
parent 5355e5bbfd
commit 7f09206a47
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/build.xml
View File

@ -105,7 +105,20 @@
</target> </target>
<!-- jars with tests --> <!-- jars with tests -->
<target name="jarScalaTest" depends="scalatest.compileTest"> <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>
<target name="jarTest" depends="junit.compileTest"> <target name="jarTest" depends="junit.compileTest">
<jar destfile="./build/i2ptest.jar" basedir="./build/obj" includes="**/*.class" /> <jar destfile="./build/i2ptest.jar" basedir="./build/obj" includes="**/*.class" />

15
router/java/build.xml
View File

@ -131,7 +131,20 @@
</target> </target>
<!-- jars with tests --> <!-- jars with tests -->
<target name="jarScalaTest" depends="scalatest.compileTest"> <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>
<target name="jarTest" depends="junit.compileTest"> <target name="jarTest" depends="junit.compileTest">
<jar destfile="./build/routertest.jar" basedir="./build/obj" includes="**/*.class" /> <jar destfile="./build/routertest.jar" basedir="./build/obj" includes="**/*.class" />