I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

2008-03-09 Complication

Browse Source 
* Give the Jetty build file ability to ask permission
      before downloading the Jetty archive from the web,
      and to verify its SHA1 + MD5 hashes. Adjust the main build file
      in accordance with this change.
    * Improve the release checklist.
This commit is contained in:
complication
2008-03-08 20:37:45 +00:00
parent cffcbe5f94
commit 6606c83cb2
5 changed files with 85 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
apps/jetty/build.xml
View File

@ -1,25 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<project basedir="." default="all" name="jetty">
<property name="jetty.sha1" value="021164f84da7304bd1ff07c268b45aa3e0b13322" />
<property name="jetty.md5" value="a61adc832be6baf2678935506743cfc3" />
<property name="jetty.url" value="http://mesh.dl.sourceforge.net/sourceforge/jetty/jetty-5.1.12.zip" />
<property name="jetty.filename" value="jetty-5.1.12.zip" />
<target name="all" depends="build" />
<target name="fetchJettylib" >
<available property="jetty.zip.available" file="jetty-5.1.12.zip" type="file" />
<target name="ensureJettylib" >
<available property="jetty.zip.available" file="${jetty.filename}" type="file" />
<available property="jetty.zip.extracted" file="jettylib" type="dir" />
<ant target="doFetchJettylib" />
<ant target="doExtractJettylib" />
<ant target="fetchJettylib" />
<ant target="verifyJettylib" />
<ant target="extractJettylib" />
</target>
<target name="doFetchJettylib" unless="jetty.zip.available" >
<echo message="The libraries contained within the fetched file are from Jetty's 5.1.12" />
<echo message="distribution (http://jetty.mortbay.org/). These are not " />
<echo message="necessary for using I2P, but are used by some applications on top of I2P," />
<echo message="such as the routerconsole." />
<get src="http://mesh.dl.sourceforge.net/sourceforge/jetty/jetty-5.1.12.zip" verbose="true" dest="jetty-5.1.12.zip" />
<target name="fetchJettylib" unless="jetty.zip.available" >
<echo message="It seems that you don't have '${jetty.filename}' deployed." />
<echo message="The build script can download this file for you automatically," />
<echo message="or alternatively you can obtain it manually from:" />
<echo message="${jetty.url}" />
<echo message="" />
<echo message="The libraries contained in the fetched file provide the Jetty web server" />
<echo message="(http://jetty.mortbay.org/). They are not absolutely necessary" />
<echo message="but strongly recommended, since they are used by some applications" />
<echo message="on top of I2P, like the router console." />
<echo message="" />
<echo message="Even if you deploy the Jetty archive manually, the build script will" />
<echo message="still attempt to verify its checksums, which must be:" />
<echo message="SHA1 ${jetty.sha1}" />
<echo message="MD5 ${jetty.md5}" />
<echo message="" />
<input message="Download Jetty archive automatically?" validargs="y,n" addproperty="jetty.download" />
<fail message="Aborting as requested. Please deploy the Jetty archive manually." >
<condition>
<equals arg1="${jetty.download}" arg2="n"/>
</condition>
</fail>
<get src="${jetty.url}" verbose="true" dest="${jetty.filename}" />
</target>
<target name="doExtractJettylib" unless="jetty.zip.extracted" >
<ant target="doExtract" />
<target name="verifyJettylib" >
<condition property="jetty.zip.verified" >
<and>
<checksum file="${jetty.filename}" algorithm="SHA" property="${jetty.sha1}" />
<checksum file="${jetty.filename}" algorithm="MD5" property="${jetty.md5}" />
</and>
</condition>
<fail message="Jetty archive does not match its checksums!" >
<condition>
<not>
<istrue value="${jetty.zip.verified}" />
</not>
</condition>
</fail>
</target>
<target name="doExtract">
<unzip src="jetty-5.1.12.zip" dest="." />
<target name="extractJettylib" unless="jetty.zip.extracted" >
<unzip src="${jetty.filename}" dest="." />
<mkdir dir="jettylib" />
<copy todir="jettylib">
<fileset dir="jetty-5.1.12/lib">
@ -30,7 +69,7 @@
<fileset dir="jetty-5.1.12/ext">
<include name="ant.jar" />
<include name="commons-el.jar" />
<include name="commons-logging.jar" />
<include name="commons-logging.jar" />
<include name="jasper-compiler.jar" />
<include name="jasper-runtime.jar" />
<include name="javax.servlet.jar" />
@ -40,7 +79,8 @@
</copy>
<delete dir="jetty-5.1.12" />
</target>
<target name="build" depends="fetchJettylib" />
<target name="build" depends="ensureJettylib" />
<target name="builddep" />
<target name="compile" />
<target name="jar" />

