Changeset 099cacd for build.xml


Ignore:
Timestamp:
May 20, 2019 11:07:46 AM (11 months ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
f543a45
Parents:
b89720e
Message:

Installer: Fix -console install for izpack 5 (ticket #2492)
Switch to izpack 5 for non-windows release installer

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    rb89720e r099cacd  
    10511051        <delete dir="./reports" />
    10521052        <delete file="installer/lib/izpack/patches.jar" failonerror="false" quiet="true" />
     1053        <ant dir="installer/lib/izpack5/patches/java/" target="clean" />
    10531054        <delete file="syndie-standalone.zip" failonerror="false" quiet="true" />
    10541055        <delete file="i2psnark-standalone.zip" failonerror="false" quiet="true" />
     
    10921093        <ant dir="installer/resources/locale" target="distclean" />
    10931094        <ant dir="installer/tools/java" target="distclean" />
     1095        <ant dir="installer/lib/izpack5/patches/java/" target="distclean" />
    10941096        <!--
    10951097                NOTE! We need to turn off the default excludes for these
     
    17991801    </target>
    18001802
    1801     <target name="installer5" depends="ensureIzpack5, preppkg, buildProperties, util-list-changes, buildUtilityJar" >
     1803    <target name="izpack5-patches" depends="ensureIzpack5, buildProperties" >
     1804        <ant dir="installer/lib/izpack5/patches/java/" target="jar" />
     1805    </target>
     1806
     1807    <target name="installer5" depends="izpack5-patches, preppkg, buildProperties, util-list-changes, buildUtilityJar" >
    18021808        <izpack5 input="${basedir}/installer/install5.xml" output="${basedir}/install.jar" installerType="standard" basedir="${basedir}" />
    18031809        <ant target="installer5exe" />
     
    18561862
    18571863    <!-- IzPack 5 -->
    1858     <target name="installer5-nowindows" depends="ensureIzpack5, clean, preppkg-nowindows" >
     1864    <target name="installer5-nowindows" depends="clean, izpack5-patches, preppkg-nowindows" >
    18591865        <fixcrlf srcdir="pkg-temp" includes="*.config **/*.xml **/*.properties **/*.txt scripts/*" encoding="utf8" eol="lf" />
    18601866        <izpack5 input="${basedir}/installer/install5.xml" output="${basedir}/i2pinstall_${full.version}.jar" installerType="standard" basedir="${basedir}" />
     
    18741880
    18751881    <!-- IzPack 5 -->
    1876     <target name="installer5-linux" depends="ensureIzpack5, clean, preppkg-linux-only" >
     1882    <target name="installer5-linux" depends="clean, izpack5-patches, preppkg-linux-only" >
    18771883        <fixcrlf srcdir="pkg-temp" includes="*.config **/*.xml **/*.properties **/*.txt scripts/*" encoding="utf8" eol="lf" />
    18781884        <izpack5 input="${basedir}/installer/install5.xml" output="${basedir}/i2pinstall_${full.version}_linux-only.jar" installerType="standard" basedir="${basedir}" />
     
    19321938
    19331939    <!-- IzPack 5 -->
    1934     <target name="installer5-windows" depends="ensureIzpack5, clean, preppkg-windows-only, util-list-changes, buildUtilityJar" >
     1940    <target name="installer5-windows" depends="clean, izpack5-patches, preppkg-windows-only, util-list-changes, buildUtilityJar" >
    19351941        <fixcrlf srcdir="pkg-temp" includes="*.config *.bat *.cmd **/*.xml **/*.properties **/*.txt scripts/*" encoding="utf8" eol="crlf"/>
    19361942        <izpack5 input="${basedir}/installer/install5.xml" output="${basedir}/install.jar" installerType="standard" basedir="${basedir}" />
     
    21532159         since preppkg puts too much stuff in pkg-temp -->
    21542160<!--
    2155     <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndJbigiRepack, updater200WithJettyAndJbigi, delete-j6-update, installer-nowindows, delete-nonwindows, installer5-windows">
    2156     <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, delete-j6-update, installer-nowindows, delete-nonwindows, installer5-windows">
     2161    <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndJbigiRepack, updater200WithJettyAndJbigi, delete-j6-update, installer5-nowindows, delete-nonwindows, installer5-windows">
     2162    <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, delete-j6-update, installer5-nowindows, delete-nonwindows, installer5-windows">
    21572163-->
    2158     <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndGeoIPRepack, updater200WithJettyAndGeoIP, delete-j6-update, installer-nowindows, delete-nonwindows, installer5-windows">
     2164    <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndGeoIPRepack, updater200WithJettyAndGeoIP, delete-j6-update, installer5-nowindows, delete-nonwindows, installer5-windows">
    21592165        <echo message="New version number is ${release.number}" />
    21602166        <copy file="i2pupdate.zip" tofile="i2pupdate_${release.number}.zip" />
Note: See TracChangeset for help on using the changeset viewer.