From 5355e5bbfd9c35287fa0a819c6b950b88fd38585 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Tue, 7 Aug 2012 11:58:11 +0000
Subject: [PATCH] Added targets to build i2p.jar and router.jar with ScalaTest
classes included
---
core/java/build.xml | 9 +++++++--
router/java/build.xml | 15 ++++++++++++---
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/core/java/build.xml b/core/java/build.xml
index a415e7954f..7f18a1bcc2 100644
--- a/core/java/build.xml
+++ b/core/java/build.xml
@@ -81,14 +81,15 @@
</target>
<!-- unit tests -->
- <target name="scalatest.compileTest" depends="jar, scala.init">
+ <target name="scalatest.compileTest" depends="compile, scala.init">
<mkdir dir="./build" />
<mkdir dir="./build/obj_scala" />
<scalac srcdir="./test/scalatest" destdir="./build/obj_scala" deprecation="on" >
<classpath>
+ <pathelement location="${classpath}" />
<pathelement location="${scala-library.jar}" />
<pathelement location="${scalatest.jar}" />
- <pathelement location="./build/i2p.jar" />
+ <pathelement location="./build/obj" />
</classpath>
</scalac>
</target>
@@ -102,6 +103,10 @@
<compilerarg line="${javac.compilerargs}" />
</javac>
</target>
+ <!-- jars with tests -->
+ <target name="jarScalaTest" depends="scalatest.compileTest">
+ <jar destfile="./build/i2pscalatest.jar" basedir="./build/obj" includes="**/*.class ../obj_scala/**/*.class" />
+ </target>
<target name="jarTest" depends="junit.compileTest">
<jar destfile="./build/i2ptest.jar" basedir="./build/obj" includes="**/*.class" />
</target>
diff --git a/router/java/build.xml b/router/java/build.xml
index 83f23fa444..cbccfd1d1f 100644
--- a/router/java/build.xml
+++ b/router/java/build.xml
@@ -99,18 +99,23 @@
</target>
<!-- unit tests -->
+ <target name="builddepscalatest">
+ <ant dir="../../core/java/" target="jar" />
+ <ant dir="../../core/java/" target="jarScalaTest" />
+ </target>
<target name="builddeptest">
<ant dir="../../core/java/" target="jarTest" />
</target>
- <target name="scalatest.compileTest" depends="jar, scala.init">
+ <target name="scalatest.compileTest" depends="builddepscalatest, compile, scala.init">
<mkdir dir="./build" />
<mkdir dir="./build/obj_scala" />
<scalac srcdir="./test/scalatest" destdir="./build/obj_scala" deprecation="on" >
<classpath>
+ <pathelement location="${classpath}" />
<pathelement location="${scala-library.jar}" />
<pathelement location="${scalatest.jar}" />
- <pathelement location="../../core/java/build/i2p.jar" />
- <pathelement location="./build/router.jar" />
+ <pathelement location="../../core/java/build/i2pscalatest.jar" />
+ <pathelement location="./build/obj" />
</classpath>
</scalac>
</target>
@@ -124,6 +129,10 @@
<compilerarg line="${javac.compilerargs}" />
</javac>
</target>
+ <!-- jars with tests -->
+ <target name="jarScalaTest" depends="scalatest.compileTest">
+ <jar destfile="./build/routerscalatest.jar" basedir="./build/obj" includes="**/*.class ../obj_scala/**/*.class" />
+ </target>
<target name="jarTest" depends="junit.compileTest">
<jar destfile="./build/routertest.jar" basedir="./build/obj" includes="**/*.class" />
</target>
--
GitLab