Changeset 69bbb88 for build.xml


Ignore:
Timestamp:
Jan 8, 2012 2:55:10 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
7feaadb
Parents:
43ec87e (diff), 59bd51a (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' (head b7ee04ecc7a594239e977b25a52ebdabadce558e)

to branch 'i2p.i2p.zzz.jetty6' (head 2cd4a4dae8b87b9ed2128d83aff1b39e3a818556)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r43ec87e r69bbb88  
    3535        <echo message="  updater200: Updater compressed with pack200 (creates i2pupdate200.zip, 60% smaller)" />
    3636        <echo message="  updaterWithJavadoc: updater including the javadocs, for display in the console" />
     37        <echo message="  updater200WithJavadoc: updater including the javadocs, for display in the console (creates i2pupdate200.zip)" />
    3738        <echo message="  updaterWithJetty: Updater including Jetty" />
    3839        <echo message="  updater200withJetty: Updater including Jetty" />
     
    380381            use="true"
    381382            splitindex="true"
    382             doctitle="I2P Javadocs for Release ${release.number} Build ${build.number}"
     383            doctitle="I2P Javadocs for Release ${release.number} Build ${build.number}${build.extra}"
    383384            windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
    384385            <group title="Core SDK (i2p.jar)" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.crypto:org.bouncycastle.crypto.*:gnu.crypto.*:gnu.gettext:org.xlattice.crypto.filters:com.nettgryppa.security:net.metanotion:net.metanotion.*" />
     
    389390            <group title="Addressbook Application" packages="net.i2p.addressbook" />
    390391            <group title="BOB Bridge" packages="net.i2p.BOB" />
    391             <group title="Desktopgui Application" packages="net.i2p.desktopgui.*" />
     392            <group title="Desktopgui Application" packages="net.i2p.desktopgui:net.i2p.desktopgui.*" />
    392393            <group title="I2PSnark Application" packages="org.klomp.snark:org.klomp.snark.*" />
    393394            <group title="I2PTunnel Application" packages="net.i2p.i2ptunnel:net.i2p.i2ptunnel.*" />
     
    476477            <arg value="-d;" />
    477478        </exec>
    478         <echo message="Build number is ${build.number}" />
     479        <exec executable="awk" outputproperty="build.extra" failonerror="false">
     480            <arg value="-F&quot;" />
     481            <arg value="/public final static String EXTRA/{print $2}" />
     482            <arg value="router/java/src/net/i2p/router/RouterVersion.java" />
     483        </exec>
     484        <echo message="Build number is ${build.number}${build.extra}" />
    479485    </target>
    480486
     
    485491        <delete file="i2p.exe" failonerror="false" quiet="true" />
    486492        <delete file="syndie-standalone.zip" failonerror="false" quiet="true" />
     493        <delete>
     494            <fileset dir="." includes="i2pinstall*jar i2pinstall*bz2" />
     495        </delete>
    487496        <delete file="i2psnark-standalone.zip" failonerror="false" quiet="true" />
    488497        <delete file="BOB-one.jar" failonerror="false" quiet="true" /> 
     
    793802          <fileset dir="installer/resources/readme/" includes="readme*.html" />
    794803          <fileset dir="installer/resources/proxy/" includes="*.ht" />
    795           <!-- lang_ar.png added in 0.8.4; a1,a2,je, and eu.png added in 0.8.9; gg.png added in 0.8.10 -->
    796           <fileset dir="installer/resources/" includes="icons/flags/lang_ar.png icons/flags/gg.png icons/flags/je.png icons/flags/eu.png icons/flags/a1.png icons/flags/a2.png" />
     804          <!-- lang_ar.png added in 0.8.4; a1,a2,je, and eu.png added in 0.8.9; gg.png added in 0.8.10; im.png added in 0.8.12 -->
     805          <fileset dir="installer/resources/" includes="icons/flags/lang_ar.png icons/flags/gg.png icons/flags/je.png icons/flags/eu.png icons/flags/im.png icons/flags/a1.png icons/flags/a2.png" />
    797806        </copy>
    798807    </target>
     
    813822    <target name="updater" depends="prepupdate, preplicenses, zipit" />
    814823    <target name="updaterWithJavadoc" depends="prepupdate, preplicenses, copyJavadoc, zipit" />
     824    <target name="updater200WithJavadoc" depends="prepupdate, preplicenses, copyJavadoc, pack200, zipit200" />
    815825    <target name="updaterWithGeoIP" depends="prepupdate, prepgeoupdate, preplicenses, zipit" />
    816826    <target name="updaterWithJetty" depends="prepjupdate, preplicenses, zipit" />
     
    10491059        <!-- set if unset -->
    10501060        <property name="workspace.changes.util.tr" value="" />
    1051         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-freebsd-only.jar" installerType="standard" basedir="${basedir}" />
     1061        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_freebsd-only.jar" installerType="standard" basedir="${basedir}" />
    10521062    </target>
    10531063
     
    10561066        <!-- set if unset -->
    10571067        <property name="workspace.changes.util.tr" value="" />
    1058         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-linux-only.jar" installerType="standard" basedir="${basedir}" />
     1068        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_linux-only.jar" installerType="standard" basedir="${basedir}" />
    10591069    </target>
    10601070
     
    10651075        <!-- set if unset -->
    10661076        <property name="workspace.changes.util.tr" value="" />
    1067         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-osx-only.jar" installerType="standard" basedir="${basedir}" />
     1077        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_osx-only.jar" installerType="standard" basedir="${basedir}" />
    10681078        <ant target="installer2app" />
    10691079        <delete dir="pkg-temp/osx" />
     
    10781088        <exec executable="python" failonerror="true">
    10791089            <arg value="${user.home}/IzPack/utils/wrappers/izpack2app/izpack2app.py" />
    1080             <arg value="${basedir}/i2pinstall_${release.number}-osx-only.jar" />
    1081             <arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-osx-install.app" />
     1090            <arg value="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_osx-only.jar" />
     1091            <arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-${build.number}${build.extra}_osx-install.app" />
    10821092        </exec>
    10831093        <exec executable="chmod" failonerror="true" osfamily="unix">
    10841094                <arg value="755" />
    1085                 <arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-osx-install.app/Contents/MacOS/JavaApplicationStub" />
     1095                <arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-${build.number}${build.extra}_osx-install.app/Contents/MacOS/JavaApplicationStub" />
    10861096        </exec>
    10871097        <exec executable="tar" osfamily="unix" failonerror="true">
     
    10891099                <arg value="--group=root" />
    10901100                <arg value="-cjvf" />
    1091                 <arg value="${basedir}/i2pinstall_${release.number}-osx.tar.bz2" />
     1101                <arg value="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_osx.tar.bz2" />
    10921102                <arg value="-C" />
    10931103                <arg value="${basedir}/pkg-temp/osx" />
    1094                 <arg value="i2p-${release.number}-osx-install.app" />
     1104                <arg value="i2p-${release.number}-${build.number}${build.extra}_osx-install.app" />
    10951105        </exec>
    10961106    </target>
     
    11271137            </manifest>
    11281138        </jar>
    1129         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-windows-only.jar" installerType="standard" basedir="${basedir}" />
     1139        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_windows-only.jar" installerType="standard" basedir="${basedir}" />
    11301140        <delete dir="pkg-temp/win" />
    11311141    </target>
Note: See TracChangeset for help on using the changeset viewer.