Changeset 3527f25 for apps/jetty


Ignore:
Timestamp:
Jan 24, 2019 2:15:04 PM (16 months ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
efb1b7c
Parents:
6cdc515
Message:

Debian: Add build option for libtomcat9 (ticket #2364)

Location:
apps/jetty
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    r6cdc515 r3527f25  
    140140           with-libtomcat8-java: Jessie (without backports), Wheezy
    141141           with-libtomcat8-java AND with-libjetty9-java: Xenial, Jessie (with backports), Stretch
     142           with-libtomcat9-java: Buster
     143           with-libtomcat9-java AND with-libjetty9-java: Buster
    142144           with-libjetty9-java (only): not supported
    143145     -->
     
    196198    </target>
    197199
    198     <!-- Make javax.servlet.jar -->
    199     <!-- If with-libtomcat8-java but not with-libjetty9-java, we don't do this -->
    200     <target name="copyJettylib2" depends="extractJettylib" unless="${with-libtomcat8-java}" >
     200    <!--
     201         Make javax.servlet.jar.
     202         If with-libtomcat8-java or with-libtomcat9-java but not with-libjetty9-java, we don't do this.
     203         copyTomcatLib1 dependency to set the with-libtomcat-java variable.
     204     -->
     205    <target name="copyJettylib2" depends="extractJettylib, copyTomcatLib1" unless="${with-libtomcat-java}" >
    201206        <jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" filesetmanifest="mergewithoutmain" >
    202207            <!-- all versions - Servlet API -->
     
    257262                <istrue value="${with-libtomcat7-java}" />
    258263                <istrue value="${with-libtomcat8-java}" />
     264                <istrue value="${with-libtomcat9-java}" />
    259265            </or>
    260266        </condition>
  • apps/jetty/java/src/net/i2p/servlet/util/JspC.java

    r6cdc515 r3527f25  
    4444    private static final boolean REPRODUCIBLE = Boolean.valueOf(System.getProperty("build.reproducible"));
    4545    // if true, we must get the Tomcat version out of the jasper jar's manifest
    46     private static final boolean SYSTEM_TOMCAT = Boolean.valueOf(System.getProperty("with-libtomcat8-java"));
     46    private static final boolean SYSTEM_TOMCAT = Boolean.valueOf(System.getProperty("with-libtomcat8-java")) ||
     47                                                 Boolean.valueOf(System.getProperty("with-libtomcat9-java"));
    4748    // path to the jasper jar
    4849    private static final String JASPER_JAR = System.getProperty("jasper.jar");
Note: See TracChangeset for help on using the changeset viewer.