Changeset 11e8611


Ignore:
Timestamp:
Nov 5, 2016 6:50:22 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
e8de1daf
Parents:
f42d76b
Message:

Build: Add support for using libtomcat8-java package, untested

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    rf42d76b r11e8611  
    226226                <istrue value="${with-libtomcat6-java}" />
    227227                <istrue value="${with-libtomcat7-java}" />
     228                <istrue value="${with-libtomcat8-java}" />
    228229            </or>
    229230        </condition>
  • build.properties

    rf42d76b r11e8611  
    134134# Don't include tomcat files, we will use libtomcat7-java package
    135135#with-libtomcat7-java=true
     136# Don't include tomcat files, we will use libtomcat8-java package
     137#with-libtomcat8-java=true
    136138# Don't include jstl.jar and standard.jar, we will use glassfish-javaee package
    137139#with-glassfish-javaee=true
  • build.xml

    rf42d76b r11e8611  
    12511251    </target>
    12521252
    1253     <!-- todo handle alt package too -->
    1254     <target name="copytomcat-unlesspkg" unless="${with-libtomcat7-java}" >
     1253    <target name="settomcatprop" >
     1254        <condition property="with-libtomcat-java" >
     1255            <or>
     1256                <istrue value="${with-libtomcat6-java}" />
     1257                <istrue value="${with-libtomcat7-java}" />
     1258                <istrue value="${with-libtomcat8-java}" />
     1259            </or>
     1260        </condition>
     1261    </target>
     1262
     1263    <target name="copytomcat-unlesspkg" depends="settomcatprop" unless="${with-libtomcat-java}" >
    12551264        <copy todir="pkg-temp/lib" >
    12561265            <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar" />
     
    12821291    </target>
    12831292
    1284     <target name="preplicenses-unlesspkg" unless="${with-libtomcat7-java}" >
     1293    <target name="preplicenses-unlesspkg" depends="settomcatprop" unless="${with-libtomcat-java}" >
    12851294        <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
    12861295    </target>
  • debian/i2p-router.links

    rf42d76b r11e8611  
    6767
    6868
     69# comment out if not building with libtomcat8-java
     70# ubuntu: only in xenial+
     71# debian: wheezy-backports, jessie+
     72# legacy name, contains only tomcat-juli, not commons-logging
     73#usr/share/java/tomcat8-juli.jar usr/share/i2p/lib/commons-logging.jar
     74#usr/share/java/tomcat8-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
     75# combined into jasper-runtime.jar in non-package builds
     76#usr/share/java/tomcat8-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
     77# tomcat 7 only
     78#usr/share/java/tomcat8-api.jar usr/share/i2p/lib/tomcat-api.jar
     79#usr/share/java/tomcat8-util.jar usr/share/i2p/lib/tomcat-util.jar
     80# combined into commons-el.jar in non-package builds
     81#usr/share/java/tomcat8-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
     82# legacy name in lib/
     83#usr/share/java/tomcat8-el-api.jar usr/share/i2p/lib/commons-el.jar
     84
     85
    6986# comment out if not building with glassfish-javaee
    7087# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
  • debian/rules

    rf42d76b r11e8611  
    129129        @#ln -sf /usr/share/java/el-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    130130
     131        @# debian and ubuntu: wheezy-backports, jessie+, xenial+
     132        @#/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
     133        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
     134        @#ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     135        @#ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
     136        @#ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
     137        @#ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
     138        @#ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     139        @#ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
     140        @#ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     141
    131142        @# debian and ubuntu: everywhere
    132143        @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
Note: See TracChangeset for help on using the changeset viewer.