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

propagate from branch 'i2p.i2p' (head 4a63eba1606a8ba2448352876b4177d9e4c753a1)

Browse Source 
to branch 'i2p.i2p.unittests' (head 051ea486db9f6f5a4327038827763f350369f932)
This commit is contained in:
str4d
2015-10-09 10:17:03 +00:00
parent 45fe238227 419d6a8e18
commit 843e2a8a0e
395 changed files with 32801 additions and 26284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
build.xml
View File

@@ -100,8 +100,11 @@
<pathelement location="build/i2p.jar" />
<pathelement location="build/i2psnark.jar" />
</classpath>
<arg value="@{file}" />
<arg value="-a" />
<arg value="http://tracker2.postman.i2p/announce.php" />
<arg value="-c" />
<arg value="${build.built-by}" />
<arg value="@{file}" />
</java>
</sequential>
</macrodef>
@@ -450,7 +453,7 @@
if (newBuildNumber != 'unknown' && newBuildNumber != null) {
echo = project.createTask("echo");
project.setProperty("new.i2p.build.number", newBuildNumber);
echo.setMessage("Build number is now: " + newBuildNumber);
echo.setMessage("Build number is now: " + newBuildNumber + project.getProperty("build.extra"));
echo.perform();
}
]]>
@@ -1399,6 +1402,9 @@
<concat append="true" destfile="pkg-temp/history.txt">&#10;&#10;----------------&#10;&#10;EARLIER HISTORY IS AVAILABLE IN THE SOURCE PACKAGE"</concat>
<copy file="installer/resources/deletelist.txt" todir="pkg-temp/" />
<copy file="installer/resources/blocklist.txt" todir="pkg-temp/" />
<copy todir="pkg-temp/man/">
<fileset dir="installer/resources/man/" />
</copy>
</target>
<target name="prepupdateSmall" depends="buildSmall, prepupdateRouter, prepjupdatefixes, prepthemeupdates">
@@ -1774,9 +1780,11 @@
since preppkg puts too much stuff in pkg-temp -->
<!--
<target name="release" depends="distclean, updaterWithJettyFixesAndJbigi , updater200WithJettyFixes, preppkg, installer, getReleaseNumber" >
<target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndGeoIPRepack, updater200WithJettyAndGeoIP, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
-->
<target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndGeoIPRepack, updater200WithJettyAndGeoIP, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
<!--
<target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
-->
<echo message="New version number is ${release.number}" />
<copy file="i2pupdate.zip" tofile="i2pupdate_${release.number}.zip" />
<copy file="i2pinstall_${full.version}.jar" tofile="i2pinstall_${release.number}.jar" />