Changeset ed92411 for build.xml


Ignore:
Timestamp:
May 1, 2012 11:41:04 PM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
c4a05ec4
Parents:
7a690b24
Message:

installer target fixes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r7a690b24 red92411  
    11171117    </target>
    11181118
     1119    <target name="delete-j6-update">
     1120        <delete dir="pkg-temp/eepsite-jetty6" />
     1121    </target>
     1122
    11191123    <!-- Jetty 6 I2P logging addons, not really fixes -->
    11201124    <target name="prepjupdatefixes" depends="prepupdate, buildWEB">
     
    12671271    </target>
    12681272
     1273    <!-- call between installer-xxx and installer-windows -->
     1274    <target name="delete-nonwindows">
     1275        <delete dir="pkg-temp/lib/wrapper/" />
     1276        <delete dir="pkg-temp/locale/" />
     1277        <delete dir="pkg-temp/man/" />
     1278        <delete dir="pkg-temp/Start I2P Router.app/" />
     1279        <delete dir="pkg-temp" includes="eepget i2prouter INSTALL-headless.txt osid postinstall.sh runplain.sh" />
     1280    </target>
     1281
    12691282    <target name="installer-windows" depends="clean, preppkg-windows-only, util-list-changes, izpack-patches, utility-jars" >
    12701283        <izpack input="${basedir}/installer/install.xml" output="${basedir}/install.jar" installerType="standard" basedir="${basedir}" />
     
    12741287    </target>
    12751288
     1289    <!-- this is broken as installer-xxx targets may delete (or not delete) things in pkg-temp -->
    12761290    <target name="installer-all" depends="installer-freebsd, installer-linux, installer-osx, installer-windows, installer-nowindows, installer" >
    12771291    </target>
     
    13661380    <target name="release" depends="distclean, updaterWithJettyFixesAndJbigi , updater200WithJettyFixes, preppkg, installer, getReleaseNumber" >
    13671381-->
    1368     <target name="release" depends="verifyReleaseBuildNumbers, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, preppkgRepack, installer-nowindows, installer-windows" >
     1382    <target name="release" depends="verifyReleaseBuildNumbers, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows" >
    13691383        <echo message="================================================================" />
    13701384        <echo message="Did you update these files?" />
Note: See TracChangeset for help on using the changeset viewer.