Changeset 2b81cee for build.xml


Ignore:
Timestamp:
Mar 4, 2012 12:34:00 AM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
a0a9c23
Parents:
140ffc5 (diff), f43b0be (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.zzz.jetty6' (head b2ad0d72311d5ec26270cfcbbc79d128b268869b)

to branch 'i2p.i2p' (head b05b73d4740740f306a665e4b354d412eab2f328)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r140ffc5 r2b81cee  
    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>
     
    200203        <copy file="apps/routerconsole/java/build/routerconsole.jar" todir="build/" />
    201204        <copy file="apps/routerconsole/java/build/routerconsole.war" todir="build/" />
    202         <copy file="apps/jetty/jettylib/org.mortbay.jetty.jar" todir="build/" />
    203         <copy file="apps/jetty/jettylib/jasper-compiler.jar" todir="build/" />
    204         <copy file="apps/jetty/jettylib/jasper-runtime.jar" todir="build/" />
    205         <copy file="apps/jetty/jettylib/commons-logging.jar" todir="build/" />
    206         <copy file="apps/jetty/jettylib/commons-el.jar" todir="build/" />
    207         <copy file="apps/jetty/jettylib/javax.servlet.jar" todir="build/" />
     205        <copy todir="build/" >
     206            <fileset dir="apps/jetty/jettylib" excludes="ant.jar" />
     207        </copy>
    208208    </target>
    209209
     
    433433            <group title="I2PSnark Application" packages="org.klomp.snark:org.klomp.snark.*" />
    434434            <group title="I2PTunnel Application" packages="net.i2p.i2ptunnel:net.i2p.i2ptunnel.*" />
     435            <group title="Jetty Logging" packages="net.i2p.jetty" />
    435436            <group title="SAM Bridge" packages="net.i2p.sam" />
    436437            <group title="SAM Demos" packages="net.i2p.sam.client" />
    437438            <group title="SusiDNS Application" packages="i2p.susi.dns" />
    438             <group title="SusiMail Application" packages="i2p.susi.webmail:i2p.susi.webmail.*:i2p.susi.debug:i2p.susi.util" />
     439            <group title="SusiMail Application" packages="i2p.susi.webmail:i2p.susi.webmail.*:i2p.susi.debug:i2p.susi.util:org.mortbay.servlet:org.mortbay.util" />
    439440            <group title="Systray Application" packages="net.i2p.apps.systray" />
    440441            <sourcepath>
     
    455456                <pathelement location="apps/susidns/src/java/src" />
    456457                <pathelement location="apps/susimail/src/src" />
     458                <pathelement location="apps/jetty/java/src" />
    457459            </sourcepath>
    458460            <classpath>
    459461                <pathelement location="apps/jetty/jettylib/org.mortbay.jetty.jar" />
    460462                <pathelement location="apps/jetty/jettylib/javax.servlet.jar" />
     463                <pathelement location="apps/jetty/jettylib/jetty-sslengine.jar" />
     464                <pathelement location="apps/jetty/jettylib/jetty-start.jar" />
     465                <pathelement location="apps/jetty/jettylib/jetty-java5-threadpool.jar" />
     466                <pathelement location="apps/jetty/jettylib/jetty-util.jar" />
     467                <pathelement location="apps/jetty/jettylib/jsp-api.jar" />
    461468                <pathelement location="apps/systray/java/lib/systray4j.jar" />
    462469                <pathelement location="apps/jrobin/jrobin-1.5.9.1.jar" />
     
    664671    </target>
    665672
     673    <target name="webappDistclean">
     674        <ant dir="apps/i2ptunnel/java/" target="distclean" />
     675        <ant dir="apps/routerconsole/java/" target="distclean" />
     676        <ant dir="apps/addressbook/" target="distclean" />
     677        <ant dir="apps/susimail/" target="distclean" />
     678        <ant dir="apps/susidns/src/" target="distclean" />
     679        <ant dir="apps/i2psnark/java/" target="distclean" />
     680    </target>
     681
    666682    <target name="pkg" depends="distclean, updater, preppkg, installer" />
    667683
     
    799815        <copy file="build/i2p.jar" todir="pkg-temp/lib/" />
    800816        <copy file="build/i2ptunnel.jar" todir="pkg-temp/lib/" />
    801         <copy file="build/jasper-compiler.jar" todir="pkg-temp/lib/" />
    802         <copy file="build/jasper-runtime.jar" todir="pkg-temp/lib/" />
    803         <copy file="build/commons-logging.jar" todir="pkg-temp/lib/" />
    804         <copy file="build/commons-el.jar" todir="pkg-temp/lib/" />
    805         <copy file="build/javax.servlet.jar" todir="pkg-temp/lib/" />
     817        <!-- all jetty stuff -->
     818        <copy todir="pkg-temp/lib" >
     819            <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.*.jar" />
     820        </copy>
    806821        <copy file="build/mstreaming.jar" todir="pkg-temp/lib/" />
    807822        <copy file="build/streaming.jar" todir="pkg-temp/lib/" />
    808         <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
    809823        <copy file="build/router.jar" todir="pkg-temp/lib/" />
    810824        <copy file="build/desktopgui.jar" todir="pkg-temp/lib/" />
     
    853867        <!-- Eepsite stuff here -->
    854868        <mkdir dir="pkg-temp/eepsite" />
    855         <mkdir dir="pkg-temp/eepsite/webapps" />
    856         <mkdir dir="pkg-temp/eepsite/logs" />
    857         <mkdir dir="pkg-temp/eepsite/cgi-bin" />
    858         <mkdir dir="pkg-temp/eepsite/docroot" />
    859         <mkdir dir="pkg-temp/eepsite/docroot/help" />
    860         <mkdir dir="pkg-temp/eepsite/docroot/help/lib" />
    861         <copy todir="pkg-temp/eepsite/docroot/" >
    862             <fileset dir="installer/resources/eepsite.help/" />
     869        <copy todir="pkg-temp/eepsite/" >
     870            <fileset dir="installer/resources/eepsite/" />
    863871        </copy>
    864872        <copy todir="pkg-temp/eepsite/docroot/help/lib/" >
     
    866874        </copy>
    867875        <copy file="installer/resources/themes/console/images/favicon.ico" tofile="pkg-temp/eepsite/docroot/favicon.ico" />
    868         <copy file="installer/resources/jetty.xml" tofile="pkg-temp/eepsite/jetty.xml" />
    869876    </target>
    870877
     
    880887         -->
    881888        <copy file="installer/lib/launch4j/head/LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Launch4j.txt" />
     889        <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
    882890        <!--  Not sure if these are used or should be included -->
    883891        <copy file="installer/lib/launch4j/lib/foxtrot.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Foxtrot.txt" />
     
    949957    <target name="updaterWithJetty" depends="prepjupdate, preplicenses, zipit" />
    950958    <target name="updaterWithJettyRepack" depends="prepjupdate, preplicenses, repack200, zipit" />
     959    <target name="updater200WithJetty" depends="prepjupdate, preplicenses, pack200, zipit200" />
    951960    <target name="updaterWithJettyFixes" depends="prepjupdatefixes, preplicenses, zipit" />
    952961    <target name="updaterWithJettyFixesAndJbigi" depends="prepjupdatefixes, prepjbigiupdate, preplicenses, zipit" />
     
    10891098    </target>
    10901099
     1100    <!-- All jetty jars required for update.
     1101         We don't need commons-el or commons-logging, they haven't changed.
     1102         TODO do we need to bother updating jasper?
     1103         TODO where is JMX? We don't need it I hope.
     1104      -->
    10911105    <target name="prepjupdate" depends="prepupdate, buildWEB">
    1092         <copy file="build/jasper-compiler.jar" todir="pkg-temp/lib/" />
    1093         <copy file="build/jasper-runtime.jar" todir="pkg-temp/lib/" />
    1094         <copy file="build/commons-logging.jar" todir="pkg-temp/lib/" />
    1095         <copy file="build/commons-el.jar" todir="pkg-temp/lib/" />
    1096         <copy file="build/javax.servlet.jar" todir="pkg-temp/lib/" />
    1097         <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
    1098     </target>
     1106        <copy todir="pkg-temp/lib" >
     1107            <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.*.jar" />
     1108        </copy>
     1109        <!--  We have to package the new eepsite files for MigrateJetty.java, but we
     1110              can't overwrite an existing eepsite dir in a non-split configuration.
     1111          -->
     1112        <copy todir="pkg-temp/eepsite-jetty6" >
     1113            <fileset dir="installer/resources/eepsite" includes="*.xml contexts/* etc/*" />
     1114        </copy>
     1115    </target>
     1116
     1117    <!-- Jetty 6 I2P logging addons, not really fixes -->
    10991118    <target name="prepjupdatefixes" depends="prepupdate, buildWEB">
    1100         <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
     1119        <copy file="build/jetty-i2p.jar" todir="pkg-temp/lib/" />
    11011120    </target>
    11021121
     
    15421561    <target name="debian-binary" >
    15431562        <echo message="Did you update the version using dch -i?" />
    1544         <echo message=" " />
    1545         <echo message="If the changelog was not updated with dch -i, press" />
    1546         <echo message="press CTRL+C to abort building this Debian package." />
    1547         <echo message="" />
    1548         <echo message="Pausing build for ten seconds to give enough time to read this notice." />
    1549         <exec executable="sleep" failonerror="true">
    1550                 <arg value="10" />
    1551         </exec>
     1563        <echo message=" " />
     1564        <echo message="If the changelog was not updated with dch -i, press" />
     1565        <echo message="press CTRL+C to abort building this Debian package." />
     1566        <echo message="" />
     1567        <echo message="Pausing build for ten seconds to give enough time to read this notice." />
     1568        <exec executable="sleep" failonerror="true">
     1569                <arg value="10" />
     1570        </exec>
    15521571        <echo message="====================" />
    1553         <!-- bundle the jetty 5 lib since there isn't a deb for it -->
    1554         <ant dir="apps/jetty" target="ensureJettylib" />
    1555        
    1556         <exec executable="fakeroot" failonerror="true">
    1557             <arg value="debian/rules" />
    1558             <arg value="patch" />
    1559             <arg value="binary" />
    1560             <arg value="clean" />
    1561         </exec>
    1562         <delete dir=".pc" />
    1563     </target>
     1572
     1573        <exec executable="fakeroot" failonerror="true">
     1574            <arg value="debian/rules" />
     1575            <arg value="patch" />
     1576            <arg value="binary" />
     1577            <arg value="clean" />
     1578        </exec>
     1579        <delete dir=".pc" />
     1580    </target>
     1581
    15641582    <target name="debian-clean" depends="buildProperties" >
    15651583        <exec executable="fakeroot" failonerror="true">
    1566             <arg value="debian/rules" />
    1567             <arg value="clean" />
    1568         </exec>
    1569         <delete dir="./.pc" />
    1570     </target>
     1584            <arg value="debian/rules" />
     1585            <arg value="clean" />
     1586        </exec>
     1587        <delete dir="./.pc" />
     1588    </target>
     1589
    15711590    <target name="debian-patch" depends="buildProperties" >
    15721591        <exec executable="quilt" failonerror="true">
     
    15781597    <target name="debian-unpatch" depends="buildProperties">
    15791598        <exec executable="quilt" failonerror="false">
    1580             <arg value="-a" />
    1581             <arg value="pop" />
     1599            <arg value="-a" />
     1600            <arg value="pop" />
    15821601        </exec>
    15831602    </target>
Note: See TracChangeset for help on using the changeset viewer.