Changeset 166e36a for build.xml


Ignore:
Timestamp:
Dec 19, 2012 9:08:57 PM (8 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
9ef9e48
Parents:
667b548d
Message:

move taskdefs to targets

The directory installer/lib/ will be removed if a 'stripped' source tarball is
required. Without the changes in this commit, removing this directory will
require hackery to be performed on the I2P source in order for any of the ant
targets to work.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r667b548d r166e36a  
    224224    </target>
    225225
    226     <taskdef name="launch4j"
    227              classname="net.sf.launch4j.ant.Launch4jTask"
    228              classpath="${basedir}/installer/lib/launch4j/launch4j.jar:${basedir}/installer/lib/launch4j/lib/xstream.jar" />
     226    <target name="launch4j">
     227        <taskdef name="launch4j"
     228                 classname="net.sf.launch4j.ant.Launch4jTask"
     229                 classpath="${basedir}/installer/lib/launch4j/launch4j.jar:${basedir}/installer/lib/launch4j/lib/xstream.jar" />
     230     </target>
    229231
    230232    <!-- this makes an empty build/launchi2p.jar and the build/i2p.exe for the no-wrapper windows startup -->
    231     <target name="doBuildEXE" depends="buildProperties" unless="noExe">
     233    <target name="doBuildEXE" depends="buildProperties, launch4j" unless="noExe">
    232234        <echo message="See the file &quot;build.properties&quot; if this step fails." />
    233235        <jar destfile="./build/launchi2p.jar">
     
    11311133    </target>
    11321134
    1133     <taskdef name="izpack"
    1134              classpath="${basedir}/installer/lib/izpack/patches.jar:${basedir}/installer/lib/izpack/standalone-compiler.jar"
    1135              classname="com.izforge.izpack.ant.IzPackTask" />
    1136 
    11371135    <target name="izpack-patches" >
     1136            <taskdef name="izpack"
     1137                     classpath="${basedir}/installer/lib/izpack/patches.jar:${basedir}/installer/lib/izpack/standalone-compiler.jar"
     1138                     classname="com.izforge.izpack.ant.IzPackTask" />
    11381139        <jar destfile="${basedir}/installer/lib/izpack/patches.jar"
    11391140             basedir="${basedir}/installer/lib/izpack/patches" />
     
    11881189    </target>
    11891190
    1190     <target name="installerexe">
     1191    <target name="installerexe" depends="launch4j">
    11911192        <condition property="noExe">
    11921193            <or>
     
    12071208
    12081209    <!-- this makes i2pinstall.exe from install.jar -->
    1209     <target name="doInstallerEXE" unless="noExe">
     1210    <target name="doInstallerEXE" depends="launch4j" unless="noExe">
    12101211        <echo message="See the file &quot;build.properties&quot; if this step fails." />
    12111212        <!-- now the installer exe -->
Note: See TracChangeset for help on using the changeset viewer.