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

allow setting hamcrest and junit locations with properties

Browse Source 
Defaults to the ant library path (the previously hardcoded path) if not set.
This commit is contained in:
kytv
2013-01-03 11:53:08 +00:00
parent 5b81a1a6d5
commit 9d77cd7761
3 changed files with 46 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/java/build.xml
View File

@@ -98,10 +98,20 @@
<target name="junit.compileTest" depends="compile">
<mkdir dir="./build" />
<mkdir dir="./build/obj" />
<!-- junit and hamcrest classes should be in ant runtime -->
<!-- set hamcrest and junit homes to the old default unless overridden elsewhere -->
<property name="hamcrest.home" value="${ant.home}/lib/" />
<property name="junit.home" value="${ant.home}/lib/" />
<javac srcdir="./test/junit" debug="true" source="1.5" target="1.5" deprecation="on"
includeAntRuntime="true"
destdir="./build/obj" >
<classpath>
<pathelement path="${classpath}" />
<pathelement location="${hamcrest.home}/hamcrest-core.jar" />
<pathelement location="${hamcrest.home}/hamcrest-library.jar" />
<pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
<pathelement location="${junit.home}/junit.jar" />
<pathelement location="${junit.home}/junit4.jar" />
</classpath>
<compilerarg line="${javac.compilerargs}" />
</javac>
</target>
@@ -191,6 +201,8 @@
<replace dir="../../reports/core/scalatest/" token="${host.name}" value="${host.fakename}"/>
</target>
<target name="junit.test" depends="clean, junit.compileTest, prepareTest">
<property name="hamcrest.home" value="${ant.home}/lib/" />
<property name="junit.home" value="${ant.home}/lib/" />
<mkdir dir="../../reports/core/junit/" />
<delete>
<fileset dir="../../reports/core/junit">
@@ -201,9 +213,11 @@
<sysproperty key="net.sourceforge.cobertura.datafile" file="./cobertura.ser" />
<classpath>
<pathelement path="${classpath}" />
<pathelement location="${ant.home}/lib/hamcrest-core.jar" />
<pathelement location="${ant.home}/lib/hamcrest-library.jar" />
<pathelement location="${ant.home}/lib/hamcrest-integration.jar" />
<pathelement location="${hamcrest.home}/hamcrest-core.jar" />
<pathelement location="${hamcrest.home}/hamcrest-library.jar" />
<pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
<pathelement location="${junit.home}/junit.jar" />
<pathelement location="${junit.home}/junit4.jar" />
<pathelement location="./build/obj_cobertura" />
<pathelement location="./build/obj" />
<pathelement location="../../build/jbigi.jar" />