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

add hamcrest-all to classpaths and minor formatting fixes

Browse Source
This commit is contained in:
kytv
2014-11-12 17:42:50 +00:00
parent 962f5efe6b
commit 0773a30578
4 changed files with 46 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/streaming/java/build.xml
View File

@@ -64,6 +64,7 @@
<pathelement location="../../ministreaming/java/build/mstreamingTest.jar" />
<pathelement location="${junit.home}/junit4.jar" />
<pathelement location="${hamcrest.home}/hamcrest.jar" />
<pathelement location="${hamcrest.home}/hamcrest-all.jar" />
</classpath>
<compilerarg line="${javac.compilerargs}" />
</javac>
@@ -112,6 +113,7 @@
<pathelement location="${hamcrest.home}/hamcrest-core.jar" />
<pathelement location="${hamcrest.home}/hamcrest-library.jar" />
<pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
<pathelement location="${hamcrest.home}/hamcrest-all.jar" />
<pathelement location="${junit.home}/junit4.jar" />
<pathelement location="./build/obj_cobertura" />
<pathelement location="./build/obj" />

1
build.xml
View File

@@ -766,6 +766,7 @@
<pathelement location="build/i2p.jar" />
<pathelement location="build/router.jar" />
<pathelement location="${junit.home}/junit4.jar" />
<pathelement location="${hamcrest.home}/hamcrest-all.jar" />
</classpath>
<!--
These variables are stored in build.properties.

7
core/java/build.xml
View File

@@ -104,8 +104,13 @@
<mkdir dir="./build" />
<mkdir dir="./build/obj" />
<!-- set hamcrest and junit homes to the old default unless overridden elsewhere -->
<echo message="[DEBUG] ant home is ${ant.home}" />
<echo message="[DEBUG] junit home before override is ${junit.home}" />
<echo message="[DEBUG] hamcrest home before override is ${hamcrest.home}" />
<property name="hamcrest.home" value="${ant.home}/lib/" />
<property name="junit.home" value="${ant.home}/lib/" />
<echo message="[DEBUG] junit home after override is ${junit.home}" />
<echo message="[DEBUG] hamcrest home after override is ${hamcrest.home}" />
<javac srcdir="./test/junit" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
debuglevel="lines,vars,source"
includeAntRuntime="true"
@@ -115,6 +120,7 @@
<pathelement location="${hamcrest.home}/hamcrest-core.jar" />
<pathelement location="${hamcrest.home}/hamcrest-library.jar" />
<pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
<pathelement location="${hamcrest.home}/hamcrest-all.jar" />
<pathelement location="${junit.home}/junit4.jar" />
</classpath>
<compilerarg line="${javac.compilerargs}" />
@@ -224,6 +230,7 @@
<pathelement location="${hamcrest.home}/hamcrest-core.jar" />
<pathelement location="${hamcrest.home}/hamcrest-library.jar" />
<pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
<pathelement location="${hamcrest.home}/hamcrest-all.jar" />
<pathelement location="${junit.home}/junit4.jar" />
<pathelement location="./build/obj_cobertura" />
<pathelement location="./build/obj" />

2
router/java/build.xml
View File

@@ -138,6 +138,7 @@
<pathelement location="${hamcrest.home}/hamcrest-core.jar" />
<pathelement location="${hamcrest.home}/hamcrest-library.jar" />
<pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
<pathelement location="${hamcrest.home}/hamcrest-all.jar" />
<pathelement location="${junit.home}/junit4.jar" />
<pathelement location="../../core/java/build/i2ptest.jar" />
</classpath>
@@ -237,6 +238,7 @@
<pathelement location="${hamcrest.home}/hamcrest-core.jar" />
<pathelement location="${hamcrest.home}/hamcrest-library.jar" />
<pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
<pathelement location="${hamcrest.home}/hamcrest-all.jar" />
<pathelement location="${junit.home}/junit4.jar" />
<pathelement location="./build/obj_cobertura" />
<pathelement location="./build/obj" />