* build files:
- Don't die if depend not available - Only verify Jetty hash once - Add streaming lib tests to depends task
This commit is contained in:
@ -19,7 +19,10 @@
|
|||||||
|
|
||||||
<target name="distclean" depends="clean" />
|
<target name="distclean" depends="clean" />
|
||||||
|
|
||||||
<target name="depend">
|
<condition property="depend.available">
|
||||||
|
<typefound name="depend" />
|
||||||
|
</condition>
|
||||||
|
<target name="depend" if="depend.available">
|
||||||
<depend
|
<depend
|
||||||
cache="../../build"
|
cache="../../build"
|
||||||
srcdir="${src}"
|
srcdir="${src}"
|
||||||
|
@ -7,7 +7,10 @@
|
|||||||
<ant dir="../../streaming/java/" target="build" />
|
<ant dir="../../streaming/java/" target="build" />
|
||||||
<!-- streaming will build ministreaming and core -->
|
<!-- streaming will build ministreaming and core -->
|
||||||
</target>
|
</target>
|
||||||
<target name="depend">
|
<condition property="depend.available">
|
||||||
|
<typefound name="depend" />
|
||||||
|
</condition>
|
||||||
|
<target name="depend" if="depend.available">
|
||||||
<depend
|
<depend
|
||||||
cache="../../../build"
|
cache="../../../build"
|
||||||
srcdir="./src"
|
srcdir="./src"
|
||||||
|
@ -7,7 +7,10 @@
|
|||||||
<ant dir="../../jetty/" target="build" />
|
<ant dir="../../jetty/" target="build" />
|
||||||
<!-- ministreaming will build core -->
|
<!-- ministreaming will build core -->
|
||||||
</target>
|
</target>
|
||||||
<target name="depend">
|
<condition property="depend.available">
|
||||||
|
<typefound name="depend" />
|
||||||
|
</condition>
|
||||||
|
<target name="depend" if="depend.available">
|
||||||
<depend
|
<depend
|
||||||
cache="../../../build"
|
cache="../../../build"
|
||||||
srcdir="./src"
|
srcdir="./src"
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
<property name="jetty.md5" value="a61adc832be6baf2678935506743cfc3" />
|
<property name="jetty.md5" value="a61adc832be6baf2678935506743cfc3" />
|
||||||
<property name="jetty.url" value="http://dist.codehaus.org/jetty/jetty-5.1.x/jetty-5.1.12.zip" />
|
<property name="jetty.url" value="http://dist.codehaus.org/jetty/jetty-5.1.x/jetty-5.1.12.zip" />
|
||||||
<property name="jetty.filename" value="jetty-5.1.12.zip" />
|
<property name="jetty.filename" value="jetty-5.1.12.zip" />
|
||||||
|
<property name="verified.filename" value="verified.txt" />
|
||||||
|
|
||||||
<target name="all" depends="build" />
|
<target name="all" depends="build" />
|
||||||
|
|
||||||
@ -41,7 +42,9 @@
|
|||||||
<get src="${jetty.url}" verbose="true" dest="${jetty.filename}" />
|
<get src="${jetty.url}" verbose="true" dest="${jetty.filename}" />
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="verifyJettylib" >
|
<uptodate property="verified.already" srcfile="${jetty.filename}" targetfile="${verified.filename}" />
|
||||||
|
|
||||||
|
<target name="verifyJettylib" unless="verified.already" >
|
||||||
<condition property="jetty.zip.verified" >
|
<condition property="jetty.zip.verified" >
|
||||||
<and>
|
<and>
|
||||||
<checksum file="${jetty.filename}" algorithm="SHA" property="${jetty.sha1}" />
|
<checksum file="${jetty.filename}" algorithm="SHA" property="${jetty.sha1}" />
|
||||||
@ -55,6 +58,7 @@
|
|||||||
</not>
|
</not>
|
||||||
</condition>
|
</condition>
|
||||||
</fail>
|
</fail>
|
||||||
|
<touch file="${verified.filename}" />
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="extractJettylib" unless="jetty.zip.extracted" >
|
<target name="extractJettylib" unless="jetty.zip.extracted" >
|
||||||
@ -97,6 +101,7 @@
|
|||||||
</target>
|
</target>
|
||||||
<target name="clean" >
|
<target name="clean" >
|
||||||
<delete dir="./build" />
|
<delete dir="./build" />
|
||||||
|
<delete file="${verified.filename}" />
|
||||||
</target>
|
</target>
|
||||||
<target name="cleandep" depends="clean" />
|
<target name="cleandep" depends="clean" />
|
||||||
<target name="distclean" depends="clean">
|
<target name="distclean" depends="clean">
|
||||||
|
@ -5,7 +5,10 @@
|
|||||||
<target name="builddep">
|
<target name="builddep">
|
||||||
<ant dir="../../../core/java/" target="build" />
|
<ant dir="../../../core/java/" target="build" />
|
||||||
</target>
|
</target>
|
||||||
<target name="depend">
|
<condition property="depend.available">
|
||||||
|
<typefound name="depend" />
|
||||||
|
</condition>
|
||||||
|
<target name="depend" if="depend.available">
|
||||||
<depend
|
<depend
|
||||||
cache="../../../build"
|
cache="../../../build"
|
||||||
srcdir="./src"
|
srcdir="./src"
|
||||||
|
@ -10,7 +10,10 @@
|
|||||||
<target name="prepare">
|
<target name="prepare">
|
||||||
<ant dir="../../jetty/" target="build" />
|
<ant dir="../../jetty/" target="build" />
|
||||||
</target>
|
</target>
|
||||||
<target name="depend">
|
<condition property="depend.available">
|
||||||
|
<typefound name="depend" />
|
||||||
|
</condition>
|
||||||
|
<target name="depend" if="depend.available">
|
||||||
<depend
|
<depend
|
||||||
cache="../../../build"
|
cache="../../../build"
|
||||||
srcdir="./src"
|
srcdir="./src"
|
||||||
@ -27,6 +30,8 @@
|
|||||||
<pathelement location="../../jrobin/jrobin-1.4.0.jar" />
|
<pathelement location="../../jrobin/jrobin-1.4.0.jar" />
|
||||||
</classpath>
|
</classpath>
|
||||||
</depend>
|
</depend>
|
||||||
|
</target>
|
||||||
|
<target name="dependVersion">
|
||||||
<!-- Force the dependency on the RouterVersion as depend doesn't recognize constant changes -->
|
<!-- Force the dependency on the RouterVersion as depend doesn't recognize constant changes -->
|
||||||
<dependset>
|
<dependset>
|
||||||
<srcfilelist dir="." files="../../../router/java/build/obj/net/i2p/router/RouterVersion.class" />
|
<srcfilelist dir="." files="../../../router/java/build/obj/net/i2p/router/RouterVersion.class" />
|
||||||
@ -35,7 +40,7 @@
|
|||||||
<targetfilelist dir="." files="build/obj/net/i2p/router/web/UpdateHandler.class" />
|
<targetfilelist dir="." files="build/obj/net/i2p/router/web/UpdateHandler.class" />
|
||||||
</dependset>
|
</dependset>
|
||||||
</target>
|
</target>
|
||||||
<target name="compile" depends="prepare, depend">
|
<target name="compile" depends="prepare, depend, dependVersion">
|
||||||
<mkdir dir="./build" />
|
<mkdir dir="./build" />
|
||||||
<mkdir dir="./build/obj" />
|
<mkdir dir="./build/obj" />
|
||||||
<javac
|
<javac
|
||||||
|
@ -6,7 +6,10 @@
|
|||||||
<ant dir="../../ministreaming/java/" target="build" />
|
<ant dir="../../ministreaming/java/" target="build" />
|
||||||
<!-- ministreaming will build core -->
|
<!-- ministreaming will build core -->
|
||||||
</target>
|
</target>
|
||||||
<target name="depend">
|
<condition property="depend.available">
|
||||||
|
<typefound name="depend" />
|
||||||
|
</condition>
|
||||||
|
<target name="depend" if="depend.available">
|
||||||
<depend
|
<depend
|
||||||
cache="../../../build"
|
cache="../../../build"
|
||||||
srcdir="./src"
|
srcdir="./src"
|
||||||
|
@ -6,10 +6,13 @@
|
|||||||
<ant dir="../../ministreaming/java/" target="build" />
|
<ant dir="../../ministreaming/java/" target="build" />
|
||||||
<!-- ministreaming will build core -->
|
<!-- ministreaming will build core -->
|
||||||
</target>
|
</target>
|
||||||
<target name="depend">
|
<condition property="depend.available">
|
||||||
|
<typefound name="depend" />
|
||||||
|
</condition>
|
||||||
|
<target name="depend" if="depend.available">
|
||||||
<depend
|
<depend
|
||||||
cache="../../../build"
|
cache="../../../build"
|
||||||
srcdir="./src"
|
srcdir="./src:./test"
|
||||||
destdir="./build/obj" >
|
destdir="./build/obj" >
|
||||||
<!-- Depend on classes instead of jars where available -->
|
<!-- Depend on classes instead of jars where available -->
|
||||||
<classpath>
|
<classpath>
|
||||||
|
@ -5,7 +5,10 @@
|
|||||||
<target name="builddep">
|
<target name="builddep">
|
||||||
<!-- noop, since the core doesnt depend on anything -->
|
<!-- noop, since the core doesnt depend on anything -->
|
||||||
</target>
|
</target>
|
||||||
<target name="depend">
|
<condition property="depend.available">
|
||||||
|
<typefound name="depend" />
|
||||||
|
</condition>
|
||||||
|
<target name="depend" if="depend.available">
|
||||||
<depend
|
<depend
|
||||||
cache="../../build"
|
cache="../../build"
|
||||||
srcdir="./src"
|
srcdir="./src"
|
||||||
|
@ -8,7 +8,10 @@
|
|||||||
<target name="builddeptest">
|
<target name="builddeptest">
|
||||||
<ant dir="../../core/java/" target="jarTest" />
|
<ant dir="../../core/java/" target="jarTest" />
|
||||||
</target>
|
</target>
|
||||||
<target name="depend">
|
<condition property="depend.available">
|
||||||
|
<typefound name="depend" />
|
||||||
|
</condition>
|
||||||
|
<target name="depend" if="depend.available">
|
||||||
<depend
|
<depend
|
||||||
cache="../../build"
|
cache="../../build"
|
||||||
srcdir="./src"
|
srcdir="./src"
|
||||||
|
Reference in New Issue
Block a user