From b208295cdb1fe31aaada77f09fc3a48057a98fac Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 17 Feb 2011 13:50:43 +0000
Subject: [PATCH] fix ant test thx welt
---
build.xml | 18 ++++++++++--------
core/java/build.xml | 3 ++-
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/build.xml b/build.xml
index 2e3549d3a..beb8451b7 100644
--- a/build.xml
+++ b/build.xml
@@ -771,29 +771,31 @@
<launch4j configFile="./installer/i2pstandalone.xml" />
<!-- thazzit -->
</target>
- <target name="test">
+
+ <target name="test" depends="buildProperties" >
<ant dir="core/java/" target="test" />
</target>
- <target name="junit.report">
+ <target name="junit.report" depends="buildProperties" >
<ant dir="core/java/" target="junit.report" />
</target>
- <target name="clover.report">
+ <target name="clover.report" depends="buildProperties" >
<ant dir="core/java/" target="clover.report" />
</target>
<target name="test.report" depends="junit.report, clover.report"/>
- <target name="fulltest">
+ <target name="fulltest" depends="buildProperties" >
<ant dir="core/java/" target="fulltest" />
<ant dir="router/java/" target="fulltest" />
</target>
- <target name="fullclovertest">
+ <target name="fullclovertest" depends="buildProperties" >
<ant dir="core/java/" target="fullclovertest" />
<ant dir="router/java/" target="fullclovertest" />
</target>
+
<target name="syndie" >
<ant dir="apps/syndie/java/" target="standalone" />
<copy file="apps/syndie/java/syndie-standalone.zip" todir="." />
</target>
- <target name="i2psnark">
+ <target name="i2psnark" depends="buildProperties" >
<ant dir="apps/i2psnark/java" target="standalone" />
<copy file="apps/i2psnark/java/i2psnark-standalone.zip" todir="." />
</target>
@@ -998,7 +1000,7 @@
<target name="debian" depends="distclean, debian-source, debian-binary" />
- <target name="debian-binary">
+ <target name="debian-binary" depends="buildProperties" >
<echo message="Did you update the version in these files?" />
<exec executable="ls" failonerror="true">
<arg value="-l" />
@@ -1015,7 +1017,7 @@
<arg value="amd64" />
</exec>
</target>
- <target name="debian-source">
+ <target name="debian-source" depends="buildProperties" >
<!-- bundle the 20MB jetty 5 lib since there probably isn't a deb for it -->
<ant dir="apps/jetty" target="ensureJettylib" />
<echo message="Did you update the version in these files?" />
diff --git a/core/java/build.xml b/core/java/build.xml
index 8445d791e..60f1a4dcc 100644
--- a/core/java/build.xml
+++ b/core/java/build.xml
@@ -31,8 +31,9 @@
<target name="compileTest">
<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="false"
+ includeAntRuntime="true"
destdir="./build/obj" >
<compilerarg line="${javac.compilerargs}" />
</javac>
--
GitLab