Changeset 843e2a8 for build.xml


Ignore:
Timestamp:
Oct 9, 2015 10:17:03 AM (5 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
bb56a11
Parents:
45fe238 (diff), 419d6a8e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

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

to branch 'i2p.i2p.unittests' (head 051ea486db9f6f5a4327038827763f350369f932)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r45fe238 r843e2a8  
    101101                    <pathelement location="build/i2psnark.jar" />
    102102                </classpath>
     103                <arg value="-a" />
     104                <arg value="http://tracker2.postman.i2p/announce.php" />
     105                <arg value="-c" />
     106                <arg value="${build.built-by}" />
    103107                <arg value="@{file}" />
    104                 <arg value="http://tracker2.postman.i2p/announce.php" />
    105108            </java>
    106109        </sequential>
     
    451454                echo = project.createTask("echo");
    452455                project.setProperty("new.i2p.build.number", newBuildNumber);
    453                 echo.setMessage("Build number is now: " + newBuildNumber);
     456                echo.setMessage("Build number is now: " + newBuildNumber + project.getProperty("build.extra"));
    454457                echo.perform();
    455458            }
     
    14001403        <copy file="installer/resources/deletelist.txt" todir="pkg-temp/" />
    14011404        <copy file="installer/resources/blocklist.txt" todir="pkg-temp/" />
     1405        <copy todir="pkg-temp/man/">
     1406            <fileset dir="installer/resources/man/" />
     1407        </copy>
    14021408    </target>
    14031409
     
    17751781<!--
    17761782    <target name="release" depends="distclean, updaterWithJettyFixesAndJbigi , updater200WithJettyFixes, preppkg, installer, getReleaseNumber" >
     1783-->
    17771784    <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndGeoIPRepack, updater200WithJettyAndGeoIP, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
     1785<!--
     1786    <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
    17781787-->
    1779     <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
    17801788        <echo message="New version number is ${release.number}" />
    17811789        <copy file="i2pupdate.zip" tofile="i2pupdate_${release.number}.zip" />
Note: See TracChangeset for help on using the changeset viewer.