Changeset 51c73fa


Ignore:
Timestamp:
Feb 21, 2012 3:47:14 PM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
b29a9f4
Parents:
b8a1ab0
Message:

build.xml: Rename build.number property so it doesn't conflict
with ant buildnumber target in other projects

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    rb8a1ab0 r51c73fa  
    190190            <format property="build.timestamp" pattern="yyyy-MM-dd HH:mm:ss z" timezone="UTC" locale="en" />
    191191        </tstamp>
    192         <property name="full.version" value="${release.number}-${build.number}${build.extra}" />
     192        <property name="full.version" value="${release.number}-${i2p.build.number}${build.extra}" />
    193193        <echo message="Building version ${full.version} (mtn rev ${workspace.version})" />
    194194    </target>
     
    405405            use="true"
    406406            splitindex="true"
    407             doctitle="I2P Javadocs for Release ${release.number} Build ${build.number}${build.extra}"
     407            doctitle="I2P Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
    408408            windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
    409409            <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.*" />
     
    466466            use="true"
    467467            splitindex="true"
    468             doctitle="I2P Unit Test Javadocs for Release ${release.number} Build ${build.number}${build.extra}"
     468            doctitle="I2P Unit Test Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
    469469            windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
    470470            <group title="Core SDK" 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.*" />
     
    526526        </exec>
    527527        <property name="build.temp.tr" value="??" />
    528         <exec executable="cut" inputstring="${build.temp.tr}" outputproperty="build.number" failifexecutionfails="false" >
     528        <exec executable="cut" inputstring="${build.temp.tr}" outputproperty="i2p.build.number" failifexecutionfails="false" >
    529529            <arg value="-f1" />
    530530            <arg value="-d;" />
     
    535535            <arg value="router/java/src/net/i2p/router/RouterVersion.java" />
    536536        </exec>
    537         <property name="build.number" value="??" />
     537        <property name="i2p.build.number" value="??" />
    538538        <property name="build.extra" value="" />
    539         <echo message="Build number is ${build.number}${build.extra}" />
     539        <echo message="Build number is ${i2p.build.number}${build.extra}" />
    540540    </target>
    541541
     
    549549            </condition>
    550550        </fail>
    551         <fail message="Non-zero build number: ${build.number}" >
     551        <fail message="Non-zero build number: ${i2p.build.number}" >
    552552            <condition>
    553553                <not>
    554                     <equals arg1="${build.number}" arg2="0"/>
     554                    <equals arg1="${i2p.build.number}" arg2="0"/>
    555555                </not>
    556556            </condition>
     
    11791179        <!-- set if unset -->
    11801180        <property name="workspace.changes.util.tr" value="" />
    1181         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}.jar" installerType="standard" basedir="${basedir}" />
     1181        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}.jar" installerType="standard" basedir="${basedir}" />
    11821182    </target>
    11831183
     
    11871187        <!-- set if unset -->
    11881188        <property name="workspace.changes.util.tr" value="" />
    1189         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_freebsd-only.jar" installerType="standard" basedir="${basedir}" />
     1189        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}_freebsd-only.jar" installerType="standard" basedir="${basedir}" />
    11901190    </target>
    11911191
     
    11941194        <!-- set if unset -->
    11951195        <property name="workspace.changes.util.tr" value="" />
    1196         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_linux-only.jar" installerType="standard" basedir="${basedir}" />
     1196        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}_linux-only.jar" installerType="standard" basedir="${basedir}" />
    11971197    </target>
    11981198
     
    12031203        <!-- set if unset -->
    12041204        <property name="workspace.changes.util.tr" value="" />
    1205         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_osx-only.jar" installerType="standard" basedir="${basedir}" />
     1205        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}_osx-only.jar" installerType="standard" basedir="${basedir}" />
    12061206        <ant target="installer2app" />
    12071207        <delete dir="pkg-temp/osx" />
     
    12161216        <exec executable="python" failonerror="true">
    12171217            <arg value="${user.home}/IzPack/utils/wrappers/izpack2app/izpack2app.py" />
    1218             <arg value="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_osx-only.jar" />
    1219             <arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-${build.number}${build.extra}_osx-install.app" />
     1218            <arg value="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}_osx-only.jar" />
     1219            <arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-${i2p.build.number}${build.extra}_osx-install.app" />
    12201220        </exec>
    12211221        <exec executable="chmod" failonerror="true" osfamily="unix">
    12221222                <arg value="755" />
    1223                 <arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-${build.number}${build.extra}_osx-install.app/Contents/MacOS/JavaApplicationStub" />
     1223                <arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-${i2p.build.number}${build.extra}_osx-install.app/Contents/MacOS/JavaApplicationStub" />
    12241224        </exec>
    12251225        <exec executable="tar" osfamily="unix" failonerror="true">
     
    12271227                <arg value="--group=root" />
    12281228                <arg value="-cjvf" />
    1229                 <arg value="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_osx.tar.bz2" />
     1229                <arg value="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}_osx.tar.bz2" />
    12301230                <arg value="-C" />
    12311231                <arg value="${basedir}/pkg-temp/osx" />
    1232                 <arg value="i2p-${release.number}-${build.number}${build.extra}_osx-install.app" />
     1232                <arg value="i2p-${release.number}-${i2p.build.number}${build.extra}_osx-install.app" />
    12331233        </exec>
    12341234    </target>
     
    12651265            </manifest>
    12661266        </jar>
    1267         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_windows-only.jar" installerType="standard" basedir="${basedir}" />
     1267        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}_windows-only.jar" installerType="standard" basedir="${basedir}" />
    12681268        <delete dir="pkg-temp/win" />
    12691269    </target>
Note: See TracChangeset for help on using the changeset viewer.