Changeset 9ac3157


Ignore:
Timestamp:
Jul 1, 2018 2:16:56 PM (2 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
67b7feb, 7d9207d
Parents:
a895bcc
Message:

Build: Move Jetty/Tomcat? version properties to top-level build.xml

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    ra895bcc r9ac3157  
    1414     -->
    1515
    16     <!-- Note: Please change all references in top-level build.xml if you update to a new Jetty! -->
    17     <!--       Also change javadoc URL in top-level build.properties.                            -->
     16    <!-- Note: Change version numbers in top-level build.xml if you update to a new Tomcat or Jetty! -->
     17
    1818    <!-- jetty.branch unused until we go to 9.3 -->
    1919    <property name="jetty.branch" value="stable-9" />
    20     <property name="jetty.ver" value="9.2.24.v20180105" />
    2120    <property name="jetty.base" value="jetty-distribution-${jetty.ver}" />
    2221    <property name="jetty.sha1" value="a8af3941385d43eece329b09ae4a261e0cb3579c" />
     
    2827    <property name="javac.version" value="1.7" />
    2928
    30     <!-- Note: Please change all references in top-level build.xml if you update to a new Tomcat! -->
    31     <property name="tomcat.ver" value="8.5.30" />
    3229    <!-- everything we need is in the deployer package, except for tomcat-api.jar in the full package,
    3330         so we just use the full package instead.
     
    7875
    7976    <target name="fetchJettylib" unless="jetty.zip.available" >
     77        <fail message="Error - jetty.ver property not set - you must run from top level build.xml" >
     78            <condition>
     79                <not>
     80                    <isset property="jetty.ver" />
     81                </not>
     82            </condition>
     83        </fail>
    8084        <echo message="It seems that you don't have '${jetty.filename}' deployed." />
    8185        <echo message="The build script can download this file for you automatically," />
  • build.xml

    ra895bcc r9ac3157  
    88    <property file="override.properties"/>
    99    <property file="build.properties"/>
     10    <!--  When changing, also change javadoc URL in build.properties, and checksum in apps/jetty/build.xml -->
     11    <property name="jetty.ver" value="9.2.24.v20180105" />
     12    <property name="tomcat.ver" value="8.5.30" />
    1013
    1114    <!-- You probably don't want to change anything from here down -->
     
    14071410
    14081411    <target name="preplicenses-unlesspkg" depends="settomcatprop" unless="${with-libtomcat-java}" >
    1409         <copy file="apps/jetty/apache-tomcat-8.5.30/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
     1412        <copy file="apps/jetty/apache-tomcat-${tomcat.ver}/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
    14101413    </target>
    14111414
     
    24122415            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
    24132416            <!-- libjetty9-java -->
    2414             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.24.v20180105" />
     2417            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-${jetty.ver}" />
    24152418            <!-- libtomcat8-java -->
    2416             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" />
     2419            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-${tomcat.ver}" />
    24172420            <!-- libjstl1.1-java or glassfish-javaee or libtaglibs-standard -->
    24182421            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
     
    24942497            <!-- libjetty9-java -->
    24952498          <!--
    2496             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.24.v20180105" />
    2497             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" />
     2499            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-${jetty.ver}" />
     2500            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-${tomcat.ver}" />
    24982501           -->
    24992502            <!-- libjstl1.1-java or glassfish-javaee -->
     
    25742577            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    25752578            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
    2576             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.24.v20180105" />
    2577             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" />
     2579            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-${jetty.ver}" />
     2580            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-${tomcat.ver}" />
    25782581          <!--
    25792582            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
     
    26472650            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    26482651            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
    2649             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.24.v20180105" />
    2650             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" />
     2652            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-${jetty.ver}" />
     2653            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-${tomcat.ver}" />
    26512654            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
    26522655            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
Note: See TracChangeset for help on using the changeset viewer.