Changeset 23ca49ea for build.xml


Ignore:
Timestamp:
Jan 14, 2012 6:04:39 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
fd6fcda
Parents:
7df8814 (diff), edf5ef5 (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 b3d611a1fe034bc89963c54179d5bef3a3147950)

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r7df8814 r23ca49ea  
    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" />
     
    5152        <echo message="  slackpkg:  generate Slackware packages in ./Slackware/i2p and ./Slackware/i2p-base" />
    5253        <echo message="  debianhowto: instructions on building Debian packages" />
    53         <echo message="  debian: generate Debian packages in ../" />
    54         <echo message="          run &quot;ant debianhowto&quot; for instructions" />
    55         <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)" />
    56         <!-- <echo message="  debianrepo: build a Debian repository (reprepro required)" /> -->
     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)" /> -->
    5758        <echo message="  poupdate: update the .po files for translators" />
    5859        <echo message="  pkg-portable-win32:  build a minimum portable version for win32" />
    5960   </target>
    6061    <target name="debianhowto">
    61             <echo message="To build debian packages, you must make sure that you have" />
    62             <echo message="the necessary build-dependencies installed." />
    63             <echo message="The packages required to build can be found in the file "/>
    64             <echo message="&quot;debian/control&quot; in both the Build-Depends and Build-Depends-Indep fields."/>
    65             <echo message="In addition to those packages, be sure to install &quot;fakeroot&quot;,"/>
    66             <echo message="&quot;quilt&quot; and &quot;build-essential&quot;!" />
    67             <echo message="" />
    68             <echo message="The following command will install all dependencies for you:" />
    69             <echo message="apt-get install debhelper ant debconf default-jdk gettext libgmp3-dev po-debconf fakeroot build-essential quilt" />
    70             <echo message=" " />
    71             <echo message="Once the dependencies are installed, run &quot;ant debian&quot;"/>
    72             <echo message="to patch the source and build the packages." />
     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 the &quot;Build-Depends&quot; field."/>
     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 of the dependencies for you:" />
     70            <echo message=" " />
     71            <echo message="apt-get install debhelper ant debconf default-jdk gettext libgmp3-dev po-debconf fakeroot build-essential \" />
     72            <echo message="                   quilt libcommons-el-java libcommons-logging-java libjetty-extra-java libjetty-java" />
     73            <echo message=" " />
     74            <echo message="Once the dependencies are installed, run &quot;ant debian&quot;"/>
     75            <echo message="to patch the source and build the packages." />
    7376    </target>
    7477    <target name="dist" depends="pkg, javadoc">
     
    133136    </target>
    134137
    135     <target name="buildJetty" depends="buildProperties" >
     138    <target name="buildJetty" depends="buildCore" >
    136139        <ant dir="apps/jetty" target="build" />
    137140    </target>
     
    196199        <copy file="apps/routerconsole/java/build/routerconsole.jar" todir="build/" />
    197200        <copy file="apps/routerconsole/java/build/routerconsole.war" todir="build/" />
    198         <copy file="apps/jetty/jettylib/org.mortbay.jetty.jar" todir="build/" />
    199         <copy file="apps/jetty/jettylib/jasper-compiler.jar" todir="build/" />
    200         <copy file="apps/jetty/jettylib/jasper-runtime.jar" todir="build/" />
    201         <copy file="apps/jetty/jettylib/commons-logging.jar" todir="build/" />
    202         <copy file="apps/jetty/jettylib/commons-el.jar" todir="build/" />
    203         <copy file="apps/jetty/jettylib/javax.servlet.jar" todir="build/" />
     201        <copy todir="build/" >
     202            <fileset dir="apps/jetty/jettylib" excludes="ant.jar" />
     203        </copy>
    204204    </target>
    205205
     
    401401            <group title="I2PSnark Application" packages="org.klomp.snark:org.klomp.snark.*" />
    402402            <group title="I2PTunnel Application" packages="net.i2p.i2ptunnel:net.i2p.i2ptunnel.*" />
     403            <group title="Jetty Logging" packages="org.mortbay.http" />
    403404            <group title="SAM Bridge" packages="net.i2p.sam:net.i2p.sam.client" />
    404405            <group title="SusiDNS Application" packages="i2p.susi.dns" />
    405             <group title="SusiMail Application" packages="i2p.susi.webmail:i2p.susi.webmail.*:i2p.susi.debug:i2p.susi.util" />
     406            <group title="SusiMail Application" packages="i2p.susi.webmail:i2p.susi.webmail.*:i2p.susi.debug:i2p.susi.util:org.mortbay.servlet:org.mortbay.util" />
    406407            <group title="Systray Application" packages="net.i2p.apps.systray" />
    407408            <sourcepath>
     
    422423                <pathelement location="apps/susidns/src/java/src" />
    423424                <pathelement location="apps/susimail/src/src" />
     425                <pathelement location="apps/jetty/java/src" />
    424426            </sourcepath>
    425427            <classpath>
    426428                <pathelement location="apps/jetty/jettylib/org.mortbay.jetty.jar" />
    427429                <pathelement location="apps/jetty/jettylib/javax.servlet.jar" />
     430                <pathelement location="apps/jetty/jettylib/jetty-sslengine.jar" />
     431                <pathelement location="apps/jetty/jettylib/jetty-start.jar" />
     432                <pathelement location="apps/jetty/jettylib/jetty-java5-threadpool.jar" />
     433                <pathelement location="apps/jetty/jettylib/jetty-util.jar" />
     434                <pathelement location="apps/jetty/jettylib/jsp-api.jar" />
    428435                <pathelement location="apps/systray/java/lib/systray4j.jar" />
    429436                <pathelement location="apps/jrobin/jrobin-1.5.9.1.jar" />
     
    570577    </target>
    571578
     579    <target name="webappDistclean">
     580        <ant dir="apps/i2ptunnel/java/" target="distclean" />
     581        <ant dir="apps/routerconsole/java/" target="distclean" />
     582        <ant dir="apps/addressbook/" target="distclean" />
     583        <ant dir="apps/susimail/" target="distclean" />
     584        <ant dir="apps/susidns/src/" target="distclean" />
     585        <ant dir="apps/i2psnark/java/" target="distclean" />
     586    </target>
     587
    572588    <target name="pkg" depends="distclean, updater, preppkg, installer" />
    573589
     
    689705        <copy file="build/i2p.jar" todir="pkg-temp/lib/" />
    690706        <copy file="build/i2ptunnel.jar" todir="pkg-temp/lib/" />
    691         <copy file="build/jasper-compiler.jar" todir="pkg-temp/lib/" />
    692         <copy file="build/jasper-runtime.jar" todir="pkg-temp/lib/" />
    693         <copy file="build/commons-logging.jar" todir="pkg-temp/lib/" />
    694         <copy file="build/commons-el.jar" todir="pkg-temp/lib/" />
    695         <copy file="build/javax.servlet.jar" todir="pkg-temp/lib/" />
     707        <!-- all jetty stuff -->
     708        <copy todir="pkg-temp/lib" >
     709            <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.jetty.jar" />
     710        </copy>
    696711        <copy file="build/mstreaming.jar" todir="pkg-temp/lib/" />
    697712        <copy file="build/streaming.jar" todir="pkg-temp/lib/" />
    698         <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
    699713        <copy file="build/router.jar" todir="pkg-temp/lib/" />
    700714        <copy file="build/desktopgui.jar" todir="pkg-temp/lib/" />
     
    743757        <!-- Eepsite stuff here -->
    744758        <mkdir dir="pkg-temp/eepsite" />
    745         <mkdir dir="pkg-temp/eepsite/webapps" />
    746         <mkdir dir="pkg-temp/eepsite/logs" />
    747         <mkdir dir="pkg-temp/eepsite/cgi-bin" />
    748         <mkdir dir="pkg-temp/eepsite/docroot" />
    749         <mkdir dir="pkg-temp/eepsite/docroot/help" />
    750         <mkdir dir="pkg-temp/eepsite/docroot/help/lib" />
    751         <copy todir="pkg-temp/eepsite/docroot/" >
    752             <fileset dir="installer/resources/eepsite.help/" />
     759        <copy todir="pkg-temp/eepsite/" >
     760            <fileset dir="installer/resources/eepsite/" />
    753761        </copy>
    754762        <copy todir="pkg-temp/eepsite/docroot/help/lib/" >
     
    756764        </copy>
    757765        <copy file="installer/resources/themes/console/images/favicon.ico" tofile="pkg-temp/eepsite/docroot/favicon.ico" />
    758         <copy file="installer/resources/jetty.xml" tofile="pkg-temp/eepsite/jetty.xml" />
    759766    </target>
    760767
     
    770777         -->
    771778        <copy file="installer/lib/launch4j/head/LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Launch4j.txt" />
     779        <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
    772780        <!--  Not sure if these are used or should be included -->
    773781        <copy file="installer/lib/launch4j/lib/foxtrot.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Foxtrot.txt" />
     
    836844    <target name="updaterWithGeoIP" depends="prepupdate, prepgeoupdate, preplicenses, zipit" />
    837845    <target name="updaterWithJetty" depends="prepjupdate, preplicenses, zipit" />
     846    <target name="updater200WithJetty" depends="prepjupdate, preplicenses, pack200, zipit200" />
    838847    <target name="updaterWithJettyFixes" depends="prepjupdatefixes, preplicenses, zipit" />
    839848    <target name="updaterWithJettyFixesAndJbigi" depends="prepjupdatefixes, prepjbigiupdate, preplicenses, zipit" />
     
    952961    </target>
    953962
     963    <!-- All jetty jars required for update.
     964         We don't need commons-el or commons-logging, they haven't changed.
     965         TODO do we need to bother updating jasper?
     966         TODO where is JMX? We don't need it I hope.
     967      -->
    954968    <target name="prepjupdate" depends="prepupdate, buildWEB">
    955         <copy file="build/jasper-compiler.jar" todir="pkg-temp/lib/" />
    956         <copy file="build/jasper-runtime.jar" todir="pkg-temp/lib/" />
    957         <copy file="build/commons-logging.jar" todir="pkg-temp/lib/" />
    958         <copy file="build/commons-el.jar" todir="pkg-temp/lib/" />
    959         <copy file="build/javax.servlet.jar" todir="pkg-temp/lib/" />
    960         <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
    961     </target>
     969        <copy todir="pkg-temp/lib" >
     970            <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.jetty.jar" />
     971        </copy>
     972        <!--  We have to package the new eepsite files for MigrateJetty.java, but we
     973              can't overwrite an existing eepsite dir in a non-split configuration.
     974          -->
     975        <copy todir="pkg-temp/eepsite-jetty6" >
     976            <fileset dir="installer/resources/eepsite" includes="*.xml contexts/* etc/*" />
     977        </copy>
     978    </target>
     979
     980    <!-- Jetty 6 I2P logging addons, not really fixes -->
    962981    <target name="prepjupdatefixes" depends="prepupdate, buildWEB">
    963         <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
     982        <copy file="build/jetty-i2p.jar" todir="pkg-temp/lib/" />
    964983    </target>
    965984
     
    13931412    <target name="debian-binary" >
    13941413        <echo message="Did you update the version using dch -i?" />
    1395         <echo message=" " />
    1396         <echo message="If the changelog was not updated with dch -i, press" />
    1397         <echo message="press CTRL+C to abort building this Debian package." />
    1398         <echo message="" />
    1399         <echo message="Pausing build for ten seconds to give enough time to read this notice." />
    1400         <exec executable="sleep" failonerror="true">
    1401                 <arg value="10" />
    1402         </exec>
     1414        <echo message=" " />
     1415        <echo message="If the changelog was not updated with dch -i, press" />
     1416        <echo message="press CTRL+C to abort building this Debian package." />
     1417        <echo message="" />
     1418        <echo message="Pausing build for ten seconds to give enough time to read this notice." />
     1419        <exec executable="sleep" failonerror="true">
     1420                <arg value="10" />
     1421        </exec>
    14031422        <echo message="====================" />
    1404         <!-- bundle the jetty 5 lib since there isn't a deb for it -->
    1405         <ant dir="apps/jetty" target="ensureJettylib" />
    1406        
    1407         <exec executable="fakeroot" failonerror="true">
    1408             <arg value="debian/rules" />
    1409             <arg value="patch" />
    1410             <arg value="binary" />
    1411             <arg value="clean" />
    1412         </exec>
    1413         <delete dir=".pc" />
    1414     </target>
     1423
     1424        <exec executable="fakeroot" failonerror="true">
     1425            <arg value="debian/rules" />
     1426            <arg value="patch" />
     1427            <arg value="binary" />
     1428            <arg value="clean" />
     1429        </exec>
     1430        <delete dir=".pc" />
     1431    </target>
     1432
    14151433    <target name="debian-clean" depends="buildProperties" >
    14161434        <exec executable="fakeroot" failonerror="true">
    1417             <arg value="debian/rules" />
    1418             <arg value="clean" />
    1419         </exec>
    1420         <delete dir="./.pc" />
    1421     </target>
     1435            <arg value="debian/rules" />
     1436            <arg value="clean" />
     1437        </exec>
     1438        <delete dir="./.pc" />
     1439    </target>
     1440
    14221441    <target name="debian-patch" depends="buildProperties" >
    14231442        <exec executable="quilt" failonerror="true">
     
    14291448    <target name="debian-unpatch" depends="buildProperties">
    14301449        <exec executable="quilt" failonerror="false">
    1431             <arg value="-a" />
    1432             <arg value="pop" />
     1450            <arg value="-a" />
     1451            <arg value="pop" />
    14331452        </exec>
    14341453    </target>
Note: See TracChangeset for help on using the changeset viewer.