propagate from branch 'i2p.i2p.zzz.ipv6' (head 5c147c6e394fae03752dcf497923a90e3f2db529)

to branch 'i2p.i2p' (head 7af6987d5546664f76589afe0cbeeb780f4b5d58)
This commit is contained in:
zzz
2013-07-20 12:59:03 +00:00
230 changed files with 32173 additions and 109751 deletions

View File

@@ -432,9 +432,15 @@
<target name="poupdate" depends="buildRouter, buildStreaming, buildSystray, buildJetty, buildDesktopGui" >
<echo message="Setting environment variable LG2 to a lang code (eg: de,zh,nl etc)" />
<echo message=" will restrict language update to the language you specified, leaving other language untact." />
<ant dir="apps/routerconsole/java/" target="poupdate" />
<ant dir="apps/routerconsole/java/" >
<target name="poupdate" />
<target name="poupdate-news" />
</ant>
<ant dir="apps/i2psnark/java/" target="poupdate" />
<ant dir="apps/i2ptunnel/java/" target="poupdate" />
<ant dir="apps/i2ptunnel/java/" >
<target name="poupdate" />
<target name="poupdate-proxy" />
</ant>
<ant dir="apps/susidns/src/" target="poupdate" />
<ant dir="apps/susimail/" target="poupdate" />
<ant dir="apps/desktopgui" target="poupdate" />
@@ -1310,6 +1316,7 @@
<target name="junit.test" depends="buildProperties, jbigi" >
<ant dir="core/java/" target="junit.test" />
<ant dir="router/java/" target="junit.test" />
<ant dir="apps/streaming/java/" target="junit.test" />
</target>
<target name="scalatest.test" depends="buildProperties, jbigi" >
<ant dir="core/java/" target="scalatest.test" />
@@ -1320,6 +1327,7 @@
<!-- both junit and scala -->
<ant dir="core/java/" target="test" />
<ant dir="router/java/" target="test" />
<ant dir="apps/streaming/java/" target="test" />
</target>
<target name="scalatest.report" depends="buildProperties" >
<ant dir="core/java/" target="scalatest.report" />
@@ -1328,33 +1336,42 @@
<target name="junit.report" depends="buildProperties" >
<ant dir="core/java/" target="junit.report" />
<ant dir="router/java/" target="junit.report" />
<ant dir="apps/streaming/java/" target="junit.report" />
</target>
<target name="clover.report" depends="buildProperties" if="with.clover">
<ant dir="core/java/" target="clover.report" />
<ant dir="router/java/" target="clover.report" />
<ant dir="apps/streaming/java" target="clover.report" />
</target>
<target name="cobertura.report" depends="buildProperties" if="with.cobertura">
<ant dir="core/java/" target="cobertura.report" />
<ant dir="router/java/" target="cobertura.report" />
<ant dir="apps/streaming/java" target="cobertura.report" />
</target>
<target name="test.report" depends="junit.report, scalatest.report, clover.report, cobertura.report"/>
<target name="fulltest" depends="buildProperties, jbigi" >
<ant dir="core/java/" target="fulltest" />
<ant dir="router/java/" target="fulltest" />
<ant dir="apps/streaming/java" target="fulltest" />
</target>
<target name="jenkins.cobertura.report" depends="cobertura.report">
<!--
The jenkins cobertura plugin couldn't find the source files.
Let's see if these changes help it out.
-->
<replaceregexp byline="true" file="reports/core/cobertura/coverage.xml"
match='filename="net' replace='filename="core/java/src/net'/>
<replaceregexp byline="true" file="reports/core/cobertura/coverage.xml"
match="&lt;source&gt;./src" replace='&lt;source&gt;./core/java/src'/>
<replaceregexp byline="true" file="reports/router/cobertura/coverage.xml"
match='filename="net' replace='filename="router/java/src/net'/>
<replaceregexp byline="true" file="reports/router/cobertura/coverage.xml"
match="&lt;source&gt;./src" replace="&lt;source&gt;router/java/src"/>
<replaceregexp byline="true" file="reports/streaming/cobertura/coverage.xml"
match='filename="net' replace='filename="apps/streaming/java/src/net'/>
<replaceregexp byline="true" file="reports/streaming/cobertura/coverage.xml"
match="&lt;source&gt;./src" replace="&lt;source&gt;apps/streaming/java/src"/>
</target>
<!-- end unit tests -->