forked from I2P_Developers/i2p.i2p
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.
This commit is contained in:
21
build.xml
21
build.xml
@@ -223,12 +223,14 @@
|
|||||||
<ant target="doBuildEXE" />
|
<ant target="doBuildEXE" />
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<taskdef name="launch4j"
|
<target name="launch4j">
|
||||||
classname="net.sf.launch4j.ant.Launch4jTask"
|
<taskdef name="launch4j"
|
||||||
classpath="${basedir}/installer/lib/launch4j/launch4j.jar:${basedir}/installer/lib/launch4j/lib/xstream.jar" />
|
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 -->
|
<!-- 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 "build.properties" if this step fails." />
|
<echo message="See the file "build.properties" if this step fails." />
|
||||||
<jar destfile="./build/launchi2p.jar">
|
<jar destfile="./build/launchi2p.jar">
|
||||||
<manifest>
|
<manifest>
|
||||||
@@ -1130,11 +1132,10 @@
|
|||||||
</exec>
|
</exec>
|
||||||
</target>
|
</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" >
|
<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"
|
<jar destfile="${basedir}/installer/lib/izpack/patches.jar"
|
||||||
basedir="${basedir}/installer/lib/izpack/patches" />
|
basedir="${basedir}/installer/lib/izpack/patches" />
|
||||||
</target>
|
</target>
|
||||||
@@ -1187,7 +1188,7 @@
|
|||||||
<ant target="installerexe" />
|
<ant target="installerexe" />
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="installerexe">
|
<target name="installerexe" depends="launch4j">
|
||||||
<condition property="noExe">
|
<condition property="noExe">
|
||||||
<or>
|
<or>
|
||||||
<os arch="ppc" />
|
<os arch="ppc" />
|
||||||
@@ -1206,7 +1207,7 @@
|
|||||||
</target>
|
</target>
|
||||||
|
|
||||||
<!-- this makes i2pinstall.exe from install.jar -->
|
<!-- this makes i2pinstall.exe from install.jar -->
|
||||||
<target name="doInstallerEXE" unless="noExe">
|
<target name="doInstallerEXE" depends="launch4j" unless="noExe">
|
||||||
<echo message="See the file "build.properties" if this step fails." />
|
<echo message="See the file "build.properties" if this step fails." />
|
||||||
<!-- now the installer exe -->
|
<!-- now the installer exe -->
|
||||||
<launch4j configFile="./installer/i2pinstaller.xml" />
|
<launch4j configFile="./installer/i2pinstaller.xml" />
|
||||||
|
Reference in New Issue
Block a user