From 0773a305784a8cb3e5e199ef261af81d895c88b8 Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Wed, 12 Nov 2014 17:42:50 +0000
Subject: [PATCH] add hamcrest-all to classpaths and minor formatting fixes

---
 apps/streaming/java/build.xml | 70 ++++++++++++++++++-----------------
 build.xml                     |  1 +
 core/java/build.xml           |  7 ++++
 router/java/build.xml         |  2 +
 4 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml
index 73cbeb9fa..a2cd67240 100644
--- a/apps/streaming/java/build.xml
+++ b/apps/streaming/java/build.xml
@@ -11,7 +11,7 @@
     <target name="depend" if="depend.available">
         <depend
             cache="../../../build"
-            srcdir="./src:./test/junit" 
+            srcdir="./src:./test/junit"
             destdir="./build/obj" >
             <!-- Depend on classes instead of jars where available -->
             <classpath>
@@ -28,43 +28,44 @@
     <target name="compile" depends="depend">
         <mkdir dir="./build" />
         <mkdir dir="./build/obj" />
-        <javac 
-            srcdir="./src" 
-            debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
+        <javac
+            srcdir="./src"
+            debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
             includeAntRuntime="false"
-            destdir="./build/obj" 
+            destdir="./build/obj"
             classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
             <compilerarg line="${javac.compilerargs}" />
         </javac>
     </target>
     <target name="builddeptest">
-	<ant dir="../../../core/java" target="jar" />
+        <ant dir="../../../core/java" target="jar" />
         <ant dir="../../../apps/ministreaming/java/" target="jarTest" />
     </target>
     <target name="junit.compileTest" depends="builddeptest, compile">
 
-	<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="junit.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] hamcrest home after override is ${hamcrest.home}" />
- 
-       <javac 
-            srcdir="./test/junit" 
-            debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
+        <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="junit.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] hamcrest home after override is ${hamcrest.home}" />
+
+        <javac
+            srcdir="./test/junit"
+            debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
             includeAntRuntime="false"
             destdir="./build/obj" >
-	   <classpath>
-		<pathelement location="../../../core/java/build/i2p.jar" />
-		<pathelement location="../../ministreaming/java/build/mstreaming.jar" />
-		<pathelement location="../../ministreaming/java/build/mstreamingTest.jar" />
-		<pathelement location="${junit.home}/junit4.jar" />
-		<pathelement location="${hamcrest.home}/hamcrest.jar" />
-	   </classpath>
+            <classpath>
+                <pathelement location="../../../core/java/build/i2p.jar" />
+                <pathelement location="../../ministreaming/java/build/mstreaming.jar" />
+                <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>
     </target>
@@ -102,8 +103,8 @@
             </fileset>
         </delete>
 
-	<property name="junit.home" value="${ant.home}/lib" />
-	<property name="hamcrest.home" value="${ant.home}/lib" />
+        <property name="junit.home" value="${ant.home}/lib" />
+        <property name="hamcrest.home" value="${ant.home}/lib" />
 
         <junit printsummary="withOutAndErr" fork="yes" showoutput="yes" >
             <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-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" />
                 <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/mstreamingTest.jar" />
                 <pathelement location="../../build/jbigi.jar" />
@@ -216,11 +218,11 @@
     <target name="javadoc">
         <mkdir dir="./build" />
         <mkdir dir="./build/javadoc" />
-        <javadoc 
-            sourcepath="./src:../../../core/java/src:../../ministreaming/java/src" destdir="./build/javadoc" 
-            packagenames="*" 
-            use="true" 
-            splitindex="true" 
+        <javadoc
+            sourcepath="./src:../../../core/java/src:../../ministreaming/java/src" destdir="./build/javadoc"
+            packagenames="*"
+            use="true"
+            splitindex="true"
             windowtitle="Streaming" />
     </target>
     <target name="clean">
diff --git a/build.xml b/build.xml
index d8a8007b3..4e765e0d6 100644
--- a/build.xml
+++ b/build.xml
@@ -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.
diff --git a/core/java/build.xml b/core/java/build.xml
index 032d400d9..a14377de7 100644
--- a/core/java/build.xml
+++ b/core/java/build.xml
@@ -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" />
diff --git a/router/java/build.xml b/router/java/build.xml
index 01f7148fd..85eba417d 100644
--- a/router/java/build.xml
+++ b/router/java/build.xml
@@ -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" />