From 166e36aaeff0911da21a78c64179bdcf13d3db33 Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Wed, 19 Dec 2012 21:08:57 +0000
Subject: [PATCH] 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.
---
 build.xml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/build.xml b/build.xml
index 2d43010829..c8d3444dab 100644
--- a/build.xml
+++ b/build.xml
@@ -223,12 +223,14 @@
 	<ant target="doBuildEXE" />
     </target>
 
-    <taskdef name="launch4j"
-             classname="net.sf.launch4j.ant.Launch4jTask"
-             classpath="${basedir}/installer/lib/launch4j/launch4j.jar:${basedir}/installer/lib/launch4j/lib/xstream.jar" />
+    <target name="launch4j">
+        <taskdef name="launch4j"
+                 classname="net.sf.launch4j.ant.Launch4jTask"
+                 classpath="${basedir}/installer/lib/launch4j/launch4j.jar:${basedir}/installer/lib/launch4j/lib/xstream.jar" />
+     </target>
 
     <!-- this makes an empty build/launchi2p.jar and the build/i2p.exe for the no-wrapper windows startup -->
-    <target name="doBuildEXE" depends="buildProperties" unless="noExe">
+    <target name="doBuildEXE" depends="buildProperties, launch4j" unless="noExe">
         <echo message="See the file &quot;build.properties&quot; if this step fails." />
         <jar destfile="./build/launchi2p.jar">
             <manifest>
@@ -1130,11 +1132,10 @@
         </exec>
     </target>
 
-    <taskdef name="izpack"
-             classpath="${basedir}/installer/lib/izpack/patches.jar:${basedir}/installer/lib/izpack/standalone-compiler.jar"
-             classname="com.izforge.izpack.ant.IzPackTask" />
-
     <target name="izpack-patches" >
+            <taskdef name="izpack"
+                     classpath="${basedir}/installer/lib/izpack/patches.jar:${basedir}/installer/lib/izpack/standalone-compiler.jar"
+                     classname="com.izforge.izpack.ant.IzPackTask" />
         <jar destfile="${basedir}/installer/lib/izpack/patches.jar"
              basedir="${basedir}/installer/lib/izpack/patches" />
     </target>
@@ -1187,7 +1188,7 @@
         <ant target="installerexe" />
     </target>
 
-    <target name="installerexe">
+    <target name="installerexe" depends="launch4j">
         <condition property="noExe">
 	    <or>
 	        <os arch="ppc" />
@@ -1206,7 +1207,7 @@
     </target>
 
     <!-- this makes i2pinstall.exe from install.jar -->
-    <target name="doInstallerEXE" unless="noExe">
+    <target name="doInstallerEXE" depends="launch4j" unless="noExe">
         <echo message="See the file &quot;build.properties&quot; if this step fails." />
 	<!-- now the installer exe -->
         <launch4j configFile="./installer/i2pinstaller.xml" />