Changeset 86a2e16 for build.xml


Ignore:
Timestamp:
Nov 16, 2017 1:28:01 PM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
570dea85
Parents:
ed39ea40
Message:

Fix pkg build for Jetty 9.2.22
Set next release to include GeoIP

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    red39ea40 r86a2e16  
    19401940<!--
    19411941    <target name="release" depends="distclean, updaterWithJettyFixesAndJbigi , updater200WithJettyFixes, preppkg, installer, getReleaseNumber" >
     1942    <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndJbigiRepack, updater200WithJettyAndJbigi, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
     1943    <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
     1944-->
    19421945    <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndGeoIPRepack, updater200WithJettyAndGeoIP, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
    1943     <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndJbigiRepack, updater200WithJettyAndJbigi, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
    1944 -->
    1945     <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
    19461946        <echo message="New version number is ${release.number}" />
    19471947        <copy file="i2pupdate.zip" tofile="i2pupdate_${release.number}.zip" />
     
    22672267            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
    22682268            <!-- libjetty9-java -->
    2269             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.21.v20170120" />
     2269            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
    22702270            <!-- libjstl1.1-java or glassfish-javaee -->
    22712271          <!--
     
    23412341            <!-- libjetty9-java -->
    23422342          <!--
    2343             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.21.v20170120" />
     2343            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
    23442344           -->
    23452345            <!-- libjstl1.1-java or glassfish-javaee -->
     
    24092409            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    24102410            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
    2411             <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.21.v20170120" />
     2411            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
    24122412          <!--
    24132413            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
Note: See TracChangeset for help on using the changeset viewer.