Changeset 3a2e9ad for build.xml


Ignore:
Timestamp:
Jun 30, 2011 12:22:12 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
81beb63
Parents:
14e7a8e (diff), 01b4b22 (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.zzz.test4' (head 50c95d70238ff224e57acfca3d8797990ff3d01d)

to branch 'i2p.i2p' (head 1fa62c230eba5af7849024338fecf51bb2719c4e)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r14e7a8e r3a2e9ad  
    318318        <ant dir="apps/desktopgui" target="poupdate" />
    319319    </target>
    320     <target name="javadoc">
     320
     321    <target name="javadoc" depends="getReleaseNumber, getBuildNumber" >
    321322        <ant dir="apps/jetty" target="ensureJettylib" />
    322323        <mkdir dir="./build" />
    323324        <mkdir dir="./build/javadoc" />
    324         <!-- get release and build version numbers -->
    325         <exec executable="grep" outputproperty="versionLine" >
    326             <arg value="public final static String VERSION" />
    327             <arg value="core/java/src/net/i2p/CoreVersion.java" />
    328         </exec>
    329         <exec executable="cut" inputstring="${versionLine}" outputproperty="release.number" >
    330             <arg value="-f2" />
    331             <arg value="-d&quot;" />
    332         </exec>
    333         <exec executable="grep" outputproperty="buildLine" >
    334             <arg value="public final static long BUILD" />
    335             <arg value="router/java/src/net/i2p/router/RouterVersion.java" />
    336         </exec>
    337         <exec executable="cut" inputstring="${buildLine}" outputproperty="build.temp" >
    338             <arg value="-f2" />
    339             <arg value="-d=" />
    340         </exec>
    341         <exec executable="cut" inputstring="${build.temp}" outputproperty="build.number" >
    342             <arg value="-f1" />
    343             <arg value="-d;" />
    344         </exec>
    345325        <javadoc access="package"
    346326            destdir="./build/javadoc"
     
    397377    </target>
    398378
     379    <target name="getReleaseNumber" >
     380        <exec executable="grep" outputproperty="versionLine" failonerror="true" >
     381            <arg value="public final static String VERSION" />
     382            <arg value="core/java/src/net/i2p/CoreVersion.java" />
     383        </exec>
     384        <exec executable="cut" inputstring="${versionLine}" outputproperty="release.number" failonerror="true" >
     385            <arg value="-f2" />
     386            <arg value="-d&quot;" />
     387        </exec>
     388        <echo message="Release number is ${release.number}" />
     389    </target>
     390
     391    <target name="getBuildNumber" >
     392        <exec executable="grep" outputproperty="buildLine" >
     393            <arg value="public final static long BUILD" />
     394            <arg value="router/java/src/net/i2p/router/RouterVersion.java" />
     395        </exec>
     396        <exec executable="cut" inputstring="${buildLine}" outputproperty="build.temp" failonerror="true" >
     397            <arg value="-f2" />
     398            <arg value="-d=" />
     399        </exec>
     400        <exec executable="cut" inputstring="${build.temp}" outputproperty="build.number" failonerror="true" >
     401            <arg value="-f1" />
     402            <arg value="-d;" />
     403        </exec>
     404        <echo message="Build number is ${build.number}" />
     405    </target>
     406
    399407    <target name="clean" depends="pkgclean" >
    400408        <delete dir="./build" />
     
    713721    <target name="updaterSmall" depends="prepupdateSmall, zipit" />
    714722    <target name="updaterRouter" depends="prepupdateRouter, zipit" />
    715     <target name="zipit">
    716         <zip destfile="i2pupdate.zip" basedir="pkg-temp" whenempty="fail" />
     723
     724    <target name="zipit" depends="getReleaseNumber" >
     725        <!--
     726             As of release 0.8.8, the router will enforce a zipfile comment equal to the
     727             version number in the sud/su2 header, since the version in the header is NOT
     728             covered by the signature.
     729         -->
     730        <zip destfile="i2pupdate.zip" basedir="pkg-temp" whenempty="fail" comment="${release.number}" />
    717731       <!-- just a test, makes almost no difference
    718732        <tar destfile="i2pupdate.tgz" basedir="pkg-temp" compression="gzip" />
     
    720734       -->
    721735    </target>
    722     <target name="zipit200">
    723         <zip destfile="i2pupdate200.zip" basedir="pkg-temp" whenempty="fail" />
     736
     737    <target name="zipit200" depends="getReleaseNumber" >
     738        <zip destfile="i2pupdate200.zip" basedir="pkg-temp" whenempty="fail" comment="${release.number}" />
    724739    </target>
    725740
     
    9881003         since preppkg puts too much stuff in pkg-temp -->
    9891004<!--
    990     <target name="release" depends="distclean, updater, updater200, preppkg, installer" >
     1005    <target name="release" depends="distclean, updater, updater200, preppkg, installer, getReleaseNumber" >
    9911006-->
    992     <target name="release" depends="distclean, updaterWithJettyFixesAndJbigi , updater200WithJettyFixes, preppkg, installer" >
     1007    <target name="release" depends="distclean, updaterWithJettyFixesAndJbigi , updater200WithJettyFixes, preppkg, installer, getReleaseNumber" >
    9931008        <echo message="================================================================" />
    9941009        <echo message="Did you update these files?" />
     
    10061021        </exec>
    10071022        <echo message="If there are any modified files above, stop now!" />
    1008         <!-- get release version number -->
    1009         <exec executable="grep" outputproperty="versionLine" failonerror="true" >
    1010             <arg value="public final static String VERSION" />
    1011             <arg value="core/java/src/net/i2p/CoreVersion.java" />
    1012         </exec>
    1013         <exec executable="cut" inputstring="${versionLine}" outputproperty="release.number" failonerror="true" >
    1014             <arg value="-f2" />
    1015             <arg value="-d&quot;" />
    1016         </exec>
     1023
    10171024        <echo message="New version number is ${release.number}" />
    10181025        <copy file="i2pupdate.zip" tofile="i2pupdate_${release.number}.zip" />
     
    10491056                <pathelement location="build/i2p.jar" />
    10501057            </classpath>
     1058            <arg value="verifyversion" />
     1059            <arg value="i2pupdate.sud" />
     1060        </java>
     1061        <java classname="net.i2p.crypto.TrustedUpdate" fork="true" failonerror="true">
     1062            <classpath>
     1063                <pathelement location="build/i2p.jar" />
     1064            </classpath>
    10511065            <arg value="showversion" />
    10521066            <arg value="i2pupdate.sud" />
     
    10691083            </classpath>
    10701084            <arg value="verifysig" />
     1085            <arg value="i2pupdate.su2" />
     1086        </java>
     1087        <java classname="net.i2p.crypto.TrustedUpdate" fork="true" failonerror="true">
     1088            <classpath>
     1089                <pathelement location="build/i2p.jar" />
     1090            </classpath>
     1091            <arg value="verifyversion" />
    10711092            <arg value="i2pupdate.su2" />
    10721093        </java>
Note: See TracChangeset for help on using the changeset viewer.