Changeset a3a17a4f for build.xml


Ignore:
Timestamp:
Nov 25, 2017 6:59:04 PM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
752c17c
Parents:
7f6ba8cd
Message:

Debian: Replace glassfish-javaee with libtaglibs-standard-* (ticket #2093)
Only for stretch and later, zesty and later
Copy more files for previous stretch setup to xenial

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r7f6ba8cd ra3a17a4f  
    12751275    </target>
    12761276
    1277     <!-- todo handle alt package too -->
    12781277    <!--
    1279        glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
    1280     <target name="copyjstl-unlesspkg" unless="${with-glassfish-javaee}" >
     1278       jstl.jar
     1279       glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail,
     1280       and libjstl1.1-java isn't sufficient,
     1281       so we only skip it with libtaglibs-standard
    12811282    -->
    1282     <target name="copyjstl-unlesspkg" >
     1283    <target name="copyjstl-unlesspkg" unless="${with-libtaglibs-standard}" >
    12831284        <copy file="apps/susidns/src/lib/jstl.jar" todir="pkg-temp/lib/" />
    12841285    </target>
    12851286
    1286     <!-- todo handle alt package too -->
    1287     <target name="copystandard-unlesspkg" unless="${with-glassfish-javaee}" >
     1287    <!-- standard.jar -->
     1288    <target name="copystandard-unlesspkg" depends="copystandard-unlesspkg1, copystandard-unlesspkg2" />
     1289    <target name="copystandard-unlesspkg1" >
     1290        <condition property="with-any-standard-pkg" >
     1291            <or>
     1292                <istrue value="${with-libtaglibs-standard}" />
     1293                <istrue value="${with-glassfish-javaee}" />
     1294                <istrue value="${libjakarta-taglibs-standard-java}" />
     1295            </or>
     1296
     1297        </condition>
     1298    </target>
     1299    <target name="copystandard-unlesspkg2" unless="${with-any-standard-pkg}" >
    12881300        <copy file="apps/susidns/src/lib/standard.jar" todir="pkg-temp/lib/" />
    12891301    </target>
     
    22702282            <!-- libtomcat8-java -->
    22712283            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
    2272             <!-- libjstl1.1-java or glassfish-javaee -->
    2273           <!--
     2284            <!-- libjstl1.1-java or glassfish-javaee or libtaglibs-standard -->
    22742285            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
    2275            -->
    2276             <!-- libjakarta-taglibs-standard-java or glassfish-javaee -->
     2286            <!-- libjakarta-taglibs-standard-java or glassfish-javaee or libtaglibs-standard -->
    22772287            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
    22782288            <!-- anything added above, add in debian-release-tarball also -->
     
    22882298                <exclude name="apps/jetty/jetty-distribution-*/**"/>
    22892299                <exclude name="apps/jetty/apache-tomcat-*/**"/>
    2290           <!--
    22912300                <exclude name="apps/susidns/src/lib/jstl.jar" />
    2292            -->
    22932301                <exclude name="apps/susidns/src/lib/standard.jar" />
    22942302                <!-- anything added above, add in debian-release-tarball also -->
     
    24162424            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
    24172425            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
    2418           <!--
    24192426            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
    2420            -->
    24212427            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
    24222428            <!-- anything added above, add in debian-tarball also -->
     
    24322438                <exclude name="apps/jetty/jetty-distribution-*/**"/>
    24332439                <exclude name="apps/jetty/apache-tomcat-*/**"/>
    2434           <!--
    24352440                <exclude name="apps/susidns/src/lib/jstl.jar" />
    2436            -->
    24372441                <exclude name="apps/susidns/src/lib/standard.jar" />
    24382442                <!-- anything added above, add in debian-tarball also -->
Note: See TracChangeset for help on using the changeset viewer.