Changeset be7770e for build.xml


Ignore:
Timestamp:
Jan 2, 2012 7:07:09 PM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
ab0e8d9
Parents:
60c5f06
Message:

Add EXTRAVERSION to the build number, custom installers, javadocs

With this check-in I'm adding the EXTRAVERSION to our javadocs and the custom
installer targets (if EXTRAVERSION is set in RouterVersion?.java). Also,
i2pinstall*jar and i2pinstall.bz2 will be removed when ant clean is run.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r60c5f06 rbe7770e  
    381381            use="true"
    382382            splitindex="true"
    383             doctitle="I2P Javadocs for Release ${release.number} Build ${build.number}"
     383            doctitle="I2P Javadocs for Release ${release.number} Build ${build.number}${build.extra}"
    384384            windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
    385385            <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.*" />
     
    470470            <arg value="-d;" />
    471471        </exec>
    472         <echo message="Build number is ${build.number}" />
     472        <exec executable="awk" outputproperty="build.extra" failonerror="false">
     473            <arg value="-F&quot;" />
     474            <arg value="/public final static String EXTRA/{print $2}" />
     475            <arg value="router/java/src/net/i2p/router/RouterVersion.java" />
     476        </exec>
     477        <echo message="Build number is ${build.number}${build.extra}" />
    473478    </target>
    474479
     
    479484        <delete file="i2p.exe" failonerror="false" quiet="true" />
    480485        <delete file="syndie-standalone.zip" failonerror="false" quiet="true" />
     486        <delete>
     487            <fileset dir="." includes="i2pinstall*jar i2pinstall*bz2" />
     488        </delete>
    481489        <delete file="i2psnark-standalone.zip" failonerror="false" quiet="true" />
    482490        <delete file="BOB-one.jar" failonerror="false" quiet="true" /> 
     
    10421050        <!-- set if unset -->
    10431051        <property name="workspace.changes.util.tr" value="" />
    1044         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-freebsd-only.jar" installerType="standard" basedir="${basedir}" />
     1052        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_freebsd-only.jar" installerType="standard" basedir="${basedir}" />
    10451053    </target>
    10461054
     
    10491057        <!-- set if unset -->
    10501058        <property name="workspace.changes.util.tr" value="" />
    1051         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-linux-only.jar" installerType="standard" basedir="${basedir}" />
     1059        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_linux-only.jar" installerType="standard" basedir="${basedir}" />
    10521060    </target>
    10531061
     
    10581066        <!-- set if unset -->
    10591067        <property name="workspace.changes.util.tr" value="" />
    1060         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-osx-only.jar" installerType="standard" basedir="${basedir}" />
     1068        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_osx-only.jar" installerType="standard" basedir="${basedir}" />
    10611069        <ant target="installer2app" />
    10621070        <delete dir="pkg-temp/osx" />
     
    10711079        <exec executable="python" failonerror="true">
    10721080            <arg value="${user.home}/IzPack/utils/wrappers/izpack2app/izpack2app.py" />
    1073             <arg value="${basedir}/i2pinstall_${release.number}-osx-only.jar" />
    1074             <arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-osx-install.app" />
     1081            <arg value="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_osx-only.jar" />
     1082            <arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-${build.number}${build.extra}_osx-install.app" />
    10751083        </exec>
    10761084        <exec executable="chmod" failonerror="true" osfamily="unix">
    10771085                <arg value="755" />
    1078                 <arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-osx-install.app/Contents/MacOS/JavaApplicationStub" />
     1086                <arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-${build.number}${build.extra}_osx-install.app/Contents/MacOS/JavaApplicationStub" />
    10791087        </exec>
    10801088        <exec executable="tar" osfamily="unix" failonerror="true">
     
    10821090                <arg value="--group=root" />
    10831091                <arg value="-cjvf" />
    1084                 <arg value="${basedir}/i2pinstall_${release.number}-osx.tar.bz2" />
     1092                <arg value="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_osx.tar.bz2" />
    10851093                <arg value="-C" />
    10861094                <arg value="${basedir}/pkg-temp/osx" />
    1087                 <arg value="i2p-${release.number}-osx-install.app" />
     1095                <arg value="i2p-${release.number}-${build.number}${build.extra}_osx-install.app" />
    10881096        </exec>
    10891097    </target>
     
    11201128            </manifest>
    11211129        </jar>
    1122         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-windows-only.jar" installerType="standard" basedir="${basedir}" />
     1130        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_windows-only.jar" installerType="standard" basedir="${basedir}" />
    11231131        <delete dir="pkg-temp/win" />
    11241132    </target>
Note: See TracChangeset for help on using the changeset viewer.