Changeset 11e8611 for build.xml


Ignore:
Timestamp:
Nov 5, 2016 6:50:22 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
e8de1daf
Parents:
f42d76b
Message:

Build: Add support for using libtomcat8-java package, untested

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    rf42d76b r11e8611  
    12511251    </target>
    12521252
    1253     <!-- todo handle alt package too -->
    1254     <target name="copytomcat-unlesspkg" unless="${with-libtomcat7-java}" >
     1253    <target name="settomcatprop" >
     1254        <condition property="with-libtomcat-java" >
     1255            <or>
     1256                <istrue value="${with-libtomcat6-java}" />
     1257                <istrue value="${with-libtomcat7-java}" />
     1258                <istrue value="${with-libtomcat8-java}" />
     1259            </or>
     1260        </condition>
     1261    </target>
     1262
     1263    <target name="copytomcat-unlesspkg" depends="settomcatprop" unless="${with-libtomcat-java}" >
    12551264        <copy todir="pkg-temp/lib" >
    12561265            <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar" />
     
    12821291    </target>
    12831292
    1284     <target name="preplicenses-unlesspkg" unless="${with-libtomcat7-java}" >
     1293    <target name="preplicenses-unlesspkg" depends="settomcatprop" unless="${with-libtomcat-java}" >
    12851294        <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
    12861295    </target>
Note: See TracChangeset for help on using the changeset viewer.