Changeset bb56a11 for build.xml


Ignore:
Timestamp:
Dec 8, 2015 5:27:03 AM (4 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
77a6db1
Parents:
843e2a8 (diff), 7ea2be3 (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.unittests' (head 53586f73fb813f519cdb6a1f7b1b40efec2e35dc)

to branch 'i2p.i2p' (head 628a2c591ca44095e2f93acd026046d4512cf692)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r843e2a8 rbb56a11  
    869869
    870870    <target name="-pre-release">
     871            <fail message="javac.compilerargs must contain a -bootclasspath option in override.properties">
     872                <condition>
     873                    <not><contains string="${javac.compilerargs}" substring="-bootclasspath"/></not>
     874                </condition>
     875            </fail>
     876            <fail message="build.built-by must be set in override.properties">
     877                <condition>
     878                    <equals arg1="${build.built-by}" arg2="unknown"/>
     879                </condition>
     880            </fail>
     881            <fail message="require.gettext must be true">
     882                <condition>
     883                    <not><equals arg1="${require.gettext}" arg2="true"/></not>
     884                </condition>
     885            </fail>
    871886            <echo message="================================================================" />
    872887            <echo message="Did you update these files?" />
     
    14511466
    14521467    <!-- All jetty jars required for update.
    1453          We don't need commons-el or commons-logging, they haven't changed.
    14541468         TODO do we need to bother updating jasper?
    1455          TODO where is JMX? We don't need it I hope.
    14561469      -->
    14571470    <target name="prepjupdate" depends="prepupdate, buildWEB">
     
    17901803        <copy file="i2pinstall_${full.version}.jar" tofile="i2pinstall_${release.number}.jar" />
    17911804        <copy file="i2pinstall_${full.version}_windows.exe" tofile="i2pinstall_${release.number}_windows.exe" />
     1805        <!-- remove these, we don't build them anymore -->
    17921806        <delete file="i2pupdate.sud" />
    17931807        <delete file="i2pupdate.su2" />
    1794         <!-- make this a lot easier by putting release.privkey=/path/to/privkey in override.properties -->
    1795 
    1796         <!-- now build and verify the packed sud from the packed zip -->
    1797         <sudsign infile="i2pupdate.zip" outfile="i2pupdate.sud" />
    1798 
    1799         <!-- now build and verify the packed su2 from the packed zip -->
    1800         <sudsign infile="i2pupdate200.zip" outfile="i2pupdate.su2" />
     1808        <!-- make this a lot easier by putting release.privkey.su3=/path/to/su3keystore.ks in override.properties -->
     1809
    18011810        <!-- now build and verify the packed su3 from the packed zip -->
    18021811        <su3sign infile="i2pupdate200.zip" sigtype="ROUTER" outfile="i2pupdate.su3" su3.ver="${release.number}" />
     
    18361845        <chmod perm="444" type="file">
    18371846            <fileset dir="${basedir}">
    1838                 <include name="i2pupdate.su2" />
    18391847                <include name="i2pupdate.su3" />
    1840                 <include name="i2pupdate.sud" />
    18411848            </fileset>
    18421849        </chmod>
     
    18481855            <arg value="i2psource_${release.number}.tar.bz2" />
    18491856            <arg value="i2pupdate_${release.number}.zip" />
    1850             <arg value="i2pupdate.su2" />
    18511857            <arg value="i2pupdate.su3" />
    1852             <arg value="i2pupdate.sud" />
    18531858            <arg value="i2pinstall_${release.number}_windows.exe.sig" />
    18541859            <arg value="i2pinstall_${release.number}.jar.sig" />
     
    18611866        <sha256sum file="i2psource_${release.number}.tar.bz2" />
    18621867        <sha256sum file="i2pupdate_${release.number}.zip" />
    1863         <sha256sum file="i2pupdate.su2" />
    18641868        <sha256sum file="i2pupdate.su3" />
    1865         <sha256sum file="i2pupdate.sud" />
    18661869        <!-- make torrent files -->
    1867         <copy file="i2pupdate.sud" tofile="i2pupdate-${release.number}.sud" />
    1868         <mktorrent file="i2pupdate-${release.number}.sud" />
    1869         <copy file="i2pupdate.su2" tofile="i2pupdate-${release.number}.su2" />
    1870         <mktorrent file="i2pupdate-${release.number}.su2" />
    18711870        <copy file="i2pupdate.su3" tofile="i2pupdate-${release.number}.su3" />
    18721871        <mktorrent file="i2pupdate-${release.number}.su3" />
Note: See TracChangeset for help on using the changeset viewer.