Changeset 6606c83


Ignore:
Timestamp:
Mar 8, 2008 8:37:45 PM (13 years ago)
Author:
complication <complication@…>
Branches:
master
Children:
b1beb46c
Parents:
cffcbe5
Message:

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.
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    rcffcbe5 r6606c83  
    11<?xml version="1.0" encoding="UTF-8"?>
    22<project basedir="." default="all" name="jetty">
    3        
     3
     4    <property name="jetty.sha1" value="021164f84da7304bd1ff07c268b45aa3e0b13322" />
     5    <property name="jetty.md5" value="a61adc832be6baf2678935506743cfc3" />
     6    <property name="jetty.url" value="http://mesh.dl.sourceforge.net/sourceforge/jetty/jetty-5.1.12.zip" />
     7    <property name="jetty.filename" value="jetty-5.1.12.zip" />
     8
    49    <target name="all" depends="build" />
    5     <target name="fetchJettylib" >
    6         <available property="jetty.zip.available" file="jetty-5.1.12.zip" type="file" />
     10
     11    <target name="ensureJettylib" >
     12        <available property="jetty.zip.available" file="${jetty.filename}" type="file" />
    713        <available property="jetty.zip.extracted" file="jettylib" type="dir" />
    8         <ant target="doFetchJettylib" />
    9         <ant target="doExtractJettylib" />
     14        <ant target="fetchJettylib" />
     15        <ant target="verifyJettylib" />
     16        <ant target="extractJettylib" />
    1017    </target>
    11     <target name="doFetchJettylib" unless="jetty.zip.available" >
    12         <echo message="The libraries contained within the fetched file are from Jetty's 5.1.12" />
    13         <echo message="distribution (http://jetty.mortbay.org/).  These are not " />
    14         <echo message="necessary for using I2P, but are used by some applications on top of I2P," />
    15         <echo message="such as the routerconsole." />
    16         <get src="http://mesh.dl.sourceforge.net/sourceforge/jetty/jetty-5.1.12.zip" verbose="true" dest="jetty-5.1.12.zip" />
     18
     19    <target name="fetchJettylib" unless="jetty.zip.available" >
     20        <echo message="It seems that you don't have '${jetty.filename}' deployed." />
     21        <echo message="The build script can download this file for you automatically," />
     22        <echo message="or alternatively you can obtain it manually from:" />
     23        <echo message="${jetty.url}" />
     24        <echo message="" />
     25        <echo message="The libraries contained in the fetched file provide the Jetty web server" />
     26        <echo message="(http://jetty.mortbay.org/). They are not absolutely necessary" />
     27        <echo message="but strongly recommended, since they are used by some applications" />
     28        <echo message="on top of I2P, like the router console." />
     29        <echo message="" />
     30        <echo message="Even if you deploy the Jetty archive manually, the build script will" />
     31        <echo message="still attempt to verify its checksums, which must be:" />
     32        <echo message="SHA1 ${jetty.sha1}" />
     33        <echo message="MD5 ${jetty.md5}" />
     34        <echo message="" />
     35        <input message="Download Jetty archive automatically?" validargs="y,n" addproperty="jetty.download" />
     36        <fail message="Aborting as requested. Please deploy the Jetty archive manually." >
     37            <condition>
     38                <equals arg1="${jetty.download}" arg2="n"/>
     39            </condition>
     40        </fail>
     41        <get src="${jetty.url}" verbose="true" dest="${jetty.filename}" />
    1742    </target>
    18     <target name="doExtractJettylib" unless="jetty.zip.extracted" >
    19         <ant target="doExtract" />
     43
     44    <target name="verifyJettylib" >
     45        <condition property="jetty.zip.verified" >
     46            <and>
     47                <checksum file="${jetty.filename}" algorithm="SHA" property="${jetty.sha1}" />
     48                <checksum file="${jetty.filename}" algorithm="MD5" property="${jetty.md5}" />
     49            </and>
     50        </condition>
     51        <fail message="Jetty archive does not match its checksums!" >
     52            <condition>
     53                <not>
     54                    <istrue value="${jetty.zip.verified}" />
     55                </not>
     56            </condition>
     57        </fail>
    2058    </target>
    21     <target name="doExtract">
    22         <unzip src="jetty-5.1.12.zip" dest="." />
     59
     60    <target name="extractJettylib" unless="jetty.zip.extracted" >
     61        <unzip src="${jetty.filename}" dest="." />
    2362        <mkdir dir="jettylib" />
    2463        <copy todir="jettylib">
     
    3170                <include name="ant.jar" />
    3271                <include name="commons-el.jar" />
    33                 <include name="commons-logging.jar" />
     72                <include name="commons-logging.jar" />
    3473                <include name="jasper-compiler.jar" />
    3574                <include name="jasper-runtime.jar" />
     
    4180        <delete dir="jetty-5.1.12" />
    4281    </target>
    43     <target name="build" depends="fetchJettylib" />
     82
     83    <target name="build" depends="ensureJettylib" />
    4484    <target name="builddep" />
    4585    <target name="compile" />
  • build.xml

    rcffcbe5 r6606c83  
    4343    </target>
    4444    <target name="buildWEB">
    45         <ant dir="apps/jetty" target="fetchJettylib" />
     45        <ant dir="apps/jetty" target="ensureJettylib" />
    4646        <ant dir="apps/routerconsole/java" target="build" />
    4747        <copy file="apps/routerconsole/java/build/routerconsole.jar" todir="build/" />
  • checklist.txt

    rcffcbe5 r6606c83  
    55Start with a clean checkout mtn -d i2p.mtn co --branch=i2p.i2p
    66Double-check trust list
     7Deploy the Jetty archive, a clean checkout lacks it
    78
    89Change revision in:
     
    1718        ant dist
    1819        mtn ci
    19         mtn tag i2p-0.6.1.xx h:
     20        mtn tag h: i2p-0.6.1.xx
    2021        Sync with mtn.i2p2.i2p
    2122
     
    3435        mv i2p-0.6.1.xx.tar.bz2 i2p.i2p
    3536
    36 More signatures:
    37         sha1sum i2pinstall.exe i2p.tar.bz2 i2psource-0.6.1.xx.tar.bz2 i2pupdate.zip
    38         gpg -b i2pinstall.exe
    39         gpg -b i2p.tar.bz2
    40         gpg -b i2p-0.6.1.xx.tar.bz2
    41         gpg -b i2pupdate.zip
     37Until the build script gets this ability, you need to rename some files:
     38        mv i2pinstall.exe i2pinstall-0.6.1.xx.exe
     39        mv i2p.tar.bz2 i2pheadless-0.6.1.xx.tar.bz2
     40        mv i2pupdate.zip i2pupdate-0.6.1.xx.zip
     41        you probably don't need to rename i2pupdate.sud
     42
     43Generate hashes:
     44        sha1sum i2p*0.6.1.xx.*
     45        sha1sum i2pupdate.sud
     46        now GPG-sign an announcement with the hashes
     47
     48Generate PGP signatures:
     49        gpg -b i2pinstall-0.6.1.xx.exe
     50        gpg -b i2pheadless-0.6.1.xx.tar.bz2
     51        gpg -b i2psource-0.6.1.xx.tar.bz2
     52        gpg -b i2pupdate-0.6.1.xx.zip
     53        gpg -b i2pupdate.sud
    4254
    4355Distribute files to download locations and to www.i2p2.i2p
  • history.txt

    rcffcbe5 r6606c83  
     12008-03-09 Complication
     2    * Give the Jetty build file ability to ask permission
     3      before downloading the Jetty archive from the web,
     4      and to verify its SHA1 + MD5 hashes. Adjust the main build file
     5      in accordance with this change.
     6    * Improve the release checklist.
     7
    18* 2008-03-09  0.6.1.32 released
    29
  • router/java/src/net/i2p/router/RouterVersion.java

    rcffcbe5 r6606c83  
    1818    public final static String ID = "$Revision: 1.548 $ $Date: 2008-02-10 15:00:00 $";
    1919    public final static String VERSION = "0.6.1.32";
    20     public final static long BUILD = 0;
     20    public final static long BUILD = 1;
    2121    public static void main(String args[]) {
    2222        System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
Note: See TracChangeset for help on using the changeset viewer.