Changeset bb46535e for build.xml


Ignore:
Timestamp:
Feb 29, 2012 2:37:02 PM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
f43b0be
Parents:
274e37b (diff), 382dd34 (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 3d9f6d9555224cc3277ca10fd9409c83422758eb)

to branch 'i2p.i2p.zzz.jetty6' (head 0212d710e5a4eb30249201015f045d43f44650cb)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r274e37b rbb46535e  
    193193            <format property="build.timestamp" pattern="yyyy-MM-dd HH:mm:ss z" timezone="UTC" locale="en" />
    194194        </tstamp>
    195         <property name="full.version" value="${release.number}-${build.number}${build.extra}" />
     195        <property name="full.version" value="${release.number}-${i2p.build.number}${build.extra}" />
    196196        <echo message="Building version ${full.version} (mtn rev ${workspace.version})" />
    197197    </target>
     
    296296        </jar>
    297297    </target>
    298    
     298
     299    <target name="jbigi-nowindows" depends="buildProperties, jbigi-list-changes" >
     300        <!-- set if unset -->
     301        <property name="workspace.changes.jbigi.tr" value="" />
     302        <jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
     303            <fileset dir="installer/lib/jbigi" includes="*.so *.jnilib" />
     304            <manifest>
     305                <attribute name="Build-Date" value="${build.timestamp}" />
     306                <attribute name="Base-Revision" value="${workspace.version}" />
     307                <attribute name="Workspace-Changes" value="${workspace.changes.jbigi.tr}" />
     308            </manifest>
     309        </jar>
     310    </target>
     311
    299312    <!-- Now system-specific jbigis in alphabetical order -->
    300313    <target name="jbigi-freebsd-only"  depends="buildProperties, jbigi-list-changes" >
     
    377390
    378391    <target name="prep-script-translation" >
     392        <!-- script translation added in 0.8.13, disable for now -->
     393        <echo message="i2prouter script translations disabled" />
     394<!--
    379395        <ant dir="installer/resources/locale" target="bundle" />
    380396        <copy todir="pkg-temp/locale/">
    381397            <fileset dir="installer/resources/locale/mo/" />
    382398        </copy>
     399-->
    383400    </target>
    384401
     
    392409            use="true"
    393410            splitindex="true"
    394             doctitle="I2P Javadocs for Release ${release.number} Build ${build.number}${build.extra}"
     411            doctitle="I2P Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
    395412            windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
    396413            <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.*" />
     
    460477            use="true"
    461478            splitindex="true"
    462             doctitle="I2P Unit Test Javadocs for Release ${release.number} Build ${build.number}${build.extra}"
     479            doctitle="I2P Unit Test Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
    463480            windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
    464481            <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.*" />
     
    520537        </exec>
    521538        <property name="build.temp.tr" value="??" />
    522         <exec executable="cut" inputstring="${build.temp.tr}" outputproperty="build.number" failifexecutionfails="false" >
     539        <exec executable="cut" inputstring="${build.temp.tr}" outputproperty="i2p.build.number" failifexecutionfails="false" >
    523540            <arg value="-f1" />
    524541            <arg value="-d;" />
     
    529546            <arg value="router/java/src/net/i2p/router/RouterVersion.java" />
    530547        </exec>
    531         <property name="build.number" value="??" />
     548        <property name="i2p.build.number" value="??" />
    532549        <property name="build.extra" value="" />
    533         <echo message="Build number is ${build.number}${build.extra}" />
     550        <echo message="Build number is ${i2p.build.number}${build.extra}" />
    534551    </target>
    535552
     
    543560            </condition>
    544561        </fail>
    545         <fail message="Non-zero build number: ${build.number}" >
     562        <fail message="Non-zero build number: ${i2p.build.number}" >
    546563            <condition>
    547564                <not>
    548                     <equals arg1="${build.number}" arg2="0"/>
     565                    <equals arg1="${i2p.build.number}" arg2="0"/>
    549566                </not>
    550567            </condition>
     
    667684    </target>
    668685
     686    <target name="preppkg-nowindows" depends="preppkg-linux, preppkg-freebsd, preppkg-osx, jbigi-nowindows">
     687        <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
     688        <copy todir="pkg-temp/lib/wrapper/solaris/">
     689            <fileset dir="installer/lib/wrapper/solaris/" />
     690        </copy>
     691    </target>
     692
    669693    <target name="preppkgRepack" depends="preppkg-linux, preppkg-freebsd, preppkg-osx, preppkg-windows, jbigi">
    670694        <ant target="repack200" />
     
    896920          <fileset dir="installer/resources/readme/" includes="readme*.html" />
    897921          <fileset dir="installer/resources/proxy/" includes="*.ht" />
    898           <!-- 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 -->
    899           <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" />
     922          <!-- 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; -->
     923          <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" />
    900924        </copy>
    901925    </target>
     
    9961020    </target>
    9971021
    998     <!-- script translation added in 0.8.13, so don't need updates until .14, but put it in now so we don't forget -->
    9991022    <target name="prepupdate" depends="build2, prepupdateSmall, prepConsoleDocUpdates, prepCertificates, prep-script-translation">
    10001023        <copy file="build/BOB.jar" todir="pkg-temp/lib/" />
     
    11741197
    11751198    <!-- Custom installers -->
     1199    <target name="installer-nowindows" depends="clean, preppkg-nowindows, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes, izpack-patches" >
     1200        <mkdir dir="pkg-temp/installer" />
     1201        <!-- set if unset -->
     1202        <property name="workspace.changes.util.tr" value="" />
     1203        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}.jar" installerType="standard" basedir="${basedir}" />
     1204    </target>
     1205
    11761206
    11771207    <target name="installer-freebsd" depends="clean, preppkg-freebsd-only, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes, izpack-patches" >
     
    11791209        <!-- set if unset -->
    11801210        <property name="workspace.changes.util.tr" value="" />
    1181         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_freebsd-only.jar" installerType="standard" basedir="${basedir}" />
     1211        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}_freebsd-only.jar" installerType="standard" basedir="${basedir}" />
    11821212    </target>
    11831213
     
    11861216        <!-- set if unset -->
    11871217        <property name="workspace.changes.util.tr" value="" />
    1188         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_linux-only.jar" installerType="standard" basedir="${basedir}" />
     1218        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}_linux-only.jar" installerType="standard" basedir="${basedir}" />
    11891219    </target>
    11901220
     
    11951225        <!-- set if unset -->
    11961226        <property name="workspace.changes.util.tr" value="" />
    1197         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_osx-only.jar" installerType="standard" basedir="${basedir}" />
     1227        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}_osx-only.jar" installerType="standard" basedir="${basedir}" />
    11981228        <ant target="installer2app" />
    11991229        <delete dir="pkg-temp/osx" />
     
    12081238        <exec executable="python" failonerror="true">
    12091239            <arg value="${user.home}/IzPack/utils/wrappers/izpack2app/izpack2app.py" />
    1210             <arg value="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_osx-only.jar" />
    1211             <arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-${build.number}${build.extra}_osx-install.app" />
     1240            <arg value="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}_osx-only.jar" />
     1241            <arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-${i2p.build.number}${build.extra}_osx-install.app" />
    12121242        </exec>
    12131243        <exec executable="chmod" failonerror="true" osfamily="unix">
    12141244                <arg value="755" />
    1215                 <arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-${build.number}${build.extra}_osx-install.app/Contents/MacOS/JavaApplicationStub" />
     1245                <arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-${i2p.build.number}${build.extra}_osx-install.app/Contents/MacOS/JavaApplicationStub" />
    12161246        </exec>
    12171247        <exec executable="tar" osfamily="unix" failonerror="true">
     
    12191249                <arg value="--group=root" />
    12201250                <arg value="-cjvf" />
    1221                 <arg value="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_osx.tar.bz2" />
     1251                <arg value="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}_osx.tar.bz2" />
    12221252                <arg value="-C" />
    12231253                <arg value="${basedir}/pkg-temp/osx" />
    1224                 <arg value="i2p-${release.number}-${build.number}${build.extra}_osx-install.app" />
     1254                <arg value="i2p-${release.number}-${i2p.build.number}${build.extra}_osx-install.app" />
    12251255        </exec>
    12261256    </target>
     
    12571287            </manifest>
    12581288        </jar>
    1259         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_windows-only.jar" installerType="standard" basedir="${basedir}" />
     1289        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${i2p.build.number}${build.extra}_windows-only.jar" installerType="standard" basedir="${basedir}" />
    12601290        <delete dir="pkg-temp/win" />
    12611291    </target>
Note: See TracChangeset for help on using the changeset viewer.