lbt/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests 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

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

@@ -11,7 +11,7 @@
<target name="depend" if="depend.available"> <target name="depend" if="depend.available">
<depend <depend
cache="../../../build" cache="../../../build"
srcdir="./src:./test/junit" srcdir="./src:./test/junit"
destdir="./build/obj" > destdir="./build/obj" >
<!-- Depend on classes instead of jars where available --> <!-- Depend on classes instead of jars where available -->
<classpath> <classpath>
@@ -28,43 +28,44 @@
<target name="compile" depends="depend"> <target name="compile" depends="depend">
<mkdir dir="./build" /> <mkdir dir="./build" />
<mkdir dir="./build/obj" /> <mkdir dir="./build/obj" />
<javac <javac
srcdir="./src" srcdir="./src"
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false" includeAntRuntime="false"
destdir="./build/obj" destdir="./build/obj"
classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" > classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
<compilerarg line="${javac.compilerargs}" /> <compilerarg line="${javac.compilerargs}" />
</javac> </javac>
</target> </target>
<target name="builddeptest"> <target name="builddeptest">
<ant dir="../../../core/java" target="jar" /> <ant dir="../../../core/java" target="jar" />
<ant dir="../../../apps/ministreaming/java/" target="jarTest" /> <ant dir="../../../apps/ministreaming/java/" target="jarTest" />
</target> </target>
<target name="junit.compileTest" depends="builddeptest, compile"> <target name="junit.compileTest" depends="builddeptest, compile">
<echo message="[DEBUG] ant home is ${ant.home}" /> <echo message="[DEBUG] ant home is ${ant.home}" />
<echo message="[DEBUG] junit home before override is ${junit.home}" /> <echo message="[DEBUG] junit home before override is ${junit.home}" />
<echo message="[DEBUG] hamcrest home before override is ${hamcrest.home}" /> <echo message="[DEBUG] hamcrest home before override is ${hamcrest.home}" />
<property name="junit.home" value="${ant.home}/lib" /> <property name="junit.home" value="${ant.home}/lib" />
<property name="hamcrest.home" value="${ant.home}/lib" /> <property name="hamcrest.home" value="${ant.home}/lib" />
<echo message="[DEBUG] junit home after override is ${junit.home}" /> <echo message="[DEBUG] junit home after override is ${junit.home}" />
<echo message="[DEBUG] hamcrest home after override is ${hamcrest.home}" /> <echo message="[DEBUG] hamcrest home after override is ${hamcrest.home}" />
<javac <javac
srcdir="./test/junit" srcdir="./test/junit"
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false" includeAntRuntime="false"
destdir="./build/obj" > destdir="./build/obj" >
<classpath> <classpath>
<pathelement location="../../../core/java/build/i2p.jar" /> <pathelement location="../../../core/java/build/i2p.jar" />
<pathelement location="../../ministreaming/java/build/mstreaming.jar" /> <pathelement location="../../ministreaming/java/build/mstreaming.jar" />
<pathelement location="../../ministreaming/java/build/mstreamingTest.jar" /> <pathelement location="../../ministreaming/java/build/mstreamingTest.jar" />
<pathelement location="${junit.home}/junit4.jar" /> <pathelement location="${junit.home}/junit4.jar" />
<pathelement location="${hamcrest.home}/hamcrest.jar" /> <pathelement location="${hamcrest.home}/hamcrest.jar" />
</classpath> <pathelement location="${hamcrest.home}/hamcrest-all.jar" />
</classpath>
<compilerarg line="${javac.compilerargs}" /> <compilerarg line="${javac.compilerargs}" />
</javac> </javac>
</target> </target>
@@ -102,8 +103,8 @@
</fileset> </fileset>
</delete> </delete>
<property name="junit.home" value="${ant.home}/lib" /> <property name="junit.home" value="${ant.home}/lib" />
<property name="hamcrest.home" value="${ant.home}/lib" /> <property name="hamcrest.home" value="${ant.home}/lib" />
<junit printsummary="withOutAndErr" fork="yes" showoutput="yes" > <junit printsummary="withOutAndErr" fork="yes" showoutput="yes" >
<sysproperty key="net.sourceforge.cobertura.datafile" file="./cobertura.ser" /> <sysproperty key="net.sourceforge.cobertura.datafile" file="./cobertura.ser" />
@@ -112,11 +113,12 @@
<pathelement location="${hamcrest.home}/hamcrest-core.jar" /> <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
<pathelement location="${hamcrest.home}/hamcrest-library.jar" /> <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
<pathelement location="${hamcrest.home}/hamcrest-integration.jar" /> <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
<pathelement location="${hamcrest.home}/hamcrest-all.jar" />
<pathelement location="${junit.home}/junit4.jar" /> <pathelement location="${junit.home}/junit4.jar" />
<pathelement location="./build/obj_cobertura" /> <pathelement location="./build/obj_cobertura" />
<pathelement location="./build/obj" /> <pathelement location="./build/obj" />
<pathelement location="../../../core/java/build/i2ptest.jar" /> <pathelement location="../../../core/java/build/i2ptest.jar" />
<pathelement location="../../../core/java/build/i2p.jar" /> <pathelement location="../../../core/java/build/i2p.jar" />
<pathelement location="../../ministreaming/java/build/mstreaming.jar" /> <pathelement location="../../ministreaming/java/build/mstreaming.jar" />
<pathelement location="../../ministreaming/java/build/mstreamingTest.jar" /> <pathelement location="../../ministreaming/java/build/mstreamingTest.jar" />
<pathelement location="../../build/jbigi.jar" /> <pathelement location="../../build/jbigi.jar" />
@@ -216,11 +218,11 @@
<target name="javadoc"> <target name="javadoc">
<mkdir dir="./build" /> <mkdir dir="./build" />
<mkdir dir="./build/javadoc" /> <mkdir dir="./build/javadoc" />
<javadoc <javadoc
sourcepath="./src:../../../core/java/src:../../ministreaming/java/src" destdir="./build/javadoc" sourcepath="./src:../../../core/java/src:../../ministreaming/java/src" destdir="./build/javadoc"
packagenames="*" packagenames="*"
use="true" use="true"
splitindex="true" splitindex="true"
windowtitle="Streaming" /> windowtitle="Streaming" />
</target> </target>
<target name="clean"> <target name="clean">

1
build.xml
View File

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

7
core/java/build.xml
View File

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