AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix installer-windows build target

Browse Source 
Izpack tries to parse the 'unix-only' files in Windows. If we don't copy them,
the installation will fail in Windows. Therefore, moving the files that were in
the preppkg-unix target to the preppkg-base target. They're so small I don't
see how this will be a problem.
This commit is contained in:
kytv
2012-04-18 01:44:17 +00:00
parent 746b91f257
commit ac1b51c9ac
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
build.xml
View File

@@ -731,17 +731,7 @@
<copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" /> <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
</target> </target>
<target name="preppkg-unix" depends="preppkg-base, prep-script-translation" > <target name="preppkg-unix" depends="preppkg-base, prep-script-translation" />
<copy file="installer/resources/runplain.sh" todir="pkg-temp/" />
<!-- <copy file="apps/i2psnark/launch-i2psnark" todir="pkg-temp/" /> old feature that per zzz isn't used-->
<copy file="installer/resources/eepget" todir="pkg-temp/" />
<copy file="installer/resources/i2prouter" todir="pkg-temp/" />
<copy file="installer/resources/osid" todir="pkg-temp/" />
<copy file="installer/resources/postinstall.sh" todir="pkg-temp/" />
<copy todir="pkg-temp/man/">
<fileset dir="installer/resources/man/" />
</copy>
</target>
<target name="preppkg-linux" depends="preppkg-linux-x86,preppkg-linux-nonx86" /> <target name="preppkg-linux" depends="preppkg-linux-x86,preppkg-linux-nonx86" />
@@ -839,6 +829,14 @@
<copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" /> <copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" />
<copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" /> <copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" />
<copy file="build/i2psnark.war" todir="pkg-temp/webapps/" /> <copy file="build/i2psnark.war" todir="pkg-temp/webapps/" />
<copy file="installer/resources/runplain.sh" todir="pkg-temp/" />
<copy file="installer/resources/eepget" todir="pkg-temp/" />
<copy file="installer/resources/i2prouter" todir="pkg-temp/" />
<copy file="installer/resources/osid" todir="pkg-temp/" />
<copy file="installer/resources/postinstall.sh" todir="pkg-temp/" />
<copy todir="pkg-temp/man/">
<fileset dir="installer/resources/man/" />
</copy>
<!-- <!--
Disabling per zzz's statement on IRC: jetty-i2psnark.xml is for an obscure feature that is broken anyway, Disabling per zzz's statement on IRC: jetty-i2psnark.xml is for an obscure feature that is broken anyway,
you can remove the file, the link, and the patch from the package you can remove the file, the link, and the patch from the package