Changeset b72085bc for build.xml


Ignore:
Timestamp:
Mar 3, 2017 3:48:10 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
15915afe
Parents:
d3abbe8
Message:

Debian builds:

  • Remove with-libtomcat6-java and with-libtomcat7-java
  • Replace with-libjetty8-java with-libjetty9-java
  • Add libtomcat8-java dependency in debian builds
  • Change libservlet-3.0-java implicit dependency to libservlet-3.1-java
  • Initial mods for trusty build files, as it does not have jetty 9
  • Initial xenial build files
  • Add link to jetty9-apache-jsp.jar
  • Add necessary util jars to jsp classpath

Non-Debian builds:

  • Move tomcat runtime from javax.servlet.jar to jasper-runtime.jar, to be consistent with Jetty 8
  • Switch from jetty (glassfish) to apache (tomcat) jsp implementation, to be consistent with Debian builds
  • Drop checked-in Tomcat 6 and Jetty 8 jars

Code:

  • Force Jasper initialization in RouterConsoleRunner? since we don't use the Jetty annotation scanner
File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    rd3abbe8 rb72085bc  
    7272            <echo message="sudo apt-get install debhelper ant debconf default-jdk gettext libgmp-dev po-debconf fakeroot \" />
    7373            <echo message="  build-essential quilt libcommons-logging-java dh-apparmor dh-systemd libservice-wrapper-java \"  />
    74             <echo message="  devscripts libjetty8-java glassfish-javaee"  />
     74            <echo message="  devscripts libjetty9-java glassfish-javaee"  />
    7575            <echo message=" " />
    7676            <echo message="The following command will install the additional runtime dependencies:" />
     
    12431243    </target>
    12441244
    1245     <target name="copyjetty-unlesspkg" unless="${with-libjetty8-java}" >
     1245    <target name="copyjetty-unlesspkg" unless="${with-libjetty9-java}" >
    12461246        <copy todir="pkg-temp/lib" >
    12471247            <fileset dir="build" includes="javax.servlet.jar jetty*.jar org.mortbay.*.jar" excludes="jetty-i2p.jar" />
     
    12901290
    12911291    <target name="preplicenses-unlesspkg" depends="settomcatprop" unless="${with-libtomcat-java}" >
     1292<!--  replacement?
    12921293        <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
     1294-->
    12931295    </target>
    12941296
     
    22212223            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    22222224            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
    2223             <!-- libjetty8-java -->
    2224             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.21.v20160908" />
     2225            <!-- libjetty9-java -->
     2226            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.21.v20170120" />
    22252227            <!-- libjstl1.1-java or glassfish-javaee -->
    22262228          <!--
     
    22292231            <!-- libjakarta-taglibs-standard-java or glassfish-javaee -->
    22302232            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
    2231             <!-- libtomcat6-java or libtomcat7-java -->
    2232           <!--
    2233             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
    2234             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
    2235            -->
    22362233            <!-- anything added above, add in debian-release-tarball also -->
    22372234        </delete>
     
    22492246           -->
    22502247                <exclude name="apps/susidns/src/lib/standard.jar" />
    2251           <!--
    2252                 <exclude name="apps/jetty/apache-tomcat/**"/>
    2253                 <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
    2254            -->
    22552248                <!-- anything added above, add in debian-release-tarball also -->
    22562249            </tarfileset>
     
    23032296            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    23042297            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
    2305             <!-- libjetty8-java -->
     2298            <!-- libjetty9-java -->
    23062299          <!--
    2307             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.21.v20160908" />
     2300            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.21.v20170120" />
    23082301           -->
    23092302            <!-- libjstl1.1-java or glassfish-javaee -->
     
    23132306            <!-- libjakarta-taglibs-standard-java or glassfish-javaee -->
    23142307            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
    2315             <!-- libtomcat6-java or libtomcat7-java -->
    2316           <!--
    2317             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
    2318             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
    2319            -->
    23202308            <!-- anything added above, add in debian-release-tarball also -->
    23212309        </delete>
     
    23352323           -->
    23362324                <exclude name="apps/susidns/src/lib/standard.jar" />
    2337           <!--
    2338                 <exclude name="apps/jetty/apache-tomcat/**"/>
    2339                 <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
    2340            -->
    23412325                <!-- anything added above, add in debian-release-tarball also -->
    23422326            </tarfileset>
     
    23822366            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    23832367            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
    2384             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.21.v20160908" />
     2368            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.21.v20170120" />
    23852369          <!--
    23862370            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
    23872371           -->
    23882372            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
    2389           <!--
    2390             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
    2391             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
    2392            -->
    23932373            <!-- anything added above, add in debian-tarball also -->
    23942374        </delete>
     
    24062386           -->
    24072387                <exclude name="apps/susidns/src/lib/standard.jar" />
    2408           <!--
    2409                 <exclude name="apps/jetty/apache-tomcat/**"/>
    2410                 <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
    2411            -->
    24122388                <!-- anything added above, add in debian-tarball also -->
    24132389            </tarfileset>
Note: See TracChangeset for help on using the changeset viewer.