Changeset 9f3d5bf for build.xml


Ignore:
Timestamp:
May 6, 2015 11:24:08 PM (5 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
b12f988
Parents:
7f9e958
Message:

use the full version string (including build number) in the signed-* build targets

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r7f9e958 r9f3d5bf  
    176176        <attribute name="outfile" />
    177177        <attribute name="sigtype" />
     178        <attribute name="su3.ver" />
    178179        <sequential>
    179180        <input message="Enter su3 private signing key store:" addproperty="release.privkey.su3" />
     
    212213                <arg value="@{outfile}" />
    213214                <arg value="${release.privkey.su3}" />
    214                 <arg value="${release.number}" />
     215                <arg value="@{su3.ver}" />
    215216                <arg value="${release.signer.su3}" />
    216217            </java>
     
    257258         so the build will go faster.
    258259      -->
     260
     261    <target name="-setepoch">
     262        <script language="javascript">
     263            <![CDATA[
     264              property = project.setProperty("epoch",Math.floor((new Date()).getTime()/1000));
     265            ]]>
     266        </script>
     267    </target>
    259268
    260269    <target name="buildBOB" depends="buildStreaming" >
     
    12201229    </target>
    12211230
    1222     <target name="i2pseeds" depends="-areRouterInfosEnabled, prepRouterInfos">
     1231    <target name="i2pseeds" depends="-setepoch, -areRouterInfosEnabled, prepRouterInfos">
    12231232        <delete file="i2pseeds.zip" />
    12241233        <delete file="i2pseeds.su3" />
    12251234        <zip destfile="i2pseeds.zip" basedir="pkg-temp/netDb" whenempty="fail" />
    1226         <su3sign infile="i2pseeds.zip" sigtype="RESEED" outfile="i2pseeds.su3" />
     1235        <su3sign infile="i2pseeds.zip" sigtype="RESEED" outfile="i2pseeds.su3" su3.ver="${epoch}" />
    12271236    </target>
    12281237
     
    12901299
    12911300    <target name="-sign-update" depends="buildrouter">
    1292         <su3sign infile="i2pupdate200.zip" sigtype="ROUTER" outfile="i2pupdate.su3" />
     1301        <su3sign infile="i2pupdate200.zip" sigtype="ROUTER" outfile="i2pupdate.su3" su3.ver="${full.version}" />
    12931302    </target>
    12941303
     
    17701779        <sudsign infile="i2pupdate200.zip" outfile="i2pupdate.su2" />
    17711780        <!-- now build and verify the packed su3 from the packed zip -->
    1772         <su3sign infile="i2pupdate200.zip" sigtype="ROUTER" outfile="i2pupdate.su3" />
     1781        <su3sign infile="i2pupdate200.zip" sigtype="ROUTER" outfile="i2pupdate.su3" su3.ver="${release.number}" />
    17731782        <!-- this will use the monotonerc file in the current workspace -->
    17741783        <echo message="Checking out fresh copy into ../i2p-${release.number} for tarballing:" />
Note: See TracChangeset for help on using the changeset viewer.