I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix ant distclean poupdate

Browse Source
This commit is contained in:
zzz
2010-07-03 13:39:25 +00:00
parent 4fa89d5e86
commit b9452546c5
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/i2psnark/java/build.xml
View File

@ -73,7 +73,7 @@
</exec> </exec>
</target> </target>
<target name="poupdate" depends="compile"> <target name="poupdate" depends="builddep, compile">
<!-- Update the messages_*.po files. --> <!-- Update the messages_*.po files. -->
<exec executable="sh" osfamily="unix" failifexecutionfails="true" > <exec executable="sh" osfamily="unix" failifexecutionfails="true" >
<arg value="./bundle-messages.sh" /> <arg value="./bundle-messages.sh" />

12
apps/i2ptunnel/java/build.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project basedir="." default="all" name="i2ptunnel"> <project basedir="." default="all" name="i2ptunnel">
<target name="all" depends="clean, build" /> <target name="all" depends="clean, build" />
<target name="build" depends="builddep, jar" /> <target name="build" depends="builddep, jar, war" />
<target name="builddep"> <target name="builddep">
<ant dir="../../ministreaming/java/" target="build" /> <ant dir="../../ministreaming/java/" target="build" />
<ant dir="../../jetty/" target="build" /> <ant dir="../../jetty/" target="build" />
@ -34,6 +34,10 @@
<compilerarg line="${javac.compilerargs}" /> <compilerarg line="${javac.compilerargs}" />
</javac> </javac>
</target> </target>
<!-- TODO: Move the web classes from the jar to the war - they are not part of the API
- This will require sponge to rewrite some seedless stuff that uses it.
-->
<target name="jar" depends="builddep, compile"> <target name="jar" depends="builddep, compile">
<jar destfile="./build/i2ptunnel.jar" basedir="./build/obj" includes="**/*.class"> <jar destfile="./build/i2ptunnel.jar" basedir="./build/obj" includes="**/*.class">
<manifest> <manifest>
@ -41,8 +45,6 @@
<attribute name="Class-Path" value="i2p.jar mstreaming.jar" /> <attribute name="Class-Path" value="i2p.jar mstreaming.jar" />
</manifest> </manifest>
</jar> </jar>
<ant target="bundle" />
<ant target="war" />
</target> </target>
<target name="bundle" depends="compile, precompilejsp"> <target name="bundle" depends="compile, precompilejsp">
@ -77,13 +79,13 @@
</exec> </exec>
</target> </target>
<target name="war" depends="precompilejsp"> <target name="war" depends="precompilejsp, bundle">
<war destfile="build/i2ptunnel.war" webxml="../jsp/web-out.xml" <war destfile="build/i2ptunnel.war" webxml="../jsp/web-out.xml"
basedir="../jsp/" excludes="web.xml, **/*.java, *.jsp"> basedir="../jsp/" excludes="web.xml, **/*.java, *.jsp">
</war> </war>
</target> </target>
<target name="precompilejsp" unless="precompilejsp.uptodate"> <target name="precompilejsp" depends="jar" unless="precompilejsp.uptodate">
<delete dir="../jsp/WEB-INF/" /> <delete dir="../jsp/WEB-INF/" />
<delete file="../jsp/web-fragment.xml" /> <delete file="../jsp/web-fragment.xml" />
<delete file="../jsp/web-out.xml" /> <delete file="../jsp/web-out.xml" />

2
build.xml
View File

@ -65,7 +65,7 @@
<ant dir="apps/routerconsole/java/" target="jar" /> <ant dir="apps/routerconsole/java/" target="jar" />
<ant dir="apps/ministreaming/java/" target="jar" /> <ant dir="apps/ministreaming/java/" target="jar" />
<ant dir="apps/streaming/java/" target="jar" /> <ant dir="apps/streaming/java/" target="jar" />
<ant dir="apps/i2ptunnel/java/" target="jar" /> <ant dir="apps/i2ptunnel/java/" target="build" />
<ant dir="apps/addressbook/" target="war" /> <ant dir="apps/addressbook/" target="war" />
</target> </target>
<target name="buildrouter"> <target name="buildrouter">