commit 3b6350edbace1e84b5f196523f2f7ba1b00544fa
Author: tharvik <tharvik@users.noreply.github.com>
Date: Sat Aug 17 13:56:51 2024 +0200
add gentoo.classpath
diff --git a/apps/i2pcontrol/build.xml b/apps/i2pcontrol/build.xml
index d3e4883da..e1e59c498 100644
--- a/apps/i2pcontrol/build.xml
+++ b/apps/i2pcontrol/build.xml
@@ -24,6 +24,7 @@
<pathelement location="${wrapperlib}/wrapper.jar" />
<!-- following jar only present for debian builds -->
<pathelement location="../../core/java/build/json-simple.jar" />
+ <pathelement path="${gentoo.classpath}" />
</path>
<path id="cpSocket">
@@ -33,6 +34,7 @@
<pathelement location="${wrapperlib}/wrapper.jar" />
<!-- following jar only present for debian builds -->
<pathelement location="../../core/java/build/json-simple.jar" />
+ <pathelement path="${gentoo.classpath}" />
</path>
<target name="all" depends="clean, build" />
diff --git a/apps/i2psnark/java/build.xml b/apps/i2psnark/java/build.xml
index 3346039ad..b49381b6b 100644
--- a/apps/i2psnark/java/build.xml
+++ b/apps/i2psnark/java/build.xml
@@ -63,6 +63,7 @@
<pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" />
<pathelement location="../../jetty/jettylib/jetty-util.jar" />
<pathelement location="../../desktopgui/dist/desktopgui.jar" />
+ <pathelement path="${gentoo.classpath}" />
</classpath>
</javac>
</target>
diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml
index 9d35edadf..45ef995d9 100644
--- a/apps/i2ptunnel/java/build.xml
+++ b/apps/i2ptunnel/java/build.xml
@@ -45,7 +45,7 @@
destdir="./build/obj"
includeAntRuntime="false"
encoding="UTF-8"
- classpath="../../../core/java/build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../ministreaming/java/build/mstreaming.jar" >
+ classpath="../../../core/java/build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../ministreaming/java/build/mstreaming.jar:${gentoo.classpath}" >
<compilerarg line="${javac.compilerargs}" />
</javac>
</target>
@@ -373,6 +373,7 @@
<!-- required for multipart form handling in register.jsp -->
<pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
<pathelement location="../../jetty/jettylib/jspc.jar" />
+ <pathelement path="${gentoo.classpath}" />
</classpath>
<arg value="-d" />
<arg value="../jsp/WEB-INF/classes" />
@@ -410,6 +411,7 @@
<pathelement location="../../../core/java/build/i2p.jar" />
<!-- required for multipart form handling in register.jsp -->
<pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
+ <pathelement path="${gentoo.classpath}" />
</classpath>
</javac>
<copy file="../jsp/web.xml" tofile="../jsp/web-out.xml" />
@@ -477,6 +479,7 @@
<pathelement location="../../ministreaming/java/build/mstreaming.jar" />
<pathelement location="../../streaming/java/build/streaming.jar" />
<pathelement location="${junit.home}/junit4.jar" />
+ <pathelement path="${gentoo.classpath}" />
</classpath>
<batchtest>
<fileset dir="./test/junit/">
diff --git a/apps/imagegen/imagegen/build.xml b/apps/imagegen/imagegen/build.xml
index 39252ef8b..6193ff129 100644
--- a/apps/imagegen/imagegen/build.xml
+++ b/apps/imagegen/imagegen/build.xml
@@ -9,6 +9,7 @@
<pathelement location="../zxing/build/zxing.jar" />
<pathelement location="../../../build/i2p.jar" />
<pathelement location="../../../build/jrobin.jar" />
+ <pathelement path="${gentoo.classpath}" />
</path>
<target name="all" depends="war" />
diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index 866bc1dd9..7c76ab341 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -418,6 +418,7 @@
<pathelement location="./jettylib/org.mortbay.jetty.jar" />
<!-- following jar only present for debian builds -->
<pathelement location="./jettylib/tomcat-api.jar" />
+ <pathelement path="${gentoo.classpath}" />
</classpath>
<compilerarg line="${javac.compilerargs}" />
</javac>
diff --git a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml
index 72944b25c..74cfa9b96 100644
--- a/apps/ministreaming/java/build.xml
+++ b/apps/ministreaming/java/build.xml
@@ -262,6 +262,7 @@
<pathelement location="${mockito.home}/byte-buddy.jar" />
<pathelement location="${mockito.home}/objenesis.jar" />
<pathelement location="${mockito.home}/mockito-core.jar" />
+ <pathelement path="${gentoo.classpath}" />
</classpath>
<compilerarg line="${javac.compilerargs}" />
</javac>
@@ -326,6 +327,7 @@
<pathelement location="../../build/jbigi.jar" />
<pathelement location="${with.clover}" />
<pathelement location="${with.cobertura}" />
+ <pathelement path="${gentoo.classpath}" />
</classpath>
<batchtest todir="../../../reports/ministreaming/junit/">
<fileset dir="./test/junit">
diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
index 37ab0403a..c22f0e986 100644
--- a/apps/routerconsole/java/build.xml
+++ b/apps/routerconsole/java/build.xml
@@ -88,6 +88,7 @@
<!-- following jars only present for debian builds -->
<pathelement location="../../jetty/jettylib/tomcat-api.jar" />
<pathelement location="../../../core/java/build/json-simple.jar" />
+ <pathelement path="${gentoo.classpath}" />
</classpath>
</javac>
</target>
@@ -499,6 +500,7 @@
<pathelement location="build/obj/" />
<pathelement location="../../../router/java/build/router.jar" />
<pathelement location="../../../core/java/build/i2p.jar" />
+ <pathelement path="${gentoo.classpath}" />
</classpath>
<arg value="-d" />
<arg value="../jsp/WEB-INF/classes" />
@@ -539,6 +541,7 @@
<pathelement location="build/obj/" />
<pathelement location="../../../router/java/build/router.jar" />
<pathelement location="../../../core/java/build/i2p.jar" />
+ <pathelement path="${gentoo.classpath}" />
</classpath>
</javac>
diff --git a/apps/sam/java/build.xml b/apps/sam/java/build.xml
index 89233a415..24c84ab08 100644
--- a/apps/sam/java/build.xml
+++ b/apps/sam/java/build.xml
@@ -18,6 +18,7 @@
<pathelement location="../../../core/java/build/obj" />
<pathelement location="../../../core/java/build/gnu-getopt.jar" />
<pathelement location="../../ministreaming/java/build/obj" />
+ <pathelement path="${gentoo.classpath}" />
</classpath>
</depend>
</target>
@@ -38,7 +38,7 @@
includeAntRuntime="false"
encoding="UTF-8"
destdir="./build/obj"
- classpath="../../../core/java/build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../ministreaming/java/build/mstreaming.jar" >
+ classpath="../../../core/java/build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../ministreaming/java/build/mstreaming.jar:${gentoo.classpath}" >
<compilerarg line="${javac.compilerargs}" />
</javac>
</target>
diff --git a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml
index ecfa0ebfd..690b456de 100644
--- a/apps/streaming/java/build.xml
+++ b/apps/streaming/java/build.xml
@@ -76,6 +76,7 @@
<pathelement location="${mockito.home}/byte-buddy.jar" />
<pathelement location="${mockito.home}/objenesis.jar" />
<pathelement location="${mockito.home}/mockito-core.jar" />
+ <pathelement path="${gentoo.classpath}" />
</classpath>
<compilerarg line="${javac.compilerargs}" />
</javac>
@@ -143,6 +144,7 @@
<pathelement location="../../build/jbigi.jar" />
<pathelement location="${with.clover}" />
<pathelement location="${with.cobertura}" />
+ <pathelement path="${gentoo.classpath}" />
</classpath>
<batchtest todir="../../../reports/streaming/junit/">
<fileset dir="./test/junit">
diff --git a/apps/susidns/src/build.xml b/apps/susidns/src/build.xml
index b89a51b20..af68f5cda 100644
--- a/apps/susidns/src/build.xml
+++ b/apps/susidns/src/build.xml
@@ -35,6 +35,7 @@
<pathelement location="${ant.home}/lib/ant.jar" />
<pathelement location="../../../core/java/build/i2p.jar" />
<pathelement location="../../addressbook/dist/addressbook.jar" />
+ <pathelement path="${gentoo.classpath}" />
</path>
<property name="javac.compilerargs" value="" />
diff --git a/apps/susimail/build.xml b/apps/susimail/build.xml
index e88fb3f27..4ab1a8736 100644
--- a/apps/susimail/build.xml
+++ b/apps/susimail/build.xml
@@ -53,6 +53,7 @@
<!-- tomcat-api.jar only present for debian builds -->
<pathelement location="../jetty/jettylib/tomcat-api.jar" />
<pathelement location="../jetty/jettylib/jetty-i2p.jar" />
+ <pathelement path="${gentoo.classpath}" />
</classpath>
</javac>
</target>
diff --git a/core/java/build.xml b/core/java/build.xml
index 8b36ce5f0..53e4b9453 100644
--- a/core/java/build.xml
+++ b/core/java/build.xml
@@ -72,7 +72,7 @@
debuglevel="lines,vars,source"
includeAntRuntime="false"
encoding="UTF-8"
- destdir="./build/obj" classpath="${javac.classpath.mod}" >
+ destdir="./build/obj" classpath="${javac.classpath.mod}:${gentoo.classpath}" >
<compilerarg line="${javac.compilerargs}" />
<include name="**/*.java" />
<exclude name="${source.exclude1}" />
@@ -284,6 +284,7 @@
<pathelement location="${scalactic.jar}" />
<pathelement location="${scalatest.jar}" />
<pathelement location="./build/obj" />
+ <pathelement path="${gentoo.classpath}" />
</classpath>
</scalac>
</target>
@@ -319,6 +320,7 @@
<pathelement location="${mockito.home}/objenesis.jar" />
<pathelement location="${mockito.home}/mockito-core.jar" />
<pathelement location="${junit.home}/junit4.jar" />
+ <pathelement path="${gentoo.classpath}" />
</classpath>
<compilerarg line="${javac.compilerargs}" />
</javac>
@@ -485,6 +487,7 @@
<pathelement location="../../build/jbigi.jar" />
<pathelement location="${with.clover}" />
<pathelement location="${with.cobertura}" />
+ <pathelement path="${gentoo.classpath}" />
</classpath>
<batchtest todir="../../reports/core/junit/">
<fileset dir="./test/junit/">
diff --git a/installer/tools/java/build.xml b/installer/tools/java/build.xml
index 51c45cebf..81b0f6f26 100644
--- a/installer/tools/java/build.xml
+++ b/installer/tools/java/build.xml
@@ -29,7 +29,7 @@
release="${javac.release}"
includeAntRuntime="false"
encoding="UTF-8"
- destdir="./build/obj" classpath="${javac.classpath}:../../../build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../../build/router.jar" >
+ destdir="./build/obj" classpath="${javac.classpath}:../../../build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../../build/router.jar:${gentoo.classpath}" >
<compilerarg line="${javac.compilerargs}" />
</javac>
</target>
diff --git a/router/java/build.xml b/router/java/build.xml
index 4b0cedf2b..68f857214 100644
--- a/router/java/build.xml
+++ b/router/java/build.xml
@@ -48,7 +48,7 @@
debuglevel="lines,vars,source"
includeAntRuntime="false"
encoding="UTF-8"
- destdir="./build/obj" classpath="../../core/java/build/obj:../../core/java/build/i2p.jar:../../core/java/build/gnu-getopt.jar:../../core/java/build/httpclient.jar:../../core/java/build/httpcore.jar" >
+ destdir="./build/obj" classpath="../../core/java/build/obj:../../core/java/build/i2p.jar:../../core/java/build/gnu-getopt.jar:../../core/java/build/httpclient.jar:../../core/java/build/httpcore.jar:${gentoo.classpath}" >
<compilerarg line="${javac.compilerargs}" />
</javac>
</target>
@@ -285,6 +285,7 @@
<pathelement location="${hamcrest.home}/hamcrest-all.jar" />
<pathelement location="${junit.home}/junit4.jar" />
<pathelement location="../../core/java/build/i2ptest.jar" />
+ <pathelement path="${gentoo.classpath}" />
</classpath>
<compilerarg line="${javac.compilerargs}" />
</javac>
@@ -431,6 +432,7 @@
<pathelement location="../../build/jbigi.jar" />
<pathelement location="${with.clover}" />
<pathelement location="${with.cobertura}" />
+ <pathelement path="${gentoo.classpath}" />
</classpath>
<batchtest todir="../../reports/router/junit/">
<fileset dir="./test/junit">