Changeset 5c8eab9 for debian/rules


Ignore:
Timestamp:
Apr 4, 2016 6:07:43 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
094cf14
Parents:
ae5828f
Message:

Debian: Add dependency on glassfish-javaee for jstl.jar and standard.jar version 1.2
don't echo comments in debian/rules

File:
1 edited

Legend:

Unmodified
Added
Removed
  • debian/rules

    rae5828f r5c8eab9  
    7373        @echo "Already found deb in version, not doing anything"
    7474endif
    75         # build options
     75        @# build options
    7676        @/bin/echo -e "javac.version=1.7" > $(CURDIR)/override.properties
    7777        @/bin/echo -e "javac.compilerargs=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
     
    7979        @/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties
    8080
    81         # debian and ubuntu: everywhere
     81        @# debian and ubuntu: everywhere
    8282        @/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
    8383
    84         # ubuntu: only in wily
    85         # debian: in wheezy jessie stretch sid
     84        @# ubuntu: not in precise
     85        @# debian: in wheezy jessie stretch sid
    8686        @/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties
    8787        mkdir -p $(CURDIR)/apps/jetty/jettylib
     
    100100        ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
    101101        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
     102        @# following two are from libservlet3.0-java which is a dependency of libjetty8-java
    103103        ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
    104104        ln -sf /usr/share/java/jsp-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    105105
    106         # ubuntu: only in wily
    107         # debian: in wheezy jessie stretch sid
    108         #mkdir -p $(CURDIR)/apps/jetty/jettylib
    109         #@/bin/echo -e "with-libservlet2.5-java=true" >> $(CURDIR)/override.properties
    110         #ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     106        @# ubuntu: only in wily
     107        @# debian: in wheezy jessie stretch sid
     108        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
     109        @#@/bin/echo -e "with-libservlet2.5-java=true" >> $(CURDIR)/override.properties
     110        @#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    111111
    112         # ubuntu: only in precise trusty vivid
    113         # debian: only in wheezy
    114         #@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
    115         #mkdir -p $(CURDIR)/apps/jetty/jettylib
    116         #ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
    117         #ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
    118         #ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    119         #ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     112        @# ubuntu: only in precise trusty vivid
     113        @# debian: only in wheezy
     114        @#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
     115        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
     116        @#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
     117        @#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     118        @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
     119        @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    120120
    121         # debian and ubuntu: everywhere
    122         #@/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
    123         #mkdir -p $(CURDIR)/apps/jetty/jettylib
    124         #ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
    125         #ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
    126         #ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    127         #ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     121        @# debian and ubuntu: everywhere
     122        @#@/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
     123        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
     124        @#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
     125        @#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     126        @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
     127        @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    128128
    129         # ubuntu: only in wily
    130         # debian: in wheezy jessie stretch sid
    131         #@/bin/echo -e "with-libjakarta-taglibs-standard-java=true" >> $(CURDIR)/override.properties
    132         #ln -sf /usr/share/java/standard.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/standard.jar
    133 
    134         # debian and ubuntu: everywhere
    135         #@/bin/echo -e "with-libjstl1.1-java=true" >> $(CURDIR)/override.properties
    136         #ln -sf /usr/share/java/jstl1.1.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/jstl.jar
     129        @# debian and ubuntu: everywhere
     130        @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
     131        ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/jstl.jar
     132        ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/standard.jar
    137133
    138134        TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
Note: See TracChangeset for help on using the changeset viewer.