Changeset 3527f25


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

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

Files:
2 added
10 edited

Legend:

Unmodified
Added
Removed
  • apps/i2ptunnel/java/build.xml

    r6cdc515 r3527f25  
    312312            <jvmarg value="-Dbuild.reproducible=${build.reproducible}" />
    313313            <jvmarg value="-Dwith-libtomcat8-java=${with-libtomcat8-java}" />
     314            <jvmarg value="-Dwith-libtomcat9-java=${with-libtomcat9-java}" />
    314315            <jvmarg value="-Djasper.jar=../../jetty/jettylib/jasper-runtime.jar" />
    315316            <classpath>
  • 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");
  • apps/routerconsole/java/build.xml

    r6cdc515 r3527f25  
    430430            <jvmarg value="-Dbuild.reproducible=${build.reproducible}" />
    431431            <jvmarg value="-Dwith-libtomcat8-java=${with-libtomcat8-java}" />
     432            <jvmarg value="-Dwith-libtomcat9-java=${with-libtomcat9-java}" />
    432433            <jvmarg value="-Djasper.jar=../../jetty/jettylib/jasper-runtime.jar" />
    433434            <classpath>
  • apps/susidns/src/build.xml

    r6cdc515 r3527f25  
    7676            <jvmarg value="-Dbuild.reproducible=${build.reproducible}" />
    7777            <jvmarg value="-Dwith-libtomcat8-java=${with-libtomcat8-java}" />
     78            <jvmarg value="-Dwith-libtomcat9-java=${with-libtomcat9-java}" />
    7879            <jvmarg value="-Djasper.jar=${lib}/jasper-runtime.jar" />
    7980            <arg value="-d" />
  • build.properties

    r6cdc515 r3527f25  
    151151# Don't include tomcat files, we will use libtomcat8-java package
    152152#with-libtomcat8-java=true
     153# Don't include tomcat files, we will use libtomcat9-java package
     154#with-libtomcat9-java=true
    153155# Don't include jstl.jar and standard.jar, we will use libtaglibs-standard-* packages
    154156#with-libtaglibs-standard=true
  • build.xml

    r6cdc515 r3527f25  
    13681368                <istrue value="${with-libtomcat7-java}" />
    13691369                <istrue value="${with-libtomcat8-java}" />
     1370                <istrue value="${with-libtomcat9-java}" />
    13701371            </or>
    13711372        </condition>
  • debian-alt/buster/control

    r6cdc515 r3527f25  
    1313 ,libjetty9-java (>= 9.2.22)
    1414 ,libtaglibs-standard-jstlel-java
    15  ,libtomcat8-java
     15 ,libtomcat9-java
    1616 ,dh-apparmor
    1717 ,bash-completion
     
    8383 libjetty9-java,
    8484 libtaglibs-standard-jstlel-java,
    85  libtomcat8-java,
     85 libtomcat9-java,
    8686 famfamfam-flag-png
    8787Replaces: i2p ( << 0.8.6-5)
  • debian-alt/buster/rules

    r6cdc515 r3527f25  
    114114
    115115        @# debian and ubuntu: wheezy-backports, jessie+, xenial+
    116         @/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
     116        @#/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
     117        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
     118        @#ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
     119        @#ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
     120        @#ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     121        @#ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     122        @#ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
     123        @#ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     124        @#ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
     125        @#ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
     126
     127        @# debian and ubuntu: buster, disco
     128        @/bin/echo -e "with-libtomcat9-java=true" >> $(CURDIR)/override.properties
    117129        mkdir -p $(CURDIR)/apps/jetty/jettylib
    118         ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
    119         ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    120         ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    121         ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
    122         ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
    123         ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    124         ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
    125         ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
     130        ln -sf /usr/share/java/tomcat9-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
     131        ln -sf /usr/share/java/tomcat9-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
     132        ln -sf /usr/share/java/tomcat9-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     133        ln -sf /usr/share/java/tomcat9-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     134        ln -sf /usr/share/java/tomcat9-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
     135        ln -sf /usr/share/java/tomcat9-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     136        ln -sf /usr/share/java/tomcat9-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
     137        ln -sf /usr/share/java/tomcat9-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
    126138
    127139        @# debian and ubuntu: stretch+, zesty+
  • debian-alt/disco/rules

    r6cdc515 r3527f25  
    114114
    115115        @# debian and ubuntu: wheezy-backports, jessie+, xenial+
    116         @/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
     116        @#/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
     117        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
     118        @#ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
     119        @#ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
     120        @#ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     121        @#ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     122        @#ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
     123        @#ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     124        @#ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
     125        @#ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
     126
     127        @# debian and ubuntu: buster, disco
     128        @/bin/echo -e "with-libtomcat9-java=true" >> $(CURDIR)/override.properties
    117129        mkdir -p $(CURDIR)/apps/jetty/jettylib
    118         ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
    119         ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    120         ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    121         ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
    122         ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
    123         ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    124         ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
    125         ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
     130        ln -sf /usr/share/java/tomcat9-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
     131        ln -sf /usr/share/java/tomcat9-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
     132        ln -sf /usr/share/java/tomcat9-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     133        ln -sf /usr/share/java/tomcat9-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     134        ln -sf /usr/share/java/tomcat9-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
     135        ln -sf /usr/share/java/tomcat9-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     136        ln -sf /usr/share/java/tomcat9-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
     137        ln -sf /usr/share/java/tomcat9-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
    126138
    127139        @# debian and ubuntu: stretch+, zesty+
Note: See TracChangeset for help on using the changeset viewer.