Changeset f38ee48 for debian


Ignore:
Timestamp:
Mar 4, 2017 2:24:48 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
87cff00
Parents:
ec6c244
Message:

Move setting of InstanceManager? to WebAppConfiguration? to avoid race
Fix up LICENSES.txt
Build.xml cleanup
Debian:

  • Add support for with-libtomcat8-java but not with-libjetty9-java for wheezy/jessie
  • Fix wheezy/precise/trusty build files to use tomcat8 but not jetty9 packages
  • Remove build dependency on ant-optional, not required
  • Remove some remaining eclipse-ecj dependencies
  • Add short README files for wheezy and jessie
Location:
debian
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • debian/control

    rec6c244 rf38ee48  
    88Build-Depends: debhelper (>= 7.0.50~)
    99 ,ant (>= 1.8)
    10  ,ant-optional
    1110 ,debconf
    1211 ,openjdk-7-jdk
  • debian/rules

    rec6c244 rf38ee48  
    8484        @/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
    8585
    86         @# ubuntu: not in precise
    87         @# debian: in wheezy jessie stretch sid
     86        @# ubuntu: in xenial
     87        @# debian: in jessie-backports stretch sid
    8888        @/bin/echo -e "with-libjetty9-java=true" >> $(CURDIR)/override.properties
    8989        mkdir -p $(CURDIR)/apps/jetty/jettylib
     
    110110        /bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
    111111        mkdir -p $(CURDIR)/apps/jetty/jettylib
     112        ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
     113        ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
     114        ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    112115        ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
    113         ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
     116        ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
     117        ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    114118        ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
    115119        ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
    116         ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    117         ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    118         ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
    119         ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    120120
    121121        @# debian and ubuntu: everywhere
Note: See TracChangeset for help on using the changeset viewer.