Changeset d6b1f81 for debian


Ignore:
Timestamp:
Apr 3, 2016 1:04:23 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
d940aa5
Parents:
e2f048b
Message:

Debian: Fixes for with-libjetty8-java builds

File:
1 edited

Legend:

Unmodified
Added
Removed
  • debian/rules

    re2f048b rd6b1f81  
    8585        # debian: in wheezy jessie stretch sid
    8686        @/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties
     87        mkdir -p $(CURDIR)/apps/jetty/jettylib
    8788        ln -sf /usr/share/java/jetty8-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
    8889        ln -sf /usr/share/java/jetty8-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
     
    99100        ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
    100101        ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
     102        # following two are from libservlet3.0-java which is a dependency of libjetty8-java
     103        ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
     104        ln -sf /usr/share/java/jsp-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    101105
    102106        # ubuntu: only in wily
    103107        # debian: in wheezy jessie stretch sid
     108        #mkdir -p $(CURDIR)/apps/jetty/jettylib
    104109        #@/bin/echo -e "with-libservlet2.5-java=true" >> $(CURDIR)/override.properties
    105110        #ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    106         #ln -sf /usr/share/java/jsp-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    107         #ln -sf /usr/share/java/servlet-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
    108111
    109112        # ubuntu: only in precise trusty vivid
    110113        # debian: only in wheezy
    111114        #@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
     115        #mkdir -p $(CURDIR)/apps/jetty/jettylib
    112116        #ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
    113117        #ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     
    117121        # debian and ubuntu: everywhere
    118122        #@/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
     123        #mkdir -p $(CURDIR)/apps/jetty/jettylib
    119124        #ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
    120125        #ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
Note: See TracChangeset for help on using the changeset viewer.