merge of '50335c064a9992f4ba8707d62d35bbbbe752d231'

and 'b93c1c7b2b01fc43af5bc07470d9997f3edba6da'
This commit is contained in:
zzz
2010-11-19 22:46:27 +00:00
70 changed files with 680 additions and 250 deletions

View File

@@ -158,6 +158,7 @@
<ant dir="apps/susidns/src/" target="poupdate" />
</target>
<target name="javadoc">
<ant dir="apps/jetty" target="ensureJettylib" />
<mkdir dir="./build" />
<mkdir dir="./build/javadoc" />
<!-- get release and build version numbers -->
@@ -581,8 +582,10 @@
<exec executable="echo" osfamily="unix" failifexecutionfails="true" output="pkg-temp/history.txt" append="true">
<arg value="EARLIER HISTORY IS AVAILABLE IN THE SOURCE PACKAGE" />
</exec>
<!-- may be pointless now, people with split directories will never see this -->
<!-- May be pointless now, people with split directories will never see this,
and for flat installs we don't want to overwrite news more recent than the update package.
<copy file="installer/resources/news.xml" todir="pkg-temp/docs/" />
-->
</target>
<target name="prepupdateSmall" depends="buildSmall, prepupdateRouter, prepthemeupdates">
<copy file="build/i2ptunnel.jar" todir="pkg-temp/lib/" />