Changeset 6a48910


Ignore:
Timestamp:
Nov 26, 2017 3:27:06 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
03588e76
Parents:
fb4fb47
Message:

Build: add xenial release target, it will be our 4th launchpad flavor.
build.xml cleanups
doc updates

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    rfb4fb47 r6a48910  
    433433    <!-- end of sub-build.xml targets -->
    434434
     435    <!-- monotone targets -->
     436
    435437    <target name="checkForMtn" >
    436438        <available property="mtn.available" file="_MTN" type="dir" />
     439    </target>
     440
     441    <target name="failIfNoMtn" depends="checkForMtn">
     442        <fail message="This target cannot be used without Monotone! Use &quot;fakeroot debian/rules get-orig-source&quot; instead.">
     443            <condition>
     444                <not>
     445                    <isset property="mtn.available" />
     446                </not>
     447            </condition>
     448        </fail>
    437449    </target>
    438450
     
    490502            match='(^\s+public\s+final\s+static\s+long\s+BUILD\s+=\s+)[0-9]+;' replace='\1${new.i2p.build.number};'/>
    491503    </target>
     504
     505    <!-- end monotone targets -->
     506
     507    <!-- launch4j targets -->
    492508
    493509    <condition property="noExe">
     
    534550     </target>
    535551
     552    <!-- end launch4j targets -->
     553
    536554     <!--
    537555          the files are now copied to the build directory
     
    546564        <copy file="apps/susidns/src/lib/standard.jar" todir="build/" />
    547565    </target>
     566
     567    <!-- jbigi targets -->
    548568
    549569    <target name="jbigi-list-changes" depends="checkForMtn" if="mtn.available">
     
    677697        </jar>
    678698    </target>
     699
     700    <!-- end jbigi targets -->
    679701
    680702    <!-- the apps need to compile the jsps to poupdate -->
     
    933955    </target>
    934956
    935     <target name="-pre-release" depends="-pre-sign">
     957    <target name="-pre-release" depends="-pre-sign, failIfNoMtn">
    936958            <echo message="================================================================" />
    937959            <echo message="Did you update these files?" />
     
    20322054
    20332055    <target name="mavenCentral.deps" depends="buildRouter, buildStreaming">
    2034         <ant dir="core/java/" target="javadocJar" />
    2035         <ant dir="core/java/" target="sourcesJar" />
    2036         <ant dir="router/java/" target="javadocJar" />
    2037         <ant dir="router/java/" target="sourcesJar" />
    2038         <ant dir="apps/ministreaming/java/" target="javadocJar" />
    2039         <ant dir="apps/ministreaming/java/" target="sourcesJar" />
    2040         <ant dir="apps/streaming/java/" target="javadocJar" />
    2041         <ant dir="apps/streaming/java/" target="sourcesJar" />
    2042         <ant dir="apps/jetty/" target="servletJar" />
    2043         <ant dir="apps/jetty/" target="servletJavadocJar" />
    2044         <ant dir="apps/jetty/" target="servletSourcesJar" />
     2056        <ant dir="core/java/">
     2057            <target name="javadocJar" />
     2058            <target name="sourcesJar" />
     2059        </ant>
     2060        <ant dir="router/java/">
     2061            <target name="javadocJar" />
     2062            <target name="sourcesJar" />
     2063        </ant>
     2064        <ant dir="apps/ministreaming/java/">
     2065            <target name="javadocJar" />
     2066            <target name="sourcesJar" />
     2067        </ant>
     2068        <ant dir="apps/streaming/java/">
     2069            <target name="javadocJar" />
     2070            <target name="sourcesJar" />
     2071        </ant>
     2072        <ant dir="apps/jetty/">
     2073            <target name="servletJar" />
     2074            <target name="servletJavadocJar" />
     2075            <target name="servletSourcesJar" />
     2076        </ant>
    20452077    </target>
    20462078
     
    22432275    </target>
    22442276
    2245     <target name="debian-tarball" depends="getExtendedVersion">
     2277    <!-- stretch+, zesty+ -->
     2278    <target name="debian-tarball" depends="getExtendedVersion, failIfNoMtn">
    22462279        <!-- this will use the monotonerc file in the current workspace -->
    2247         <fail message="This target cannot be used without Monotone! Use &quot;fakeroot debian/rules get-orig-source&quot; instead.">
    2248             <condition>
    2249                 <not>
    2250                     <isset property="mtn.available" />
    2251                 </not>
    2252             </condition>
    2253         </fail>
    22542280        <property name="debian.tarball.name" value="i2p_${Extended.Version}.orig.tar.bz2" />
    22552281        <echo message="Checking out fresh copy into ../i2p-${Extended.Version} for tarballing:" />
     
    23132339      -  Launchpad does not allow different source packages with the same name.
    23142340      -->
    2315     <target name="precise-release-tarball" depends="getExtendedVersion">
    2316         <!-- this will use the monotonerc file in the current workspace -->
    2317         <fail message="This target cannot be used without Monotone! Use &quot;fakeroot debian/rules get-orig-source&quot; instead.">
    2318             <condition>
    2319                 <not>
    2320                     <isset property="mtn.available" />
    2321                 </not>
    2322             </condition>
    2323         </fail>
     2341    <target name="precise-release-tarball" depends="getExtendedVersion, failIfNoMtn">
    23242342        <property name="debian.tarball.name" value="i2p_${release.number}p.orig.tar.bz2" />
    23252343        <echo message="Checking out fresh copy into ../i2p-${Extended.Version} for tarballing:" />
     
    23882406    </target>
    23892407
     2408    <!-- xenial/yakkety only -->
     2409    <!-- same as debian-release-tarball but with bundled jstl.jar
     2410         (there's no libtaglibs-standard-* packages)
     2411      -  We add a 'x' to the release name and tarball since the source package is different;
     2412      -  Launchpad does not allow different source packages with the same name.
     2413      -->
     2414    <target name="xenial-release-tarball" depends="getExtendedVersion, failIfNoMtn">
     2415        <property name="debian.tarball.name" value="i2p_${release.number}x.orig.tar.bz2" />
     2416        <echo message="Checking out fresh copy into ../i2p-${Extended.Version} for tarballing:" />
     2417        <delete dir="../i2p-${Extended.Version}" />
     2418        <exec executable="mtn" failonerror="true">
     2419            <arg value="co" />
     2420            <!-- w: is the revision of the current workspace -->
     2421            <arg value="-r" />
     2422            <arg value="w:" />
     2423            <arg value="-b" />
     2424            <arg value="i2p.i2p" />
     2425            <arg value="../i2p-${Extended.Version}" />
     2426        </exec>
     2427        <delete includeemptydirs="true" quiet="false" failonerror="false">
     2428            <fileset dir="../i2p-${Extended.Version}/debian-alt/" />
     2429            <fileset dir="../i2p-${Extended.Version}/installer/lib/" />
     2430            <fileset dir="../i2p-${Extended.Version}/Slackware" />
     2431            <fileset dir="../i2p-${Extended.Version}/_MTN" />
     2432            <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/gettext" />
     2433            <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/getopt" />
     2434          <!--
     2435            <fileset dir="../i2p-${Extended.Version}/core/java/src/org/apache/http" />
     2436           -->
     2437            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
     2438            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
     2439            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
     2440            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
     2441          <!--
     2442            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
     2443           -->
     2444            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
     2445            <!-- anything added above, add in debian-tarball also -->
     2446        </delete>
     2447        <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
     2448            <tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${release.number}">
     2449                <include name="**/**" />
     2450                <exclude name="debian/**"/>
     2451                <exclude name="debian-alt/**"/>
     2452                <exclude name="**/*.sh"/>
     2453                <exclude name="installer/resources/geoip.txt"/>
     2454                <exclude name="installer/resources/geoipv6.dat.gz"/>
     2455                <exclude name="apps/jetty/jetty-distribution-*/**"/>
     2456                <exclude name="apps/jetty/apache-tomcat-*/**"/>
     2457              <!--
     2458                <exclude name="apps/susidns/src/lib/jstl.jar" />
     2459               -->
     2460                <exclude name="apps/susidns/src/lib/standard.jar" />
     2461                <!-- anything added above, add in debian-tarball also -->
     2462            </tarfileset>
     2463            <tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${release.number}" filemode="755">
     2464                <exclude name="debian/**" />
     2465                <include name="**/*.sh" />
     2466            </tarfileset>
     2467        </tar>
     2468    </target>
     2469
     2470    <!-- stretch+, zesty+ -->
    23902471    <!-- same as debian-tarball but with a release tar.bz2 file name and tar prefix -->
    2391     <target name="debian-release-tarball" depends="getExtendedVersion">
    2392         <!-- this will use the monotonerc file in the current workspace -->
    2393         <fail message="This target cannot be used without Monotone! Use &quot;fakeroot debian/rules get-orig-source&quot; instead.">
    2394             <condition>
    2395                 <not>
    2396                     <isset property="mtn.available" />
    2397                 </not>
    2398             </condition>
    2399         </fail>
     2472    <target name="debian-release-tarball" depends="getExtendedVersion, failIfNoMtn">
    24002473        <property name="debian.tarball.name" value="i2p_${release.number}.orig.tar.bz2" />
    24012474        <echo message="Checking out fresh copy into ../i2p-${Extended.Version} for tarballing:" />
  • debian-alt/doc/debian-build.txt

    rfb4fb47 r6a48910  
    9494reprepro -v copysrc jessie trusty i2p
    9595
    96 # To copy xenial to stretch:
     96# To copy zesty to stretch:
    9797# Note that syntax is reprepro copysrc TO FROM package!
    98 reprepro -v copysrc stretch xenial i2p
     98reprepro -v copysrc stretch zesty i2p
    9999
    100100# install in the architectures not copied from ubuntu
  • debian-alt/doc/launchpad.txt

    rfb4fb47 r6a48910  
    5050     if you want to sign with a subkey)
    5151    run gpg -K to list your private keys
    52 - ant debian-release-tarball (ant precise-release-tarball for precise/trusty)
     52- ant debian-release-tarball (this is currently for zesty and higher)
     53  (ant precise-release-tarball for precise thru wily... only do this once for both the precise and trusty build)
     54  (ant xenial-release-tarball for xenial and yakkety)
    5355  this will make a directory ../i2p-0.9.XX-0-xxxxxxxx/
    5456  and a tarball ../i2p_0.9.XX.orig.tar.bz2
  • installer/resources/checklist.md

    rfb4fb47 r6a48910  
    1 # Release checklist
     1# Release checklist and process
    22
    33## One week before
     
    2626
    2727- Review Google Play crash reports, fix any related issues
     28
     29- Initial review: Review the complete diff from the last release, fix any issues
     30
     31- Trial Debian build: Build and test a preliminary Debian build
     32  with 'ant debian' and fix any issues
    2833
    2934
     
    237242
    238243
     244### Android build
     245
     2461. See branch i2p.android.base for build instructions
     247
     2482. Upload to Google Play, F-Droid, and website
     249
     2503. Announce on Twitter
     251
     252
    239253### Notify release
    240254
     
    2572714. Announce on:
    258272  - #i2p, #i2p-dev (also on Freenode side)
    259   - forum.i2p
     273  - IRC
    260274  - Twitter
    261275
     
    263277   (see debian-alt/doc/launchpad.txt for instructions)
    264278
    265 6. Debian builds
     2796. Copy launchpad files to our Debian repo,
     280   or build Debian packages and upload them
    266281   (see debian-alt/doc/debian-build.txt for instructions)
    267282
    2682837. Announce Launchpad and Debian builds on Twitter
    269284
    270 8. Notify Tails that new Debian builds are available
     2858. Notify downstream Debian maintainer
     286
     2879. (if we get back into Tails) Notify Tails that new Debian builds are available
Note: See TracChangeset for help on using the changeset viewer.