Changeset 79ab065 for build.xml


Ignore:
Timestamp:
Mar 16, 2012 2:30:42 AM (8 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
f19bc6a
Parents:
9d07bc2 (diff), d9ba62a (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 e1c79060790ae24b2a96aff2857477d6528ae7c6)

to branch 'i2p.i2p.unittests' (head 357abd51672dd9950cbac6dd30ded117fe5695e0)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r9d07bc2 r79ab065  
    2424    <target name="all" >
    2525        <echo message="Useful targets: " />
    26         <echo message="  pkg:       distclean then package everything up (installer, clean tarball, update tarball)" />
     26        <echo message="  pkg:       distclean then package everything up (updater, installer)" />
    2727        <echo message="  dist:      pkg and javadoc" />
     28        <echo message="  dist200:   pkg, updater200, and javadoc" />
    2829        <echo message="  installer: build the GUI installer" />
    2930        <echo message="  installer-freebsd: build the GUI installer (FreeBSD only)" />
     
    3132        <echo message="  installer-osx: build the GUI installer (OSX only)" />
    3233        <echo message="  installer-windows: build the GUI installer (Windows only)" />
     34        <echo message="  installer-nowindows: build the GUI installer (all but Windows)" />
    3335        <echo message="  tarball:   tar the full install into i2p.tar.bz2 (extracts to build a new clean install)" />
    3436        <echo message="  updater:   Package the built files in i2pupdate.zip (extracts safely over existing installs)" />
     
    3638        <echo message="  updaterWithJavadoc: updater including the javadocs, for display in the console" />
    3739        <echo message="  updater200WithJavadoc: updater including the javadocs, for display in the console (creates i2pupdate200.zip)" />
     40        <echo message="  updaterWithJavadocAndJetty: updater including the javadocs, for display in the console, and Jetty " />
     41        <echo message="  updater200WithJavadocAndJetty: updater including the javadocs, for display in the console, and Jetty (creates i2pupdate200.zip)" />
    3842        <echo message="  updaterWithJetty: Updater including Jetty" />
     43        <echo message="  updater200withJetty: Updater including Jetty" />
    3944        <echo message="  updaterWithJettyFixes: updater including local jetty patches" />
    4045        <echo message="  updaterWithGeoIP: updater including GeoIP Files" />
     
    4449        <echo message="  updaterRouter:  updater with the i2p.jar and router.jar only" />
    4550        <echo message="  distclean: clean up all derived files" />
    46         <!-- <echo message="  syndie:    generate a standalone syndie install" /> -->
     51        <!-- <echo message="  syndie:    generate a standalone syndie install" /> -->
    4752        <echo message="  desktopgui: generate a standalone desktopgui install" />
    4853        <echo message="  i2psnark:  generate a standalone i2psnark install" />
    4954        <echo message="  justBOB:  generate a standalone BOB-one.jar" />
    50         <echo message="  javadoc:   generate javadoc for the entire project into ./build/javadoc" />
     55        <echo message="  javadoc:   generate javadoc for the entire project into ./build/javadoc and ./javadoc.zip" />
    5156        <echo message="  javadoc-test: Javadocs for unit test classes (build/javadoc-test)" />
    5257        <echo message="  slackpkg:  generate Slackware packages in ./Slackware/i2p and ./Slackware/i2p-base" />
    5358        <echo message="  debianhowto: instructions on building Debian packages" />
    54         <echo message="  debian: generate Debian packages in ../" />
    55         <echo message="          run &quot;ant debianhowto&quot; for instructions" />
    56         <echo message="  debian-clean: rollback debian specific patches and run the &quot;distclean&quot; target (done automatically at the end of the &quot;debian&quot; target)" />
    57         <!-- <echo message="  debianrepo: build a Debian repository (reprepro required)" /> -->
     59        <echo message="  debian: generate Debian packages in ../" />
     60        <echo message="          run &quot;ant debianhowto&quot; for instructions" />
     61        <echo message="  debian-clean: rollback debian specific patches and run the &quot;distclean&quot; target (done automatically at the end of the &quot;debian&quot; target)" />
     62        <!-- <echo message="  debianrepo: build a Debian repository (reprepro required)" /> -->
    5863        <echo message="  poupdate: update the .po files for translators" />
    5964        <echo message="  pkg-portable-win32:  build a minimum portable version for win32" />
    6065   </target>
    6166    <target name="debianhowto">
    62             <echo message="To build debian packages, you must make sure that you have" />
    63             <echo message="the necessary build-dependencies installed." />
    64             <echo message="The packages required to build can be found in the file "/>
    65             <echo message="&quot;debian/control&quot; in both the Build-Depends and Build-Depends-Indep fields."/>
    66             <echo message="In addition to those packages, be sure to install &quot;fakeroot&quot;,"/>
    67             <echo message="&quot;quilt&quot; and &quot;build-essential&quot;!" />
    68             <echo message="" />
    69             <echo message="The following command will install all dependencies for you:" />
    70             <echo message="apt-get install debhelper ant debconf default-jdk gettext libgmp3-dev po-debconf fakeroot build-essential quilt" />
    71             <echo message=" " />
    72             <echo message="Once the dependencies are installed, run &quot;ant debian&quot;"/>
    73             <echo message="to patch the source and build the packages." />
    74     </target>
    75     <target name="dist" depends="pkg, javadoc">
    76     </target>
     67            <echo message="To build debian packages, you must make sure that you have" />
     68            <echo message="the necessary build-dependencies installed." />
     69            <echo message="The packages required to build can be found in the file "/>
     70            <echo message="&quot;debian/control&quot; in the &quot;Build-Depends&quot; field."/>
     71            <echo message="In addition to those packages, be sure to install &quot;fakeroot&quot;,"/>
     72            <echo message="&quot;quilt&quot; and &quot;build-essential&quot;!" />
     73            <echo message="" />
     74            <echo message="The following command will install all of the dependencies for you:" />
     75            <echo message=" " />
     76            <echo message="apt-get install debhelper ant debconf default-jdk gettext libgmp3-dev po-debconf fakeroot build-essential \" />
     77            <echo message="                   quilt libcommons-el-java libcommons-logging-java libjetty-extra-java libjetty-java" />
     78            <echo message=" " />
     79            <echo message="Once the dependencies are installed, run &quot;ant debian&quot;"/>
     80            <echo message="to patch the source and build the packages." />
     81    </target>
     82    <target name="dist" depends="pkg, javadoc" />
     83    <target name="dist200" depends="pkg200, javadoc" />
    7784    <target name="build" depends="build2">
    7885        <!-- so we don't build standalone for the updater -->
     
    134141    </target>
    135142
    136     <target name="buildJetty" depends="buildProperties" >
     143    <target name="buildJetty" depends="buildCore" >
    137144        <ant dir="apps/jetty" target="build" />
    138145    </target>
     
    167174                        excludes="org/jrobin/cmd/ org/jrobin/convertor/ org/jrobin/inspector/" />
    168175            <manifest>
     176                <attribute name="Built-By" value="${build.built-by}" />
    169177                <attribute name="Build-Date" value="${build.timestamp}" />
    170178                <attribute name="Base-Revision" value="${workspace.version}" />
     
    190198            <format property="build.timestamp" pattern="yyyy-MM-dd HH:mm:ss z" timezone="UTC" locale="en" />
    191199        </tstamp>
    192         <property name="full.version" value="${release.number}-${build.number}${build.extra}" />
     200        <property name="full.version" value="${release.number}-${i2p.build.number}${build.extra}" />
    193201        <echo message="Building version ${full.version} (mtn rev ${workspace.version})" />
    194202    </target>
     
    199207        <copy file="apps/routerconsole/java/build/routerconsole.jar" todir="build/" />
    200208        <copy file="apps/routerconsole/java/build/routerconsole.war" todir="build/" />
    201         <copy file="apps/jetty/jettylib/org.mortbay.jetty.jar" todir="build/" />
    202         <copy file="apps/jetty/jettylib/jasper-compiler.jar" todir="build/" />
    203         <copy file="apps/jetty/jettylib/jasper-runtime.jar" todir="build/" />
    204         <copy file="apps/jetty/jettylib/commons-logging.jar" todir="build/" />
    205         <copy file="apps/jetty/jettylib/commons-el.jar" todir="build/" />
    206         <copy file="apps/jetty/jettylib/javax.servlet.jar" todir="build/" />
    207     </target>
    208 
     209        <copy todir="build/" >
     210            <fileset dir="apps/jetty/jettylib" excludes="ant.jar" />
     211        </copy>
     212    </target>
     213
     214    <!-- this makes an empty build/launchi2p.jar and the build/i2p.exe for the no-wrapper windows startup, if possible -->
    209215    <target name="buildexe">
    210216        <condition property="noExe">
    211             <os arch="x86_64" />
    212         </condition>
    213         <condition property="noExe">
    214             <os arch="ppc" />
    215         </condition>
    216         <condition property="noExe">
    217             <os arch="armv5tejl" />
    218         </condition>
    219         <condition property="noExe">
    220             <os arch="amd64" />
     217            <or>
     218                <os arch="ppc" />
     219                <os arch="armv5tejl" />
     220            </or>
    221221        </condition>
    222222        <condition property="noExe">
     
    235235             classpath="${basedir}/installer/lib/launch4j/launch4j.jar:${basedir}/installer/lib/launch4j/lib/xstream.jar" />
    236236
     237    <!-- this makes an empty build/launchi2p.jar and the build/i2p.exe for the no-wrapper windows startup -->
    237238    <target name="doBuildEXE" depends="buildProperties" unless="noExe">
     239        <echo message="See the file &quot;build.properties&quot; if this step fails." />
    238240        <jar destfile="./build/launchi2p.jar">
    239241            <manifest>
    240242             <attribute name="Main-Class" value="net.i2p.router.RouterLaunch" />
    241243             <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" />
     244             <attribute name="Built-By" value="${build.built-by}" />
    242245             <attribute name="Build-Date" value="${build.timestamp}" />
    243246             <attribute name="Base-Revision" value="${workspace.version}" />
     
    290293            <fileset dir="installer/lib/jbigi" includes="*.so *.dll *.jnilib" />
    291294            <manifest>
     295                <attribute name="Built-By" value="${build.built-by}" />
    292296                <attribute name="Build-Date" value="${build.timestamp}" />
    293297                <attribute name="Base-Revision" value="${workspace.version}" />
     
    296300        </jar>
    297301    </target>
    298    
     302
     303    <target name="jbigi-nowindows" depends="buildProperties, jbigi-list-changes" >
     304        <!-- set if unset -->
     305        <property name="workspace.changes.jbigi.tr" value="" />
     306        <jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
     307            <fileset dir="installer/lib/jbigi" includes="*.so *.jnilib" />
     308            <manifest>
     309                <attribute name="Built-By" value="${build.built-by}" />
     310                <attribute name="Build-Date" value="${build.timestamp}" />
     311                <attribute name="Base-Revision" value="${workspace.version}" />
     312                <attribute name="Workspace-Changes" value="${workspace.changes.jbigi.tr}" />
     313            </manifest>
     314        </jar>
     315    </target>
     316
    299317    <!-- Now system-specific jbigis in alphabetical order -->
    300318    <target name="jbigi-freebsd-only"  depends="buildProperties, jbigi-list-changes" >
     
    304322            <fileset dir="installer/lib/jbigi" includes="*freebsd*.so" />
    305323            <manifest>
     324                <attribute name="Built-By" value="${build.built-by}" />
    306325                <attribute name="Build-Date" value="${build.timestamp}" />
    307326                <attribute name="Base-Revision" value="${workspace.version}" />
     
    317336            <fileset dir="installer/lib/jbigi" includes="*linux*.so" />
    318337            <manifest>
     338                <attribute name="Built-By" value="${build.built-by}" />
    319339                <attribute name="Build-Date" value="${build.timestamp}" />
    320340                <attribute name="Base-Revision" value="${workspace.version}" />
     
    330350            <fileset dir="installer/lib/jbigi" includes="*linux-arm*.so,*linux-ppc*.so" />
    331351            <manifest>
     352                <attribute name="Built-By" value="${build.built-by}" />
    332353                <attribute name="Build-Date" value="${build.timestamp}" />
    333354                <attribute name="Base-Revision" value="${workspace.version}" />
     
    343364            <fileset dir="installer/lib/jbigi" includes="*.jnilib" />
    344365            <manifest>
     366                <attribute name="Built-By" value="${build.built-by}" />
    345367                <attribute name="Build-Date" value="${build.timestamp}" />
    346368                <attribute name="Base-Revision" value="${workspace.version}" />
     
    356378            <fileset dir="installer/lib/jbigi" includes="*windows*.dll" />
    357379            <manifest>
     380                <attribute name="Built-By" value="${build.built-by}" />
    358381                <attribute name="Build-Date" value="${build.timestamp}" />
    359382                <attribute name="Base-Revision" value="${workspace.version}" />
     
    377400
    378401    <target name="prep-script-translation" >
     402        <!-- script translation added in 0.8.13, disable for now -->
     403        <echo message="i2prouter script translations disabled" />
     404<!--
    379405        <ant dir="installer/resources/locale" target="bundle" />
    380406        <copy todir="pkg-temp/locale/">
    381407            <fileset dir="installer/resources/locale/mo/" />
    382408        </copy>
     409-->
    383410    </target>
    384411
     
    392419            use="true"
    393420            splitindex="true"
    394             doctitle="I2P Javadocs for Release ${release.number} Build ${build.number}${build.extra}"
     421            doctitle="I2P Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
    395422            windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
    396423            <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.*" />
     
    405432            <group title="I2PSnark Application" packages="org.klomp.snark:org.klomp.snark.*" />
    406433            <group title="I2PTunnel Application" packages="net.i2p.i2ptunnel:net.i2p.i2ptunnel.*" />
     434            <group title="Jetty Logging" packages="net.i2p.jetty" />
    407435            <group title="SAM Bridge" packages="net.i2p.sam" />
    408436            <group title="SAM Demos" packages="net.i2p.sam.client" />
    409437            <group title="SusiDNS Application" packages="i2p.susi.dns" />
    410             <group title="SusiMail Application" packages="i2p.susi.webmail:i2p.susi.webmail.*:i2p.susi.debug:i2p.susi.util" />
     438            <group title="SusiMail Application" packages="i2p.susi.webmail:i2p.susi.webmail.*:i2p.susi.debug:i2p.susi.util:org.mortbay.servlet:org.mortbay.util" />
    411439            <group title="Systray Application" packages="net.i2p.apps.systray" />
    412440            <sourcepath>
     
    427455                <pathelement location="apps/susidns/src/java/src" />
    428456                <pathelement location="apps/susimail/src/src" />
     457                <pathelement location="apps/jetty/java/src" />
    429458            </sourcepath>
    430459            <classpath>
    431460                <pathelement location="apps/jetty/jettylib/org.mortbay.jetty.jar" />
    432461                <pathelement location="apps/jetty/jettylib/javax.servlet.jar" />
     462                <pathelement location="apps/jetty/jettylib/jetty-sslengine.jar" />
     463                <pathelement location="apps/jetty/jettylib/jetty-start.jar" />
     464                <pathelement location="apps/jetty/jettylib/jetty-java5-threadpool.jar" />
     465                <pathelement location="apps/jetty/jettylib/jetty-util.jar" />
     466                <pathelement location="apps/jetty/jettylib/jsp-api.jar" />
    433467                <pathelement location="apps/systray/java/lib/systray4j.jar" />
    434468                <pathelement location="apps/jrobin/jrobin-1.5.9.1.jar" />
     
    443477        </javadoc>
    444478        <echo message="Warning, javadoc embeds timestamps in the output, run with 'TZ=UTC ant javadoc' if you plan to distribute" />
     479        <zip destfile="javadoc.zip" basedir="build" level="9" includes="javadoc\**" />
    445480    </target>
    446481
     
    453488            use="true"
    454489            splitindex="true"
    455             doctitle="I2P Unit Test Javadocs for Release ${release.number} Build ${build.number}${build.extra}"
     490            doctitle="I2P Unit Test Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
    456491            windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
    457492            <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.*" />
     
    513548        </exec>
    514549        <property name="build.temp.tr" value="??" />
    515         <exec executable="cut" inputstring="${build.temp.tr}" outputproperty="build.number" failifexecutionfails="false" >
     550        <exec executable="cut" inputstring="${build.temp.tr}" outputproperty="i2p.build.number" failifexecutionfails="false" >
    516551            <arg value="-f1" />
    517552            <arg value="-d;" />
     
    522557            <arg value="router/java/src/net/i2p/router/RouterVersion.java" />
    523558        </exec>
    524         <property name="build.number" value="??" />
     559        <property name="i2p.build.number" value="??" />
    525560        <property name="build.extra" value="" />
    526         <echo message="Build number is ${build.number}${build.extra}" />
     561        <echo message="Build number is ${i2p.build.number}${build.extra}" />
    527562    </target>
    528563
    529564    <target name="verifyReleaseBuildNumbers" depends="getReleaseNumber, getBuildNumber" >
     565        <echo message="SDK: ${java.vendor} ${java.version} (${java.runtime.name} ${java.runtime.version})" />
    530566        <fail message="Bad release number: ${release.number}" >
    531567            <condition>
     
    536572            </condition>
    537573        </fail>
    538         <fail message="Non-zero build number: ${build.number}" >
     574        <fail message="Non-zero build number: ${i2p.build.number}" >
    539575            <condition>
    540576                <not>
    541                     <equals arg1="${build.number}" arg2="0"/>
     577                    <equals arg1="${i2p.build.number}" arg2="0"/>
    542578                </not>
    543579            </condition>
     
    555591        <delete dir="./build" />
    556592        <delete file="installer/lib/izpack/patches.jar" failonerror="false" quiet="true" />     
    557         <delete file="i2pinstall.exe" failonerror="false" quiet="true" />       
    558         <delete file="i2p.exe" failonerror="false" quiet="true" />
    559593        <delete file="syndie-standalone.zip" failonerror="false" quiet="true" />
    560         <delete>
    561             <fileset dir="." includes="i2pinstall*jar i2pinstall*bz2" />
     594        <delete failonerror="false" quiet="true">
     595            <fileset dir="." includes="i2pinstall*jar javadoc.zip i2pinstall*.exe i2pinstall*bz2" />
    562596        </delete>
    563597        <delete file="i2psnark-standalone.zip" failonerror="false" quiet="true" />
    564598        <delete file="BOB-one.jar" failonerror="false" quiet="true" /> 
    565         <delete dir="core/c/jbigi/bin" />
    566         <delete dir="core/c/jbigi/lib" />
    567         <delete dir="core/c/jcpuid/lib" />
    568599        <delete dir="debian/tmp" />
    569600        <delete dir="debian/db" />
     
    593624        <ant dir="apps/i2psnark/java/" target="distclean" />
    594625        <ant dir="apps/jetty/" target="distclean" />
     626        <delete dir="core/c/jbigi/bin" />
     627        <delete dir="core/c/jbigi/lib" />
     628        <delete dir="core/c/jcpuid/lib" />
    595629        <ant dir="installer/resources/locale" target="distclean" />
    596630        <!--
     
    636670    </target>
    637671
     672    <target name="webappDistclean">
     673        <ant dir="apps/i2ptunnel/java/" target="distclean" />
     674        <ant dir="apps/routerconsole/java/" target="distclean" />
     675        <ant dir="apps/addressbook/" target="distclean" />
     676        <ant dir="apps/susimail/" target="distclean" />
     677        <ant dir="apps/susidns/src/" target="distclean" />
     678        <ant dir="apps/i2psnark/java/" target="distclean" />
     679    </target>
     680
    638681    <target name="pkg" depends="distclean, updater, preppkg, installer" />
     682
     683    <target name="pkg200" depends="distclean, updater200, preppkg, installer" />
    639684
    640685    <target name="pkgclean" depends="deletepkg-temp">
     
    645690
    646691    <target name="preppkg" depends="preppkg-linux, preppkg-freebsd, preppkg-osx, preppkg-windows, jbigi">
     692        <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
     693        <copy todir="pkg-temp/lib/wrapper/solaris/">
     694            <fileset dir="installer/lib/wrapper/solaris/" />
     695        </copy>
     696    </target>
     697
     698    <target name="preppkg-nowindows" depends="preppkg-linux, preppkg-freebsd, preppkg-osx, jbigi-nowindows">
    647699        <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
    648700        <copy todir="pkg-temp/lib/wrapper/solaris/">
     
    731783   
    732784    <target name="preppkg-windows" depends="preppkg-base, buildexe">
    733         <copy file="i2p.exe" todir="pkg-temp/" failonerror="false" />
     785        <copy file="build/i2p.exe" todir="pkg-temp/" failonerror="false" />
    734786        <copy file="apps/systray/java/lib/systray4j.dll" todir="pkg-temp/lib" />
    735787        <copy file="apps/systray/java/resources/iggy.ico" todir="pkg-temp/icons" />
     
    764816        <copy file="build/i2p.jar" todir="pkg-temp/lib/" />
    765817        <copy file="build/i2ptunnel.jar" todir="pkg-temp/lib/" />
    766         <copy file="build/jasper-compiler.jar" todir="pkg-temp/lib/" />
    767         <copy file="build/jasper-runtime.jar" todir="pkg-temp/lib/" />
    768         <copy file="build/commons-logging.jar" todir="pkg-temp/lib/" />
    769         <copy file="build/commons-el.jar" todir="pkg-temp/lib/" />
    770         <copy file="build/javax.servlet.jar" todir="pkg-temp/lib/" />
     818        <!-- all jetty stuff -->
     819        <copy todir="pkg-temp/lib" >
     820            <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.*.jar" />
     821        </copy>
    771822        <copy file="build/mstreaming.jar" todir="pkg-temp/lib/" />
    772823        <copy file="build/streaming.jar" todir="pkg-temp/lib/" />
    773         <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
    774824        <copy file="build/router.jar" todir="pkg-temp/lib/" />
    775825        <copy file="build/desktopgui.jar" todir="pkg-temp/lib/" />
     
    818868        <!-- Eepsite stuff here -->
    819869        <mkdir dir="pkg-temp/eepsite" />
    820         <mkdir dir="pkg-temp/eepsite/webapps" />
    821         <mkdir dir="pkg-temp/eepsite/logs" />
    822         <mkdir dir="pkg-temp/eepsite/cgi-bin" />
    823         <mkdir dir="pkg-temp/eepsite/docroot" />
    824         <mkdir dir="pkg-temp/eepsite/docroot/help" />
    825         <mkdir dir="pkg-temp/eepsite/docroot/help/lib" />
    826         <copy todir="pkg-temp/eepsite/docroot/" >
    827             <fileset dir="installer/resources/eepsite.help/" />
     870        <copy todir="pkg-temp/eepsite/" >
     871            <fileset dir="installer/resources/eepsite/" />
    828872        </copy>
    829873        <copy todir="pkg-temp/eepsite/docroot/help/lib/" >
     
    831875        </copy>
    832876        <copy file="installer/resources/themes/console/images/favicon.ico" tofile="pkg-temp/eepsite/docroot/favicon.ico" />
    833         <copy file="installer/resources/jetty.xml" tofile="pkg-temp/eepsite/jetty.xml" />
    834877    </target>
    835878
     
    845888         -->
    846889        <copy file="installer/lib/launch4j/head/LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Launch4j.txt" />
     890        <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
    847891        <!--  Not sure if these are used or should be included -->
    848892        <copy file="installer/lib/launch4j/lib/foxtrot.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Foxtrot.txt" />
     
    888932          <fileset dir="installer/resources/readme/" includes="readme*.html" />
    889933          <fileset dir="installer/resources/proxy/" includes="*.ht" />
    890           <!-- 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 -->
    891           <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" />
     934          <!-- 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; -->
     935          <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" />
    892936        </copy>
    893937    </target>
     
    904948
    905949    <target name="updater200" depends="prepupdate, preplicenses, pack200, zipit200" />
     950    <target name="updater200WithJetty" depends="prepjupdate, preplicenses, pack200, zipit200" />
    906951    <target name="updater200WithJettyFixes" depends="prepjupdatefixes, preplicenses, pack200, zipit200" />
    907952    <target name="updater200WithJettyFixesAndJbigi" depends="prepjupdatefixes, prepjbigiupdate, preplicenses, pack200, zipit200" />
     
    910955    <target name="updaterWithJavadoc" depends="prepupdate, preplicenses, copyJavadoc, zipit" />
    911956    <target name="updater200WithJavadoc" depends="prepupdate, preplicenses, copyJavadoc, pack200, zipit200" />
     957    <target name="updaterWithJavadocAndJetty" depends="prepjupdate, preplicenses, copyJavadoc, zipit" />
     958    <target name="updater200WithJavadocAndJetty" depends="prepjupdate, preplicenses, copyJavadoc, pack200, zipit200" />
    912959    <target name="updaterWithGeoIP" depends="prepupdate, prepgeoupdate, preplicenses, zipit" />
    913960    <target name="updaterWithJetty" depends="prepjupdate, preplicenses, zipit" />
     
    9811028    </target>
    9821029
    983     <!-- script translation added in 0.8.13, so don't need updates until .14, but put it in now so we don't forget -->
    9841030    <target name="prepupdate" depends="build2, prepupdateSmall, prepConsoleDocUpdates, prepCertificates, prep-script-translation">
    9851031        <copy file="build/BOB.jar" todir="pkg-temp/lib/" />
     
    9881034        <!-- include systray changes in 0.7.5 -->
    9891035        <copy file="build/systray.jar" todir="pkg-temp/lib/" />
     1036       <!-- removed from updater in 0.9
    9901037        <copy file="build/desktopgui.jar" todir="pkg-temp/lib/" />
     1038       -->
    9911039        <copy file="build/susimail.war" todir="pkg-temp/webapps/" />
    9921040        <copy file="build/susidns.war" todir="pkg-temp/webapps/" />
     
    10461094    </target>
    10471095
     1096    <!-- All jetty jars required for update.
     1097         We don't need commons-el or commons-logging, they haven't changed.
     1098         TODO do we need to bother updating jasper?
     1099         TODO where is JMX? We don't need it I hope.
     1100      -->
    10481101    <target name="prepjupdate" depends="prepupdate, buildWEB">
    1049         <copy file="build/jasper-compiler.jar" todir="pkg-temp/lib/" />
    1050         <copy file="build/jasper-runtime.jar" todir="pkg-temp/lib/" />
    1051         <copy file="build/commons-logging.jar" todir="pkg-temp/lib/" />
    1052         <copy file="build/commons-el.jar" todir="pkg-temp/lib/" />
    1053         <copy file="build/javax.servlet.jar" todir="pkg-temp/lib/" />
    1054         <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
    1055     </target>
     1102        <copy todir="pkg-temp/lib" >
     1103            <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.*.jar" />
     1104        </copy>
     1105        <!--  We have to package the new eepsite files for MigrateJetty.java, but we
     1106              can't overwrite an existing eepsite dir in a non-split configuration.
     1107          -->
     1108        <copy todir="pkg-temp/eepsite-jetty6" >
     1109            <fileset dir="installer/resources/eepsite" includes="*.xml contexts/* etc/*" />
     1110        </copy>
     1111    </target>
     1112
     1113    <!-- Jetty 6 I2P logging addons, not really fixes -->
    10561114    <target name="prepjupdatefixes" depends="prepupdate, buildWEB">
    1057         <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
     1115        <copy file="build/jetty-i2p.jar" todir="pkg-temp/lib/" />
    10581116    </target>
    10591117
     
    10811139    </target>
    10821140
    1083     <target name="installer" depends="preppkg, buildProperties, util-list-changes, izpack-patches" >
     1141    <target name="utility-jars" depends="buildCore" >
    10841142        <mkdir dir="pkg-temp/installer" />
    10851143        <!-- set if unset -->
     
    10881146            <manifest>
    10891147                <attribute name="Main-Class" value="net.i2p.util.Copy" />
     1148                <attribute name="Built-By" value="${build.built-by}" />
    10901149                <attribute name="Build-Date" value="${build.timestamp}" />
    10911150                <attribute name="Base-Revision" value="${workspace.version}" />
     
    10961155            <manifest>
    10971156                <attribute name="Main-Class" value="net.i2p.util.Delete" />
     1157                <attribute name="Built-By" value="${build.built-by}" />
    10981158                <attribute name="Build-Date" value="${build.timestamp}" />
    10991159                <attribute name="Base-Revision" value="${workspace.version}" />
     
    11041164            <manifest>
    11051165                <attribute name="Main-Class" value="net.i2p.util.Exec" />
     1166                <attribute name="Built-By" value="${build.built-by}" />
    11061167                <attribute name="Build-Date" value="${build.timestamp}" />
    11071168                <attribute name="Base-Revision" value="${workspace.version}" />
     
    11091170            </manifest>
    11101171        </jar>
     1172    </target>
     1173
     1174    <target name="installer" depends="preppkg, buildProperties, util-list-changes, izpack-patches, utility-jars" >
    11111175        <!--
    11121176          Force 1.5 pack200 output
     
    11251189    <target name="installerexe">
    11261190        <condition property="noExe">
    1127             <os arch="x86_64" />
    1128         </condition>
    1129         <condition property="noExe">
    1130             <os arch="amd64" />
     1191            <or>
     1192                <os arch="ppc" />
     1193                <os arch="armv5tejl" />
     1194            </or>
    11311195        </condition>
    11321196        <condition property="noExe">
     
    11411205    </target>
    11421206
     1207    <!-- this makes i2pinstall.exe from install.jar -->
    11431208    <target name="doInstallerEXE" unless="noExe">
     1209        <echo message="See the file &quot;build.properties&quot; if this step fails." />
    11441210        <!-- now the installer exe -->
    11451211        <launch4j configFile="./installer/i2pinstaller.xml" />
    1146         <launch4j configFile="./installer/i2pstandalone.xml" />
    11471212        <!-- thazzit -->
    11481213    </target>
    11491214
    11501215    <!-- Custom installers -->
    1151 
    1152     <target name="installer-freebsd" depends="clean, preppkg-freebsd-only, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes, izpack-patches" >
    1153         <mkdir dir="pkg-temp/installer" />
    1154         <!-- set if unset -->
    1155         <property name="workspace.changes.util.tr" value="" />
    1156         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_freebsd-only.jar" installerType="standard" basedir="${basedir}" />
    1157     </target>
    1158 
    1159     <target name="installer-linux" depends="clean, preppkg-linux-only, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes, izpack-patches" >
    1160         <mkdir dir="pkg-temp/installer" />
    1161         <!-- set if unset -->
    1162         <property name="workspace.changes.util.tr" value="" />
    1163         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_linux-only.jar" installerType="standard" basedir="${basedir}" />
    1164     </target>
    1165 
    1166 
    1167     <target name="installer-osx" depends="clean, checkForIzpack2App, preppkg-osx-only, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes, izpack-patches">
    1168         <mkdir dir="pkg-temp/installer" />
     1216    <target name="installer-nowindows" depends="clean, preppkg-nowindows, izpack-patches" >
     1217        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}.jar" installerType="standard" basedir="${basedir}" />
     1218    </target>
     1219
     1220
     1221    <target name="installer-freebsd" depends="clean, preppkg-freebsd-only, izpack-patches" >
     1222        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}_freebsd-only.jar" installerType="standard" basedir="${basedir}" />
     1223    </target>
     1224
     1225    <target name="installer-linux" depends="clean, preppkg-linux-only, izpack-patches" >
     1226        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}_linux-only.jar" installerType="standard" basedir="${basedir}" />
     1227    </target>
     1228
     1229
     1230    <target name="installer-osx" depends="clean, checkForIzpack2App, preppkg-osx-only, izpack-patches">
    11691231        <mkdir dir="pkg-temp/osx" />
    1170         <!-- set if unset -->
    1171         <property name="workspace.changes.util.tr" value="" />
    1172         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_osx-only.jar" installerType="standard" basedir="${basedir}" />
     1232        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}_osx-only.jar" installerType="standard" basedir="${basedir}" />
    11731233        <ant target="installer2app" />
    11741234        <delete dir="pkg-temp/osx" />
     
    11831243        <exec executable="python" failonerror="true">
    11841244            <arg value="${user.home}/IzPack/utils/wrappers/izpack2app/izpack2app.py" />
    1185             <arg value="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_osx-only.jar" />
    1186             <arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-${build.number}${build.extra}_osx-install.app" />
     1245            <arg value="${basedir}/i2pinstall_${full.version}_osx-only.jar" />
     1246            <arg value="${basedir}/pkg-temp/osx/i2p-${full.version}_osx-install.app" />
    11871247        </exec>
    11881248        <exec executable="chmod" failonerror="true" osfamily="unix">
    11891249                <arg value="755" />
    1190                 <arg value="${basedir}/pkg-temp/osx/i2p-${release.number}-${build.number}${build.extra}_osx-install.app/Contents/MacOS/JavaApplicationStub" />
     1250                <arg value="${basedir}/pkg-temp/osx/i2p-${full.version}_osx-install.app/Contents/MacOS/JavaApplicationStub" />
    11911251        </exec>
    11921252        <exec executable="tar" osfamily="unix" failonerror="true">
     
    11941254                <arg value="--group=root" />
    11951255                <arg value="-cjvf" />
    1196                 <arg value="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_osx.tar.bz2" />
     1256                <arg value="${basedir}/i2pinstall_${full.version}_osx.tar.bz2" />
    11971257                <arg value="-C" />
    11981258                <arg value="${basedir}/pkg-temp/osx" />
    1199                 <arg value="i2p-${release.number}-${build.number}${build.extra}_osx-install.app" />
     1259                <arg value="i2p-${full.version}_osx-install.app" />
    12001260        </exec>
    12011261    </target>
    12021262
    1203     <!-- Yes, even though this makes an installer for Windows, we still need to depend on preppkg-unix (because the installer attempts to delete these files
    1204      and will fail if they don't exist. Thankfully these files are so very small there's not much harm in including them.
    1205     -->
    1206     <target name="installer-windows" depends="clean, doBuildEXE, preppkg-windows-only, preppkg-unix, getReleaseNumber, getBuildNumber, buildProperties, util-list-changes, izpack-patches" >
    1207         <mkdir dir="pkg-temp/installer" />
    1208         <!-- set if unset -->
    1209         <property name="workspace.changes.util.tr" value="" />
    1210         <jar destfile="./pkg-temp/installer/copy.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Copy.class net/i2p/util/FileUtil.class">
    1211             <manifest>
    1212                 <attribute name="Main-Class" value="net.i2p.util.Copy" />
    1213                 <attribute name="Build-Date" value="${build.timestamp}" />
    1214                 <attribute name="Base-Revision" value="${workspace.version}" />
    1215                 <attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
    1216             </manifest>
    1217         </jar>
    1218         <jar destfile="./pkg-temp/installer/delete.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Delete.class net/i2p/util/FileUtil.class">
    1219             <manifest>
    1220                 <attribute name="Main-Class" value="net.i2p.util.Delete" />
    1221                 <attribute name="Build-Date" value="${build.timestamp}" />
    1222                 <attribute name="Base-Revision" value="${workspace.version}" />
    1223                 <attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
    1224             </manifest>
    1225         </jar>
    1226         <jar destfile="./pkg-temp/installer/exec.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Exec.class">
    1227             <manifest>
    1228                 <attribute name="Main-Class" value="net.i2p.util.Exec" />
    1229                 <attribute name="Build-Date" value="${build.timestamp}" />
    1230                 <attribute name="Base-Revision" value="${workspace.version}" />
    1231                 <attribute name="Workspace-Changes" value="${workspace.changes.util.tr}" />
    1232             </manifest>
    1233         </jar>
    1234         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${release.number}-${build.number}${build.extra}_windows-only.jar" installerType="standard" basedir="${basedir}" />
    1235         <delete dir="pkg-temp/win" />
    1236     </target>
    1237 
    1238     <target name="installer-all" depends="installer-freebsd, installer-linux, installer-osx, installer-windows, installer" >
     1263    <target name="installer-windows" depends="clean, preppkg-windows-only, util-list-changes, izpack-patches, utility-jars" >
     1264        <izpack input="${basedir}/installer/install.xml" output="${basedir}/install.jar" installerType="standard" basedir="${basedir}" />
     1265        <ant target="installerexe" />
     1266        <delete file="${basedir}/install.jar" />
     1267        <move file="${basedir}/i2pinstall.exe" tofile="${basedir}/i2pinstall_${full.version}_windows-only.exe" />
     1268    </target>
     1269
     1270    <target name="installer-all" depends="installer-freebsd, installer-linux, installer-osx, installer-windows, installer-nowindows, installer" >
    12391271    </target>
    12401272    <!-- end custom installers -->
     
    13331365    <target name="release" depends="distclean, updaterWithJettyFixesAndJbigi , updater200WithJettyFixes, preppkg, installer, getReleaseNumber" >
    13341366-->
    1335     <target name="release" depends="verifyReleaseBuildNumbers, distclean, testscripts, updaterRepack, updater200, preppkgRepack, installer" >
     1367    <target name="release" depends="verifyReleaseBuildNumbers, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, preppkgRepack, installer-nowindows, installer-windows" >
    13361368        <echo message="================================================================" />
    13371369        <echo message="Did you update these files?" />
     
    13521384        <echo message="New version number is ${release.number}" />
    13531385        <copy file="i2pupdate.zip" tofile="i2pupdate_${release.number}.zip" />
    1354         <copy file="i2pinstall.exe" tofile="i2pinstall_${release.number}.exe" />
    1355         <delete file="i2pupdate.sud" failonerror="false" />
    1356         <delete file="i2pupdate.su2" failonerror="false" />
     1386        <copy file="i2pinstall_${full.version}_windows-only.exe" tofile="i2pinstall_${release.number}.exe" />
     1387        <copy file="i2pinstall_${full.version}.jar" tofile="i2pinstall_${release.number}.jar" />
     1388        <delete file="i2pupdate.sud" />
     1389        <delete file="i2pupdate.su2" />
     1390        <!-- make this a lot easier by putting release.privkey=/path/to/privkey in override.properties -->
    13571391        <input message="Enter private signing key file:" addproperty="release.privkey" />
    13581392        <fail message="You must enter a path." >
     
    14501484        <echo message="Sign the files:" />
    14511485        <delete file="i2pinstall_${release.number}.exe.sig" />
     1486        <delete file="i2pinstall_${release.number}.jar.sig" />
    14521487        <delete file="i2psource_${release.number}.tar.bz2.sig" />
    14531488        <delete file="i2pupdate_${release.number}.zip.sig" />
     
    14581493        <exec executable="gpg" failonerror="true">
    14591494            <arg value="-b" />
     1495            <arg value="i2pinstall_${release.number}.jar" />
     1496        </exec>
     1497        <exec executable="gpg" failonerror="true">
     1498            <arg value="-b" />
    14601499            <arg value="i2psource_${release.number}.tar.bz2" />
    14611500        </exec>
     
    14641503            <arg value="i2pupdate_${release.number}.zip" />
    14651504        </exec>
    1466         <echo message="File sizes:" />
    1467         <exec executable="ls" failonerror="true">
    1468             <arg value="-l" />
     1505        <exec executable="chmod" failonerror="true">
     1506            <arg value="444" />
    14691507            <arg value="i2pinstall_${release.number}.exe" />
     1508            <arg value="i2pinstall_${release.number}.jar" />
    14701509            <arg value="i2psource_${release.number}.tar.bz2" />
    14711510            <arg value="i2pupdate_${release.number}.zip" />
     
    14731512            <arg value="i2pupdate.sud" />
    14741513            <arg value="i2pinstall_${release.number}.exe.sig" />
     1514            <arg value="i2pinstall_${release.number}.jar.sig" />
    14751515            <arg value="i2psource_${release.number}.tar.bz2.sig" />
    14761516            <arg value="i2pupdate_${release.number}.zip.sig" />
    14771517        </exec>
    1478         <echo message="SHA256 sums:" />
    1479         <exec executable="sha256sum" failonerror="true">
     1518        <echo message="File sizes:" />
     1519        <exec executable="ls" failonerror="true">
     1520            <arg value="-l" />
    14801521            <arg value="i2pinstall_${release.number}.exe" />
     1522            <arg value="i2pinstall_${release.number}.jar" />
    14811523            <arg value="i2psource_${release.number}.tar.bz2" />
    14821524            <arg value="i2pupdate_${release.number}.zip" />
    14831525            <arg value="i2pupdate.su2" />
    14841526            <arg value="i2pupdate.sud" />
     1527            <arg value="i2pinstall_${release.number}.exe.sig" />
     1528            <arg value="i2pinstall_${release.number}.jar.sig" />
     1529            <arg value="i2psource_${release.number}.tar.bz2.sig" />
     1530            <arg value="i2pupdate_${release.number}.zip.sig" />
     1531        </exec>
     1532        <echo message="SHA256 sums:" />
     1533        <exec executable="sha256sum" failonerror="true">
     1534            <arg value="i2pinstall_${release.number}.exe" />
     1535            <arg value="i2pinstall_${release.number}.jar" />
     1536            <arg value="i2psource_${release.number}.tar.bz2" />
     1537            <arg value="i2pupdate_${release.number}.zip" />
     1538            <arg value="i2pupdate.su2" />
     1539            <arg value="i2pupdate.sud" />
    14851540        </exec>
    14861541        <echo message="Don't forget to mtn tag w: i2p-${release.number}" />
     
    14921547    <target name="debian-binary" >
    14931548        <echo message="Did you update the version using dch -i?" />
    1494         <echo message=" " />
    1495         <echo message="If the changelog was not updated with dch -i, press" />
    1496         <echo message="press CTRL+C to abort building this Debian package." />
    1497         <echo message="" />
    1498         <echo message="Pausing build for ten seconds to give enough time to read this notice." />
    1499         <exec executable="sleep" failonerror="true">
    1500                 <arg value="10" />
    1501         </exec>
     1549        <echo message=" " />
     1550        <echo message="If the changelog was not updated with dch -i, press" />
     1551        <echo message="press CTRL+C to abort building this Debian package." />
     1552        <echo message="" />
     1553        <echo message="Pausing build for ten seconds to give enough time to read this notice." />
     1554        <exec executable="sleep" failonerror="true">
     1555                <arg value="10" />
     1556        </exec>
    15021557        <echo message="====================" />
    1503         <!-- bundle the jetty 5 lib since there isn't a deb for it -->
    1504         <ant dir="apps/jetty" target="ensureJettylib" />
    1505        
    1506         <exec executable="fakeroot" failonerror="true">
    1507             <arg value="debian/rules" />
    1508             <arg value="patch" />
    1509             <arg value="binary" />
    1510             <arg value="clean" />
    1511         </exec>
    1512         <delete dir=".pc" />
    1513     </target>
     1558
     1559        <exec executable="fakeroot" failonerror="true">
     1560            <arg value="debian/rules" />
     1561            <arg value="patch" />
     1562            <arg value="binary" />
     1563            <arg value="clean" />
     1564        </exec>
     1565        <delete dir=".pc" />
     1566    </target>
     1567
    15141568    <target name="debian-clean" depends="buildProperties" >
    15151569        <exec executable="fakeroot" failonerror="true">
    1516             <arg value="debian/rules" />
    1517             <arg value="clean" />
    1518         </exec>
    1519         <delete dir="./.pc" />
    1520     </target>
     1570            <arg value="debian/rules" />
     1571            <arg value="clean" />
     1572        </exec>
     1573        <delete dir="./.pc" />
     1574    </target>
     1575
    15211576    <target name="debian-patch" depends="buildProperties" >
    15221577        <exec executable="quilt" failonerror="true">
     
    15281583    <target name="debian-unpatch" depends="buildProperties">
    15291584        <exec executable="quilt" failonerror="false">
    1530             <arg value="-a" />
    1531             <arg value="pop" />
     1585            <arg value="-a" />
     1586            <arg value="pop" />
    15321587        </exec>
    15331588    </target>
Note: See TracChangeset for help on using the changeset viewer.