lbt/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Console: Incorporate bionic build patch from previous checkin

Browse Source 
Remove patch from debian files
This commit is contained in:
zzz
2023-01-11 10:15:12 -05:00
parent 87fbec3e39
commit a6e8d53b37
3 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/routerconsole/java/build.xml
View File

@ -22,6 +22,7 @@
<!-- Depend on classes instead of jars where available --> <!-- Depend on classes instead of jars where available -->
<classpath> <classpath>
<pathelement location="../../../core/java/build/obj" /> <pathelement location="../../../core/java/build/obj" />
<pathelement location="../../../core/java/build/gnu-getopt.jar" />
<pathelement location="../../../router/java/build/obj" /> <pathelement location="../../../router/java/build/obj" />
<pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" /> <pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" />
<pathelement location="../../jetty/jettylib/jetty-util.jar" /> <pathelement location="../../jetty/jettylib/jetty-util.jar" />
@ -65,6 +66,8 @@
<compilerarg line="${javac.compilerargs}" /> <compilerarg line="${javac.compilerargs}" />
<classpath> <classpath>
<pathelement location="../../../core/java/build/i2p.jar" /> <pathelement location="../../../core/java/build/i2p.jar" />
<!-- gnu-getopt.jar only present for debian builds -->
<pathelement location="../../../core/java/build/gnu-getopt.jar" />
<pathelement location="../../../router/java/build/router.jar" /> <pathelement location="../../../router/java/build/router.jar" />
<pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" /> <pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" />
<pathelement location="../../jetty/jettylib/jetty-http.jar" /> <pathelement location="../../jetty/jettylib/jetty-http.jar" />

19
debian-alt/bionic/patches/0004-getopt-build.patch
View File

@ -1,19 +0,0 @@
--- a/apps/routerconsole/java/build.xml
+++ b/apps/routerconsole/java/build.xml
@@ -22,6 +22,7 @@
<!-- Depend on classes instead of jars where available -->
<classpath>
<pathelement location="../../../core/java/build/obj" />
+ <pathelement location="../../../core/java/build/gnu-getopt.jar" />
<pathelement location="../../../router/java/build/obj" />
<pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" />
<pathelement location="../../jetty/jettylib/jetty-util.jar" />
@@ -65,6 +66,8 @@
<compilerarg line="${javac.compilerargs}" />
<classpath>
<pathelement location="../../../core/java/build/i2p.jar" />
+ <!-- gnu-getopt.jar only present for debian builds -->
+ <pathelement location="../../../core/java/build/gnu-getopt.jar" />
<pathelement location="../../../router/java/build/router.jar" />
<pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" />
<pathelement location="../../jetty/jettylib/jetty-http.jar" />

1
debian-alt/bionic/patches/series
View File

@ -1,3 +1,2 @@
0001-path-substitution.patch 0001-path-substitution.patch
0002-jetty-compatibility.patch 0002-jetty-compatibility.patch
0004-getopt-build.patch