Changeset bd78a66


Ignore:
Timestamp:
Aug 1, 2004 5:31:15 AM (16 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
337441b
Parents:
96f9618
git-author:
jrandom <jrandom> (08/01/04 05:31:15)
git-committer:
zzz <zzz@…> (08/01/04 05:31:15)
Message:

updated build proc to conditionally fetch the jetty libs from http://dev.i2p.net/jettylib.tar.bz2
now the main ant 'dist' will build the web stuff as well (but ant 'build' wont)

Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/java/build.xml

    r96f9618 rbd78a66  
    33    <target name="all" depends="clean, build" />
    44    <target name="build" depends="builddep, jar" />
    5     <target name="builddep" depends="jetty" >
     5    <target name="builddep">
    66        <ant dir="../../../router/java/" target="build" />
    77        <!-- router will build core -->
    88    </target>
    9     <target name="jetty">
    10         <untar src="jetty-4.2.21-min.tar.bz2" compression="bzip2" dest="." />
    11         <ant dir="jetty-4.2.21-min/extra/jdk1.2/" target="all" />
     9    <target name="prepare">
     10        <ant dir="../../jetty/" target="build" />
    1211    </target>
    13     <target name="compile">
     12    <target name="compile" depends="prepare">
    1413        <mkdir dir="./build" />
    1514        <mkdir dir="./build/obj" />
     
    1817            debug="true" deprecation="on" source="1.3" target="1.3"
    1918            destdir="./build/obj"
    20             classpath="../../../core/java/build/i2p.jar:../../../router/java/build/router.jar:jetty-4.2.21-min/extra/lib/org.mortbay.jetty-jdk1.2.jar" />
     19            classpath="../../../core/java/build/i2p.jar:../../../router/java/build/router.jar:../../jetty/jettylib/org.mortbay.jetty-jdk1.2.jar" />
    2120    </target>
    2221    <target name="jar" depends="compile">
     
    5352        <!-- router will clean core -->
    5453        <ant dir="../../../router/java/" target="distclean" />
    55         <delete dir="./jetty-4.2.21-min" />
    5654    </target>
    5755</project>
  • build.xml

    r96f9618 rbd78a66  
    11<?xml version="1.0" encoding="UTF-8"?>
    22<project basedir="." default="all" name="i2p">
     3    <available property="jettylib.available" file="apps/jetty/jettylib" />
     4   
    35    <target name="all" >
    46        <echo message="Useful targets: " />
     
    79        <echo message="  clean:     clean up the ./build/ dir" />
    810        <echo message="  distclean: clean up all derived files" />
    9         <echo message="  dist:      distclean, then build and javadoc" />
     11        <echo message="  dist:      distclean, then build and javadoc (including the web app and associated libs)" />
    1012        <echo message="  prepGUI:   pull the LGPL and APL code for JFreeChart that we use in the GUIs" />
    1113        <echo message="  buildGUI:  build the heartbeat and netmonitor GUIs (must have run prepGUI already)" />
    12         <echo message="  buildWEB:  build the Jetty instance and router console web application" />
     14        <echo message="  prepWEB:   pull down the Jetty libraries and whatever they depend on for the router console web application" />
     15        <echo message="  buildWEB:  build the router console web application (depends upon prepWEB)" />
    1316    </target>
    14     <target name="dist" depends="distclean, build, javadoc" />
     17    <target name="dist" depends="distclean, build, buildWEB, javadoc" />
    1518    <target name="build" depends="builddep, jar" />
    16     <target name="buildclean" depends="distclean, builddep, jar" />
     19    <target name="buildclean" depends="distclean, build" />
    1720    <target name="builddep">
    1821        <!-- build *everything* here, but only once -->
     
    2730        <ant dir="apps/netmonitor/java/" target="jar" />
    2831        <ant dir="apps/time/java/" target="jar" />
     32        <ant dir="apps/routerconsole/java/" target="jar" />
    2933        <ant dir="installer/java/" target="jar" />
    3034    </target>
     
    4953        <mkdir dir="./build/javadoc" />
    5054        <javadoc
    51             sourcepath="core/java/src:core/java/test:router/java/src:router/java/test:apps/ministreaming/java/src:apps/i2ptunnel/java/src:apps/httptunnel/java/src"
     55            sourcepath="core/java/src:core/java/test:router/java/src:router/java/test:apps/ministreaming/java/src:apps/i2ptunnel/java/src:apps/httptunnel/java/src:apps/routerconsole/java/src"
     56            classpath="apps/jetty/jettylib/org.mortbay.jetty.jar"
    5257            destdir="./build/javadoc"
    5358            packagenames="*"
     
    6974        <ant dir="apps/heartbeat/java/" target="distclean" />
    7075        <ant dir="apps/netmonitor/java/" target="distclean" />
     76        <ant dir="apps/routerconsole/java/" target="distclean" />
    7177        <ant dir="apps/time/java/" target="distclean" />
    7278        <ant dir="installer/java/" target="distclean" />
     
    110116        <echo message="To run the heartbeat GUI: java -cp jfreechart-0.9.17.jar:log4j-1.2.8.jar:jcommon-0.9.2.jar -jar heartbeatGUI.jar" />
    111117    </target>
    112     <target name="buildWEB">
     118    <target name="prepWEB">
     119        <ant dir="apps/jetty" target="fetchJettylib" />
     120    </target>
     121    <target name="buildWEB" if="jettylib.available">
    113122        <ant dir="apps/routerconsole/java" target="build" />
    114123        <copy file="apps/routerconsole/java/build/routerconsole.jar" todir="build/" />
    115124        <copy file="apps/routerconsole/java/build/routerconsole.war" todir="build/" />
    116         <copy file="apps/routerconsole/java/jetty-4.2.21-min/extra/lib/org.mortbay.jetty-jdk1.2.jar" todir="build/" />
    117         <copy file="apps/routerconsole/java/jetty-4.2.21-min/ext/ant.jar" todir="build/" />
    118         <copy file="apps/routerconsole/java/jetty-4.2.21-min/ext/jasper-compiler.jar" todir="build/" />
    119         <copy file="apps/routerconsole/java/jetty-4.2.21-min/ext/jasper-runtime.jar" todir="build/" />
    120         <copy file="apps/routerconsole/java/jetty-4.2.21-min/ext/jcert.jar" todir="build/" />
    121         <copy file="apps/routerconsole/java/jetty-4.2.21-min/ext/jnet.jar" todir="build/" />
    122         <copy file="apps/routerconsole/java/jetty-4.2.21-min/ext/xercesImpl.jar" todir="build/" />
    123         <copy file="apps/routerconsole/java/jetty-4.2.21-min/ext/xml-apis.jar" todir="build/" />
    124         <copy file="apps/routerconsole/java/jetty-4.2.21-min/ext/javax.servlet.jar" todir="build/" />
    125         <echo message="You will need the org.*, ant.jar, jasper-*.jar, jcert.jar, jnet.jar, xerces.jar, xml-apis.jar, and routerconsole.jar in your router's classpath" />
    126         <echo message="In addition, you will need to place the routerconsole.war file under your i2p install dir as webapps/routerconsole.war" />
     125        <copy file="apps/jetty/jettylib/org.mortbay.jetty.jar" todir="build/" />
     126        <copy file="apps/jetty/jettylib/org.mortbay.jetty-jdk1.2.jar" todir="build/" />
     127        <copy file="apps/jetty/jettylib/ant.jar" todir="build/" />
     128        <copy file="apps/jetty/jettylib/jasper-compiler.jar" todir="build/" />
     129        <copy file="apps/jetty/jettylib/jasper-runtime.jar" todir="build/" />
     130        <copy file="apps/jetty/jettylib/jnet.jar" todir="build/" />
     131        <copy file="apps/jetty/jettylib/xercesImpl.jar" todir="build/" />
     132        <copy file="apps/jetty/jettylib/xml-apis.jar" todir="build/" />
     133        <copy file="apps/jetty/jettylib/javax.servlet.jar" todir="build/" />
     134        <echo message="You will need the org.*, ant.jar, jasper-*.jar, jnet.jar, xercesImpl.jar, xml-apis.jar, " />
     135        <echo message="and routerconsole.jar in your router's classpath.  In addition, you will need to place the " />
     136        <echo message="routerconsole.war file under your i2p install dir as webapps/routerconsole.war and will want " />
     137        <echo message="to add the RouterConsoleRunner to the router's clientApp list (it must be in the router's JVM)" />
    127138    </target>
    128139</project>
Note: See TracChangeset for help on using the changeset viewer.