Changeset 6107e38 for build.xml


Ignore:
Timestamp:
Feb 4, 2012 3:42:23 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
45ba9e1
Parents:
d93805e (diff), 061f96a (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 0f4af64e64536c467b623286bce659dd2dfe9342)

to branch 'i2p.i2p.zzz.jetty6' (head d525108d8e9ecb842a99bb81c1138c43b5e39653)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    rd93805e r6107e38  
    3737        <echo message="  updater200WithJavadoc: updater including the javadocs, for display in the console (creates i2pupdate200.zip)" />
    3838        <echo message="  updaterWithJetty: Updater including Jetty" />
     39        <echo message="  updater200withJetty: Updater including Jetty" />
    3940        <echo message="  updaterWithJettyFixes: updater including local jetty patches" />
    4041        <echo message="  updaterWithGeoIP: updater including GeoIP Files" />
     
    5253        <echo message="  slackpkg:  generate Slackware packages in ./Slackware/i2p and ./Slackware/i2p-base" />
    5354        <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)" /> -->
     55        <echo message="  debian: generate Debian packages in ../" />
     56        <echo message="          run &quot;ant debianhowto&quot; for instructions" />
     57        <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)" />
     58        <!-- <echo message="  debianrepo: build a Debian repository (reprepro required)" /> -->
    5859        <echo message="  poupdate: update the .po files for translators" />
    5960        <echo message="  pkg-portable-win32:  build a minimum portable version for win32" />
    6061   </target>
    6162    <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." />
     63            <echo message="To build debian packages, you must make sure that you have" />
     64            <echo message="the necessary build-dependencies installed." />
     65            <echo message="The packages required to build can be found in the file "/>
     66            <echo message="&quot;debian/control&quot; in the &quot;Build-Depends&quot; field."/>
     67            <echo message="In addition to those packages, be sure to install &quot;fakeroot&quot;,"/>
     68            <echo message="&quot;quilt&quot; and &quot;build-essential&quot;!" />
     69            <echo message="" />
     70            <echo message="The following command will install all of the dependencies for you:" />
     71            <echo message=" " />
     72            <echo message="apt-get install debhelper ant debconf default-jdk gettext libgmp3-dev po-debconf fakeroot build-essential \" />
     73            <echo message="                   quilt libcommons-el-java libcommons-logging-java libjetty-extra-java libjetty-java" />
     74            <echo message=" " />
     75            <echo message="Once the dependencies are installed, run &quot;ant debian&quot;"/>
     76            <echo message="to patch the source and build the packages." />
    7477    </target>
    7578    <target name="dist" depends="pkg, javadoc">
     
    134137    </target>
    135138
    136     <target name="buildJetty" depends="buildProperties" >
     139    <target name="buildJetty" depends="buildCore" >
    137140        <ant dir="apps/jetty" target="build" />
    138141    </target>
     
    199202        <copy file="apps/routerconsole/java/build/routerconsole.jar" todir="build/" />
    200203        <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/" />
     204        <copy todir="build/" >
     205            <fileset dir="apps/jetty/jettylib" excludes="ant.jar" />
     206        </copy>
    207207    </target>
    208208
     
    405405            <group title="I2PSnark Application" packages="org.klomp.snark:org.klomp.snark.*" />
    406406            <group title="I2PTunnel Application" packages="net.i2p.i2ptunnel:net.i2p.i2ptunnel.*" />
    407             <group title="SAM Bridge" packages="net.i2p.sam" />
    408             <group title="SAM Demos" packages="net.i2p.sam.client" />
     407            <group title="Jetty Logging" packages="net.i2p.jetty" />
     408            <group title="SAM Bridge" packages="net.i2p.sam:net.i2p.sam.client" />
    409409            <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" />
     410            <group title="SusiMail Application" packages="i2p.susi.webmail:i2p.susi.webmail.*:i2p.susi.debug:i2p.susi.util:org.mortbay.servlet:org.mortbay.util" />
    411411            <group title="Systray Application" packages="net.i2p.apps.systray" />
    412412            <sourcepath>
     
    427427                <pathelement location="apps/susidns/src/java/src" />
    428428                <pathelement location="apps/susimail/src/src" />
     429                <pathelement location="apps/jetty/java/src" />
    429430            </sourcepath>
    430431            <classpath>
    431432                <pathelement location="apps/jetty/jettylib/org.mortbay.jetty.jar" />
    432433                <pathelement location="apps/jetty/jettylib/javax.servlet.jar" />
     434                <pathelement location="apps/jetty/jettylib/jetty-sslengine.jar" />
     435                <pathelement location="apps/jetty/jettylib/jetty-start.jar" />
     436                <pathelement location="apps/jetty/jettylib/jetty-java5-threadpool.jar" />
     437                <pathelement location="apps/jetty/jettylib/jetty-util.jar" />
     438                <pathelement location="apps/jetty/jettylib/jsp-api.jar" />
    433439                <pathelement location="apps/systray/java/lib/systray4j.jar" />
    434440                <pathelement location="apps/jrobin/jrobin-1.5.9.1.jar" />
     
    636642    </target>
    637643
     644    <target name="webappDistclean">
     645        <ant dir="apps/i2ptunnel/java/" target="distclean" />
     646        <ant dir="apps/routerconsole/java/" target="distclean" />
     647        <ant dir="apps/addressbook/" target="distclean" />
     648        <ant dir="apps/susimail/" target="distclean" />
     649        <ant dir="apps/susidns/src/" target="distclean" />
     650        <ant dir="apps/i2psnark/java/" target="distclean" />
     651    </target>
     652
    638653    <target name="pkg" depends="distclean, updater, preppkg, installer" />
    639654
     
    764779        <copy file="build/i2p.jar" todir="pkg-temp/lib/" />
    765780        <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/" />
     781        <!-- all jetty stuff -->
     782        <copy todir="pkg-temp/lib" >
     783            <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.*.jar" />
     784        </copy>
    771785        <copy file="build/mstreaming.jar" todir="pkg-temp/lib/" />
    772786        <copy file="build/streaming.jar" todir="pkg-temp/lib/" />
    773         <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
    774787        <copy file="build/router.jar" todir="pkg-temp/lib/" />
    775788        <copy file="build/desktopgui.jar" todir="pkg-temp/lib/" />
     
    818831        <!-- Eepsite stuff here -->
    819832        <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/" />
     833        <copy todir="pkg-temp/eepsite/" >
     834            <fileset dir="installer/resources/eepsite/" />
    828835        </copy>
    829836        <copy todir="pkg-temp/eepsite/docroot/help/lib/" >
     
    831838        </copy>
    832839        <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" />
    834840    </target>
    835841
     
    845851         -->
    846852        <copy file="installer/lib/launch4j/head/LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Launch4j.txt" />
     853        <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
    847854        <!--  Not sure if these are used or should be included -->
    848855        <copy file="installer/lib/launch4j/lib/foxtrot.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Foxtrot.txt" />
     
    913920    <target name="updaterWithJetty" depends="prepjupdate, preplicenses, zipit" />
    914921    <target name="updaterWithJettyRepack" depends="prepjupdate, preplicenses, repack200, zipit" />
     922    <target name="updater200WithJetty" depends="prepjupdate, preplicenses, pack200, zipit200" />
    915923    <target name="updaterWithJettyFixes" depends="prepjupdatefixes, preplicenses, zipit" />
    916924    <target name="updaterWithJettyFixesAndJbigi" depends="prepjupdatefixes, prepjbigiupdate, preplicenses, zipit" />
     
    10521060    </target>
    10531061
     1062    <!-- All jetty jars required for update.
     1063         We don't need commons-el or commons-logging, they haven't changed.
     1064         TODO do we need to bother updating jasper?
     1065         TODO where is JMX? We don't need it I hope.
     1066      -->
    10541067    <target name="prepjupdate" depends="prepupdate, buildWEB">
    1055         <copy file="build/jasper-compiler.jar" todir="pkg-temp/lib/" />
    1056         <copy file="build/jasper-runtime.jar" todir="pkg-temp/lib/" />
    1057         <copy file="build/commons-logging.jar" todir="pkg-temp/lib/" />
    1058         <copy file="build/commons-el.jar" todir="pkg-temp/lib/" />
    1059         <copy file="build/javax.servlet.jar" todir="pkg-temp/lib/" />
    1060         <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
    1061     </target>
     1068        <copy todir="pkg-temp/lib" >
     1069            <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.*.jar" />
     1070        </copy>
     1071        <!--  We have to package the new eepsite files for MigrateJetty.java, but we
     1072              can't overwrite an existing eepsite dir in a non-split configuration.
     1073          -->
     1074        <copy todir="pkg-temp/eepsite-jetty6" >
     1075            <fileset dir="installer/resources/eepsite" includes="*.xml contexts/* etc/*" />
     1076        </copy>
     1077    </target>
     1078
     1079    <!-- Jetty 6 I2P logging addons, not really fixes -->
    10621080    <target name="prepjupdatefixes" depends="prepupdate, buildWEB">
    1063         <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
     1081        <copy file="build/jetty-i2p.jar" todir="pkg-temp/lib/" />
    10641082    </target>
    10651083
     
    14931511    <target name="debian-binary" >
    14941512        <echo message="Did you update the version using dch -i?" />
    1495         <echo message=" " />
    1496         <echo message="If the changelog was not updated with dch -i, press" />
    1497         <echo message="press CTRL+C to abort building this Debian package." />
    1498         <echo message="" />
    1499         <echo message="Pausing build for ten seconds to give enough time to read this notice." />
    1500         <exec executable="sleep" failonerror="true">
    1501                 <arg value="10" />
    1502         </exec>
     1513        <echo message=" " />
     1514        <echo message="If the changelog was not updated with dch -i, press" />
     1515        <echo message="press CTRL+C to abort building this Debian package." />
     1516        <echo message="" />
     1517        <echo message="Pausing build for ten seconds to give enough time to read this notice." />
     1518        <exec executable="sleep" failonerror="true">
     1519                <arg value="10" />
     1520        </exec>
    15031521        <echo message="====================" />
    1504         <!-- bundle the jetty 5 lib since there isn't a deb for it -->
    1505         <ant dir="apps/jetty" target="ensureJettylib" />
    1506        
    1507         <exec executable="fakeroot" failonerror="true">
    1508             <arg value="debian/rules" />
    1509             <arg value="patch" />
    1510             <arg value="binary" />
    1511             <arg value="clean" />
    1512         </exec>
    1513         <delete dir=".pc" />
    1514     </target>
     1522
     1523        <exec executable="fakeroot" failonerror="true">
     1524            <arg value="debian/rules" />
     1525            <arg value="patch" />
     1526            <arg value="binary" />
     1527            <arg value="clean" />
     1528        </exec>
     1529        <delete dir=".pc" />
     1530    </target>
     1531
    15151532    <target name="debian-clean" depends="buildProperties" >
    15161533        <exec executable="fakeroot" failonerror="true">
    1517             <arg value="debian/rules" />
    1518             <arg value="clean" />
    1519         </exec>
    1520         <delete dir="./.pc" />
    1521     </target>
     1534            <arg value="debian/rules" />
     1535            <arg value="clean" />
     1536        </exec>
     1537        <delete dir="./.pc" />
     1538    </target>
     1539
    15221540    <target name="debian-patch" depends="buildProperties" >
    15231541        <exec executable="quilt" failonerror="true">
     
    15291547    <target name="debian-unpatch" depends="buildProperties">
    15301548        <exec executable="quilt" failonerror="false">
    1531             <arg value="-a" />
    1532             <arg value="pop" />
     1549            <arg value="-a" />
     1550            <arg value="pop" />
    15331551        </exec>
    15341552    </target>
Note: See TracChangeset for help on using the changeset viewer.