Changeset 11e8611 for debian


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

Location:
debian
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • 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.