2
build.xml
View File

@ -42,7 +42,7 @@
<copy file="router/java/build/router.jar" todir="build/" />
</target>
<target name="buildWEB">
<ant dir="apps/jetty" target="fetchJettylib" />
<ant dir="apps/jetty" target="ensureJettylib" />
<ant dir="apps/routerconsole/java" target="build" />
<copy file="apps/routerconsole/java/build/routerconsole.jar" todir="build/" />
<copy file="apps/routerconsole/java/build/routerconsole.war" todir="build/" />

26
checklist.txt
View File

@ -4,6 +4,7 @@ Release checklist
Sync with mtn.i2p2.i2p
Start with a clean checkout mtn -d i2p.mtn co --branch=i2p.i2p
Double-check trust list
Deploy the Jetty archive, a clean checkout lacks it
Change revision in:
history.txt
@ -16,7 +17,7 @@ Change revision in:
Build and tag:
ant dist
mtn ci
mtn tag i2p-0.6.1.xx h:
mtn tag h: i2p-0.6.1.xx
Sync with mtn.i2p2.i2p
Create a signed update file with:
@ -33,12 +34,23 @@ Make the source tarball:
tar cjf i2psource-0.6.1.xx.tar.bz2 --exclude i2p-0.6.1.xx/_MTN i2p-0.6.1.xx
mv i2p-0.6.1.xx.tar.bz2 i2p.i2p
More signatures:
sha1sum i2pinstall.exe i2p.tar.bz2 i2psource-0.6.1.xx.tar.bz2 i2pupdate.zip
gpg -b i2pinstall.exe
gpg -b i2p.tar.bz2
gpg -b i2p-0.6.1.xx.tar.bz2
gpg -b i2pupdate.zip
Until the build script gets this ability, you need to rename some files:
mv i2pinstall.exe i2pinstall-0.6.1.xx.exe
mv i2p.tar.bz2 i2pheadless-0.6.1.xx.tar.bz2
mv i2pupdate.zip i2pupdate-0.6.1.xx.zip
you probably don't need to rename i2pupdate.sud
Generate hashes:
sha1sum i2p*0.6.1.xx.*
sha1sum i2pupdate.sud
now GPG-sign an announcement with the hashes
Generate PGP signatures:
gpg -b i2pinstall-0.6.1.xx.exe
gpg -b i2pheadless-0.6.1.xx.tar.bz2
gpg -b i2psource-0.6.1.xx.tar.bz2
gpg -b i2pupdate-0.6.1.xx.zip
gpg -b i2pupdate.sud
Distribute files to download locations and to www.i2p2.i2p

7
history.txt
View File

@ -1,3 +1,10 @@
2008-03-09 Complication
* Give the Jetty build file ability to ask permission
before downloading the Jetty archive from the web,
and to verify its SHA1 + MD5 hashes. Adjust the main build file
in accordance with this change.
* Improve the release checklist.
* 2008-03-09 0.6.1.32 released
2008-03-07 zzz

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -17,7 +17,7 @@ import net.i2p.CoreVersion;
public class RouterVersion {
public final static String ID = "$Revision: 1.548 $ $Date: 2008-02-10 15:00:00 $";
public final static String VERSION = "0.6.1.32";
public final static long BUILD = 0;
public final static long BUILD = 1;
public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
System.out.println("Router ID: " + RouterVersion.ID);