Changeset fad6f54 for build.xml


Ignore:
Timestamp:
Jul 31, 2012 9:49:31 PM (8 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
5355e5b, 95fb141a
Parents:
e1525d9 (diff), 33a00ef (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.unittests' (head 0c5ea65761d9127f160bccb3d1d157f8947ca050)

to branch 'i2p.i2p' (head e36d5669f32ad1a0f66ab84f7f9ff8fa2937680b)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    re1525d9 rfad6f54  
    22<project basedir="." default="all" name="i2p">
    33
    4     <!-- Things you might want to change -->
    5     <!-- This keeps gcj a lot quieter -->
    6     <!--
    7         <property name="javac.compilerargs" value="-warn:-unchecked,raw,unused,serial" />
    8     -->
    9     <!-- Additional classpath. No longer required; we find pack200 classes at runtime.
    10          See core/java/src/net/i2p/util/FileUtil.java for more info.
    11     -->
    12     <!--
    13         <property name="javac.classpath" value="/PATH/TO/pack200.jar" />
    14     -->
    15 
    16     <!-- change this to false if you don't have gettext -->
    17     <property name="require.gettext" value="true" />
    18     <!-- Include property files so that values can be easily overridden. Currently just useful for javadoc hosters -->
     4    <!-- Include property files so that values can be easily overridden.
     5         Users should create an override.properties file to make changes.
     6     -->
    197    <property file="override.properties"/>
    208    <property file="build.properties"/>
     
    241229            <manifest>
    242230             <attribute name="Main-Class" value="net.i2p.router.RouterLaunch" />
    243              <attribute name="Class-Path" value="lib/i2p.jar lib/router.jar lib/jbigi.jar lib/BOB.jar lib/sam.jar lib/mstreaming.jar lib/streaming.jar lib/routerconsole.jar lib/i2ptunnel.jar lib/org.mortbay.jetty.jar lib/javax.servlet.jar lib/jasper-compiler.jar lib/jasper-runtime.jar lib/commons-logging.jar lib/commons-el.jar lib/wrapper.jar lib/systray.jar lib/systray4j.jar lib/desktopgui.jar" />
     231             <attribute name="Class-Path" value="lib/i2p.jar lib/router.jar lib/jbigi.jar lib/BOB.jar lib/sam.jar lib/mstreaming.jar lib/streaming.jar lib/routerconsole.jar lib/i2ptunnel.jar lib/org.mortbay.jetty.jar lib/javax.servlet.jar lib/jasper-compiler.jar lib/jasper-runtime.jar lib/commons-logging.jar lib/commons-el.jar lib/wrapper.jar lib/systray.jar lib/systray4j.jar lib/desktopgui.jar lib/i2psnark.jar lib/jrobin.jar lib/jstl.jar lib/standard.jar lib/jetty-i2p.jar lib/jetty-java5-threadpool.jar lib/jetty-rewrite-handler.jar lib/jetty-sslengine.jar lib/jetty-start.jar lib/jetty-util.jar" />
    244232             <attribute name="Built-By" value="${build.built-by}" />
    245233             <attribute name="Build-Date" value="${build.timestamp}" />
     
    421409            doctitle="I2P Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
    422410            windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
    423             <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.*" />
     411            <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:com.nettgryppa.security:net.metanotion:net.metanotion.*" />
    424412            <group title="Streaming Library" packages="net.i2p.client.streaming" />
    425             <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:org.cybergarage.*:org.freenetproject" />
     413            <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:org.cybergarage.*:org.freenetproject:org.xlattice.crypto.filters" />
    426414            <group title="Router Console" packages="net.i2p.router.web" />
    427415            <!-- apps and bridges starting here, alphabetical please -->
     
    490478            doctitle="I2P Unit Test Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
    491479            windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
    492             <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.*" />
    493             <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:org.cybergarage.*:org.freenetproject" />
     480            <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:com.nettgryppa.security:net.metanotion:net.metanotion.*" />
     481            <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:org.cybergarage.*:org.freenetproject:org.xlattice.crypto.filters" />
    494482            <sourcepath>
    495483                <pathelement location="core/java/test/junit" />
     
    552540            <arg value="-d;" />
    553541        </exec>
    554         <exec executable="awk" outputproperty="build.extra" failifexecutionfails="false">
     542        <exec executable="awk" osfamily="unix" outputproperty="build.extra" failifexecutionfails="false">
    555543            <arg value="-F&quot;" />
    556544            <arg value="/public final static String EXTRA/{print $2}" />
     
    692680        <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
    693681        <copy todir="pkg-temp/lib/wrapper/solaris/">
    694             <fileset dir="installer/lib/wrapper/solaris/" />
     682            <fileset dir="installer/lib/wrapper/solaris/" excludes="*.txt" />
    695683        </copy>
    696684    </target>
     
    699687        <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
    700688        <copy todir="pkg-temp/lib/wrapper/solaris/">
    701             <fileset dir="installer/lib/wrapper/solaris/" />
    702         </copy>
     689            <fileset dir="installer/lib/wrapper/solaris/" excludes="*.txt" />
     690        </copy>
     691        <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
    703692    </target>
    704693
     
    708697        <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
    709698        <copy todir="pkg-temp/lib/wrapper/solaris/">
    710             <fileset dir="installer/lib/wrapper/solaris/" />
     699            <fileset dir="installer/lib/wrapper/solaris/" excludes="*.txt" />
    711700        </copy>
    712701    </target>
     
    714703    <target name="preppkg-freebsd" depends="preppkg-unix">
    715704        <copy todir="pkg-temp/lib/wrapper/freebsd/">
    716             <fileset dir="installer/lib/wrapper/freebsd/" />
     705            <fileset dir="installer/lib/wrapper/freebsd/" excludes="*.txt" />
    717706        </copy>
    718707        <copy todir="pkg-temp/lib/wrapper/freebsd64/">
    719             <fileset dir="installer/lib/wrapper/freebsd64" />
     708            <fileset dir="installer/lib/wrapper/freebsd64" excludes="*.txt" />
    720709        </copy>
    721710    </target>
     
    748737    <target name="preppkg-linux-x86" depends="preppkg-unix">
    749738        <copy todir="pkg-temp/lib/wrapper/linux/">
    750             <fileset dir="installer/lib/wrapper/linux/" />
     739            <fileset dir="installer/lib/wrapper/linux/" excludes="*.txt" />
    751740        </copy>
    752741        <copy todir="pkg-temp/lib/wrapper/linux64/">
    753             <fileset dir="installer/lib/wrapper/linux64/" />
     742            <fileset dir="installer/lib/wrapper/linux64/" excludes="*.txt" />
    754743        </copy>
    755744    </target>
     
    757746    <target name="preppkg-linux-nonx86" depends="preppkg-unix">
    758747        <copy todir="pkg-temp/lib/wrapper/linux-armv7/">
    759             <fileset dir="installer/lib/wrapper/linux-armv7/" />
     748            <fileset dir="installer/lib/wrapper/linux-armv7/" excludes="*.txt" />
    760749        </copy>
    761750        <copy todir="pkg-temp/lib/wrapper/linux-ppc/">
    762             <fileset dir="installer/lib/wrapper/linux-ppc/" />
     751            <fileset dir="installer/lib/wrapper/linux-ppc/" excludes="*.txt" />
    763752        </copy>
    764753        <copy todir="pkg-temp/lib/wrapper/linux-armv5/">
    765             <fileset dir="installer/lib/wrapper/linux-armv5/" />
     754            <fileset dir="installer/lib/wrapper/linux-armv5/" excludes="*.txt" />
    766755        </copy>
    767756    </target>
     
    773762        </copy>
    774763        <copy todir="pkg-temp/lib/wrapper/macosx/">
    775             <fileset dir="installer/lib/wrapper/macosx/" />
     764            <fileset dir="installer/lib/wrapper/macosx/" excludes="*.txt" />
    776765        </copy>
    777766    </target>
     
    796785        <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
    797786        <copy todir="pkg-temp/lib/wrapper/win32/">
    798             <fileset dir="installer/lib/wrapper/win32/" />
     787            <fileset dir="installer/lib/wrapper/win32/" excludes="*.txt" />
    799788        </copy>
    800789        <copy todir="pkg-temp/lib/wrapper/win64/">
    801             <fileset dir="installer/lib/wrapper/win64/" />
     790            <fileset dir="installer/lib/wrapper/win64/" excludes="*.txt" />
    802791        </copy>
    803792    </target>
     
    11091098            <fileset dir="installer/resources/eepsite" includes="*.xml contexts/* etc/*" />
    11101099        </copy>
     1100    </target>
     1101
     1102    <target name="delete-j6-update">
     1103        <delete dir="pkg-temp/eepsite-jetty6" />
    11111104    </target>
    11121105
     
    12611254    </target>
    12621255
     1256    <!-- call between installer-xxx and installer-windows -->
     1257    <target name="delete-nonwindows">
     1258        <delete dir="pkg-temp/lib/wrapper/" />
     1259        <delete dir="pkg-temp/locale/" />
     1260        <delete dir="pkg-temp/man/" />
     1261        <delete dir="pkg-temp/Start I2P Router.app/" />
     1262        <delete dir="pkg-temp" includes="eepget i2prouter INSTALL-headless.txt osid postinstall.sh runplain.sh" />
     1263    </target>
     1264
    12631265    <target name="installer-windows" depends="clean, preppkg-windows-only, util-list-changes, izpack-patches, utility-jars" >
    12641266        <izpack input="${basedir}/installer/install.xml" output="${basedir}/install.jar" installerType="standard" basedir="${basedir}" />
     
    12681270    </target>
    12691271
     1272    <!-- this is broken as installer-xxx targets may delete (or not delete) things in pkg-temp -->
    12701273    <target name="installer-all" depends="installer-freebsd, installer-linux, installer-osx, installer-windows, installer-nowindows, installer" >
    12711274    </target>
     
    13651368    <target name="release" depends="distclean, updaterWithJettyFixesAndJbigi , updater200WithJettyFixes, preppkg, installer, getReleaseNumber" >
    13661369-->
    1367     <target name="release" depends="verifyReleaseBuildNumbers, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, preppkgRepack, installer-nowindows, installer-windows" >
     1370    <target name="release" depends="verifyReleaseBuildNumbers, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows" >
    13681371        <echo message="================================================================" />
    13691372        <echo message="Did you update these files?" />
     
    13841387        <echo message="New version number is ${release.number}" />
    13851388        <copy file="i2pupdate.zip" tofile="i2pupdate_${release.number}.zip" />
    1386         <copy file="i2pinstall_${full.version}_windows-only.exe" tofile="i2pinstall_${release.number}.exe" />
     1389        <copy file="i2pinstall_${full.version}_windows-only.exe" tofile="i2pinstall_${release.number}_windows.exe" />
    13871390        <copy file="i2pinstall_${full.version}.jar" tofile="i2pinstall_${release.number}.jar" />
    13881391        <delete file="i2pupdate.sud" />
     
    14831486        </exec>
    14841487        <echo message="Sign the files:" />
    1485         <delete file="i2pinstall_${release.number}.exe.sig" />
     1488        <delete file="i2pinstall_${release.number}_windows.exe.sig" />
    14861489        <delete file="i2pinstall_${release.number}.jar.sig" />
    14871490        <delete file="i2psource_${release.number}.tar.bz2.sig" />
     
    14891492        <exec executable="gpg" failonerror="true">
    14901493            <arg value="-b" />
    1491             <arg value="i2pinstall_${release.number}.exe" />
     1494            <arg value="i2pinstall_${release.number}_windows.exe" />
    14921495        </exec>
    14931496        <exec executable="gpg" failonerror="true">
     
    15051508        <exec executable="chmod" failonerror="true">
    15061509            <arg value="444" />
    1507             <arg value="i2pinstall_${release.number}.exe" />
     1510            <arg value="i2pinstall_${release.number}_windows.exe" />
    15081511            <arg value="i2pinstall_${release.number}.jar" />
    15091512            <arg value="i2psource_${release.number}.tar.bz2" />
     
    15111514            <arg value="i2pupdate.su2" />
    15121515            <arg value="i2pupdate.sud" />
    1513             <arg value="i2pinstall_${release.number}.exe.sig" />
     1516            <arg value="i2pinstall_${release.number}_windows.exe.sig" />
    15141517            <arg value="i2pinstall_${release.number}.jar.sig" />
    15151518            <arg value="i2psource_${release.number}.tar.bz2.sig" />
     
    15191522        <exec executable="ls" failonerror="true">
    15201523            <arg value="-l" />
    1521             <arg value="i2pinstall_${release.number}.exe" />
     1524            <arg value="i2pinstall_${release.number}_windows.exe" />
    15221525            <arg value="i2pinstall_${release.number}.jar" />
    15231526            <arg value="i2psource_${release.number}.tar.bz2" />
     
    15251528            <arg value="i2pupdate.su2" />
    15261529            <arg value="i2pupdate.sud" />
    1527             <arg value="i2pinstall_${release.number}.exe.sig" />
     1530            <arg value="i2pinstall_${release.number}_windows.exe.sig" />
    15281531            <arg value="i2pinstall_${release.number}.jar.sig" />
    15291532            <arg value="i2psource_${release.number}.tar.bz2.sig" />
     
    15321535        <echo message="SHA256 sums:" />
    15331536        <exec executable="sha256sum" failonerror="true">
    1534             <arg value="i2pinstall_${release.number}.exe" />
     1537            <arg value="i2pinstall_${release.number}_windows.exe" />
    15351538            <arg value="i2pinstall_${release.number}.jar" />
    15361539            <arg value="i2psource_${release.number}.tar.bz2" />
Note: See TracChangeset for help on using the changeset viewer.