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

Build: Fix build config with-libtomcat8-java but not with-libjetty9-java,

Browse Source 
by copying required jetty jar to jetty-apache-jsp.jar
This commit is contained in:
zzz
2018-10-07 14:29:47 +00:00
parent 0cd67acd19
commit 477fa9ef3a
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/jetty/build.xml
View File

@@ -140,7 +140,7 @@
with-libtomcat8-java AND with-libjetty9-java: Xenial, Jessie (with backports), Stretch
with-libjetty9-java (only): not supported
-->
<target name="copyJettylib" depends="mkJettylibdir, copyJettylib1, copyTomcatLib1, copyJettylib2, copyTomcatLib" />
<target name="copyJettylib" depends="mkJettylibdir, copyJettylib1, copyTomcatLib1, copyJettylib2, copyJettylib3, copyTomcatLib" />
<!-- Jetty files only -->
<target name="copyJettylib1" depends="extractJettylib, buildPatches" unless="${with-libjetty9-java}" >
@@ -225,6 +225,12 @@
-->
</target>
<!-- Copy jetty-apache-jsp.jar -->
<!-- ONLY if with-libtomcat8-java but NOT with-libjetty9-java (wheezy/jessie configuration) -->
<!-- If neither with-libtomcat8-java nor with-libjetty9-java, it's merged into jasper-runtime.jar in the copyTomcatLib2 target below -->
<target name="copyJettylib3" depends="extractJettylib, copyTomcatLib1" if="${with-libtomcat-without-libjetty}" >
<copy preservelastmodified="true" file="${jetty.base}/lib/apache-jsp/org.eclipse.jetty.apache-jsp-${jetty.ver}.jar" tofile="jettylib/jetty-apache-jsp.jar" />
</target>
<!-- Tomcat.
The glassfish jars bundled in Jetty 6 are way too old.
@@ -251,6 +257,14 @@
<istrue value="${with-libtomcat8-java}" />
</or>
</condition>
<condition property="with-libtomcat-without-libjetty" >
<and>
<istrue value="${with-libtomcat-java}" />
<not>
<istrue value="${with-libjetty9-java}" />
</not>
</and>
</condition>
</target>