Changeset ec6c244


Ignore:
Timestamp:
Mar 3, 2017 7:44:39 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
f38ee48
Parents:
15915afe
Message:

Debian build fixes

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    r15915afe rec6c244  
    239239    <target name="copyTomcatLib" depends="mkJettylibdir, copyTomcatLib1, copyTomcatLib2, copyTomcatLib3" />
    240240
    241     <target name="copyTomcatLib1" unless="${with-libjetty9-java}" >
     241    <target name="copyTomcatLib1" >
    242242        <condition property="with-libtomcat-java" >
    243243            <or>
  • apps/routerconsole/java/build.xml

    r15915afe rec6c244  
    7777                <pathelement location="../../../installer/lib/wrapper/all/wrapper.jar" />
    7878                <pathelement location="../../jrobin/java/build/jrobin.jar" />
     79
     80                <!-- following jars only present for debian builds -->
     81                <pathelement location="../../jetty/jettylib/tomcat-api.jar" />
    7982            </classpath>
    8083        </javac>
  • build.xml

    r15915afe rec6c244  
    7171            <echo message=" " />
    7272            <echo message="sudo apt-get install debhelper ant debconf default-jdk gettext libgmp-dev po-debconf fakeroot \" />
    73             <echo message="  build-essential quilt libcommons-logging-java dh-apparmor dh-systemd libservice-wrapper-java \"  />
    74             <echo message="  devscripts libjetty9-java glassfish-javaee"  />
     73            <echo message="  build-essential quilt dh-apparmor dh-systemd libservice-wrapper-java \"  />
     74            <echo message="  devscripts libjetty9-java libtomcat8-java glassfish-javaee libgetopt-java"  />
    7575            <echo message=" " />
    7676            <echo message="The following command will install the additional runtime dependencies:" />
     
    22072207            <arg value="../i2p-${Extended.Version}" />
    22082208        </exec>
    2209         <delete includeemptydirs="true" quiet="false">
     2209        <delete includeemptydirs="true" quiet="false" failonerror="false">
    22102210            <fileset dir="../i2p-${Extended.Version}/debian-alt/" />
    22112211            <fileset dir="../i2p-${Extended.Version}/installer/lib/" />
     
    22802280            <arg value="../i2p-${Extended.Version}" />
    22812281        </exec>
    2282         <delete includeemptydirs="true" quiet="false">
     2282        <delete includeemptydirs="true" quiet="false" failonerror="false">
    22832283            <fileset dir="../i2p-${Extended.Version}/debian-alt/" />
    22842284            <fileset dir="../i2p-${Extended.Version}/installer/lib/" />
     
    23542354            <arg value="../i2p-${Extended.Version}" />
    23552355        </exec>
    2356         <delete includeemptydirs="true" quiet="false">
     2356        <delete includeemptydirs="true" quiet="false" failonerror="false">ilonerror="false">
    23572357            <fileset dir="../i2p-${Extended.Version}/debian-alt/" />
    23582358            <fileset dir="../i2p-${Extended.Version}/installer/lib/" />
  • debian-alt/xenial/rules

    r15915afe rec6c244  
    104104        @# following two are from libservlet3.1-java which is a dependency of libjetty9-java
    105105        ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
    106         @# this is roughly the same as tomcat8-jsp-api.jar, we use this one
     106        @# this is roughly the same as tomcat8-jsp-api.jar, we use this one
    107107        ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    108108
  • debian/i2p-router.install

    r15915afe rec6c244  
    5757
    5858# uncomment if not building with libtomcat8-java
    59 pkg-temp/lib/commons-el.jar usr/share/i2p/lib
     59#pkg-temp/lib/commons-el.jar usr/share/i2p/lib
    6060# legacy name, contains only tomcat-juli, not commons-logging
    61 pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
    62 pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
     61#pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
     62#pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
    6363
    6464
  • debian/rules

    r15915afe rec6c244  
    104104        @# following two are from libservlet3.1-java which is a dependency of libjetty9-java
    105105        ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
    106         @# this is roughly the same as tomcat8-jsp-api.jar, we use this one
     106        @# this is roughly the same as tomcat8-jsp-api.jar, we use this one
    107107        ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    108108
Note: See TracChangeset for help on using the changeset viewer.