forked from I2P_Developers/i2p.i2p
Shuffled build targets around to group together ones related to unit tests
This commit is contained in:
@ -5,9 +5,6 @@
|
||||
<target name="builddep">
|
||||
<!-- run from top level build.xml to get dependencies built -->
|
||||
</target>
|
||||
<target name="builddeptest">
|
||||
<ant dir="../../core/java/" target="jarTest" />
|
||||
</target>
|
||||
<condition property="depend.available">
|
||||
<typefound name="depend" />
|
||||
</condition>
|
||||
@ -42,17 +39,6 @@
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="compileTest" depends="builddeptest">
|
||||
<mkdir dir="./build" />
|
||||
<mkdir dir="./build/obj" />
|
||||
<!-- junit classes are in ant runtime -->
|
||||
<javac srcdir="./src:./test" debug="true" source="1.5" target="1.5" deprecation="on"
|
||||
includeAntRuntime="true"
|
||||
destdir="./build/obj" classpath="../../core/java/build/i2ptest.jar" >
|
||||
<compilerarg line="${javac.compilerargs}" />
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="listChangedFiles" if="mtn.available" >
|
||||
<exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
|
||||
<arg value="list" />
|
||||
@ -86,9 +72,6 @@
|
||||
</uptodate>
|
||||
</target>
|
||||
|
||||
<target name="jarTest" depends="compileTest">
|
||||
<jar destfile="./build/routertest.jar" basedir="./build/obj" includes="**/*.class" />
|
||||
</target>
|
||||
<target name="javadoc">
|
||||
<mkdir dir="./build" />
|
||||
<mkdir dir="./build/javadoc" />
|
||||
@ -99,6 +82,24 @@
|
||||
splitindex="true"
|
||||
windowtitle="I2P Router" />
|
||||
</target>
|
||||
|
||||
<!-- unit tests -->
|
||||
<target name="builddeptest">
|
||||
<ant dir="../../core/java/" target="jarTest" />
|
||||
</target>
|
||||
<target name="compileTest" depends="builddeptest">
|
||||
<mkdir dir="./build" />
|
||||
<mkdir dir="./build/obj" />
|
||||
<!-- junit classes are in ant runtime -->
|
||||
<javac srcdir="./src:./test" debug="true" source="1.5" target="1.5" deprecation="on"
|
||||
includeAntRuntime="true"
|
||||
destdir="./build/obj" classpath="../../core/java/build/i2ptest.jar" >
|
||||
<compilerarg line="${javac.compilerargs}" />
|
||||
</javac>
|
||||
</target>
|
||||
<target name="jarTest" depends="compileTest">
|
||||
<jar destfile="./build/routertest.jar" basedir="./build/obj" includes="**/*.class" />
|
||||
</target>
|
||||
<target name="test" depends="compileTest">
|
||||
<junit printsummary="on" fork="yes">
|
||||
<classpath>
|
||||
@ -164,6 +165,8 @@
|
||||
</target>
|
||||
<target name="fulltest" depends="cleandep, builddeptest, jarTest, test, junit.report" />
|
||||
<target name="fullclovertest" depends="cleandep, builddeptest, useclover, jarTest, test, test.report" />
|
||||
<!-- end unit tests -->
|
||||
|
||||
<target name="clean">
|
||||
<delete dir="./build" />
|
||||
</target>
|
||||
|
Reference in New Issue
Block a user