Changeset 9f3d5bf

Timestamp:

May 6, 2015 11:24:08 PM (6 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:

• build.xml (modified) (6 diffs)

build.xml

@@ -176 +176 @@
         <attribute name="outfile" />
         <attribute name="sigtype" />
+        <attribute name="su3.ver" />
         <sequential>
         <input message="Enter su3 private signing key store:" addproperty="release.privkey.su3" />
@@ -212 +213 @@
                 <arg value="@{outfile}" />
                 <arg value="${release.privkey.su3}" />
-                <arg value="${release.number}" />
+                <arg value="@{su3.ver}" />
                 <arg value="${release.signer.su3}" />
             </java>
@@ -257 +258 @@
          so the build will go faster.
       -->
+
+    <target name="-setepoch">
+        <script language="javascript">
+            <![CDATA[
+              property = project.setProperty("epoch",Math.floor((new Date()).getTime()/1000));
+            ]]>
+        </script>
+    </target>
 
     <target name="buildBOB" depends="buildStreaming" >
@@ -1220 +1229 @@
     </target>
 
-    <target name="i2pseeds" depends="-areRouterInfosEnabled, prepRouterInfos">
+    <target name="i2pseeds" depends="-setepoch, -areRouterInfosEnabled, prepRouterInfos">
         <delete file="i2pseeds.zip" />
         <delete file="i2pseeds.su3" />
         <zip destfile="i2pseeds.zip" basedir="pkg-temp/netDb" whenempty="fail" />
-        <su3sign infile="i2pseeds.zip" sigtype="RESEED" outfile="i2pseeds.su3" />
+        <su3sign infile="i2pseeds.zip" sigtype="RESEED" outfile="i2pseeds.su3" su3.ver="${epoch}" />
     </target>
 
@@ -1290 +1299 @@
 
     <target name="-sign-update" depends="buildrouter">
-        <su3sign infile="i2pupdate200.zip" sigtype="ROUTER" outfile="i2pupdate.su3" />
+        <su3sign infile="i2pupdate200.zip" sigtype="ROUTER" outfile="i2pupdate.su3" su3.ver="${full.version}" />
     </target>
 
@@ -1770 +1779 @@
         <sudsign infile="i2pupdate200.zip" outfile="i2pupdate.su2" />
         <!-- now build and verify the packed su3 from the packed zip -->
-        <su3sign infile="i2pupdate200.zip" sigtype="ROUTER" outfile="i2pupdate.su3" />
+        <su3sign infile="i2pupdate200.zip" sigtype="ROUTER" outfile="i2pupdate.su3" su3.ver="${release.number}" />
         <!-- this will use the monotonerc file in the current workspace -->
         <echo message="Checking out fresh copy into ../i2p-${release.number} for tarballing:" />