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

Build: Fix Debian (ticket #2517)

Browse Source
This commit is contained in:
zzz
2019-06-02 10:17:59 +00:00
parent b5de81582f
commit eff2bdbf87
3 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
apps/jetty/build.xml
View File

@ -364,7 +364,7 @@
srcdir="./java/src" srcdir="./java/src"
destdir="./build/obj" > destdir="./build/obj" >
<classpath> <classpath>
<pathelement location="../../../core/java/build/i2p.jar" /> <pathelement location="../../core/java/build/i2p.jar" />
<pathelement location="./jettylib/org.mortbay.jetty.jar" /> <pathelement location="./jettylib/org.mortbay.jetty.jar" />
<pathelement location="./jettylib/jasper-runtime.jar" /> <pathelement location="./jettylib/jasper-runtime.jar" />
<pathelement location="./jettylib/javax.servlet.jar" /> <pathelement location="./jettylib/javax.servlet.jar" />
@ -387,8 +387,23 @@
srcdir="./java/src" srcdir="./java/src"
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
destdir="./build/obj" destdir="./build/obj"
includeAntRuntime="false" includeAntRuntime="false" >
classpath="../../core/java/build/i2p.jar:./jettylib/javax.servlet.jar:./jettylib/org.mortbay.jetty.jar:./jettylib/jetty-http.jar:./jettylib/jetty-io.jar:./jettylib/jetty-security.jar:./jettylib/jetty-servlet.jar:./jettylib/jetty-util.jar:./jettylib/jetty-xml.jar:./jettylib/jetty-deploy.jar:./jettylib/jasper-runtime.jar:./jettylib/jetty-webapp.jar" > <classpath>
<pathelement location="../../core/java/build/i2p.jar" />
<pathelement location="./jettylib/jasper-runtime.jar" />
<pathelement location="./jettylib/javax.servlet.jar" />
<pathelement location="./jettylib/jetty-deploy.jar" />
<pathelement location="./jettylib/jetty-http.jar" />
<pathelement location="./jettylib/jetty-io.jar" />
<pathelement location="./jettylib/jetty-security.jar" />
<pathelement location="./jettylib/jetty-servlet.jar" />
<pathelement location="./jettylib/jetty-util.jar" />
<pathelement location="./jettylib/jetty-webapp.jar" />
<pathelement location="./jettylib/jetty-xml.jar" />
<pathelement location="./jettylib/org.mortbay.jetty.jar" />
<!-- following jar only present for debian builds -->
<pathelement location="./jettylib/tomcat-api.jar" />
</classpath>
<compilerarg line="${javac.compilerargs}" /> <compilerarg line="${javac.compilerargs}" />
</javac> </javac>
</target> </target>
@ -566,6 +581,7 @@
<pathelement location="../../core/java/build/libintl.jar" /> <pathelement location="../../core/java/build/libintl.jar" />
<pathelement location="../../core/java/build/gnu-getopt.jar" /> <pathelement location="../../core/java/build/gnu-getopt.jar" />
<pathelement location="../../core/java/build/json-simple.jar" /> <pathelement location="../../core/java/build/json-simple.jar" />
<pathelement location="./jettylib/tomcat-api.jar" />
</classpath> </classpath>
<!-- These variables are stored in build.properties. <!-- These variables are stored in build.properties.
End-users can override by creating the file override.properties --> End-users can override by creating the file override.properties -->

14
history.txt
View File

@ -1,3 +1,17 @@
2019-06-02 zzz
* Build: Fix Debian (ticket #2517)
2019-06-01 zzz
* NetDB: Don't wait for all RIs to be read in on Android
* Tunnels: Ensure GW Pumper threads stop on Android
2019-05-31 zzz
* Blinding: Bug fixes
* Transport: UPnP fixes for Android (ticket #2499)
2019-05-30 zzz
* Console: Support deleting blinded entries on /configkeyring
2019-05-29 zzz 2019-05-29 zzz
* I2CP: Fix bugs with lookup password * I2CP: Fix bugs with lookup password
* Util: Store save time in config files * Util: Store save time in config files

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 7; public final static long BUILD = 8;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "";