Changeset 84d8683 for build.xml


Ignore:
Timestamp:
Jan 19, 2011 4:51:42 PM (10 years ago)
Author:
mathiasdm <mathiasdm@…>
Branches:
master
Children:
587dd30
Parents:
5371481
Message:

Added desktopgui to installation, updater and startup.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r5371481 r84d8683  
    6262    <target name="builddep" depends="builddepSmall, buildBOB, buildSAM, buildSusiMail, buildSusiDNS, buildI2PSnark" />
    6363
    64     <target name="builddepSmall" depends="buildrouter, buildSystray, buildRouterConsole, buildStreaming, buildI2PTunnel, buildAddressbook" />
     64    <target name="builddepSmall" depends="buildrouter, buildSystray, buildDesktopGui, buildRouterConsole, buildStreaming, buildI2PTunnel, buildAddressbook" />
    6565
    6666    <!-- start of buildX, one for each sub-build.xml.
     
    9898    </target>
    9999
    100     <target name="buildRouterConsole" depends="buildrouter, buildSystray, buildJetty" >
     100    <target name="buildDesktopGui" depends="buildCore, buildrouter" >
     101        <ant dir="apps/desktopgui" target="jar" />
     102    </target>
     103
     104    <target name="buildRouterConsole" depends="buildrouter, buildSystray, buildDesktopGui, buildJetty" >
    101105        <ant dir="apps/routerconsole/java/" target="jar" />
    102106    </target>
     
    166170            <manifest>
    167171             <attribute name="Main-Class" value="net.i2p.router.RouterLaunch" />
    168              <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" />
     172             <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" />
    169173            </manifest>
    170174        </jar>
     
    193197        <copy file="apps/i2ptunnel/java/build/i2ptunnel.war" todir="build/" />
    194198        <copy file="apps/systray/java/build/systray.jar" todir="build/" />
     199        <copy file="apps/desktopgui/dist/desktopgui.jar" todir="build/" />
    195200        <copy file="installer/lib/jbigi/jbigi.jar" todir="build" />
    196201        <copy file="apps/addressbook/dist/addressbook.war" todir="build/" />
     
    202207        <ant dir="apps/i2ptunnel/java/" target="poupdate" />
    203208        <ant dir="apps/susidns/src/" target="poupdate" />
     209        <ant dir="apps/desktopgui" target="poupdate" />
    204210    </target>
    205211    <target name="javadoc">
     
    247253            <group title="SusiMail Application" packages="i2p.susi.webmail:i2p.susi.webmail.*:i2p.susi.debug:i2p.susi.util" />
    248254            <group title="Systray Application" packages="net.i2p.apps.systray" />
     255            <group title="Desktopgui Application" packages="net.i2p.desktopgui.*" />
    249256            <sourcepath>
    250257                <pathelement location="core/java/src" />
     
    256263                <pathelement location="apps/i2ptunnel/java/src" />
    257264                <pathelement location="apps/systray/java/src" />
     265                <pathelement location="apps/desktopgui/src" />
    258266                <pathelement location="apps/routerconsole/java/src" />
    259267                <pathelement location="apps/addressbook/java/src" />
     
    302310        <ant dir="apps/sam/java/" target="distclean" />
    303311        <ant dir="apps/BOB" target="clean" />
     312        <ant dir="apps/desktopgui" target="clean" />
    304313        <ant dir="apps/routerconsole/java/" target="distclean" />
    305314        <ant dir="apps/addressbook/" target="distclean" />
     
    433442        <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
    434443        <copy file="build/router.jar" todir="pkg-temp/lib/" />
     444        <copy file="build/desktopgui.jar" todir="pkg-temp/lib/" />
    435445        <copy file="build/routerconsole.jar" todir="pkg-temp/lib/" />
    436446        <!-- pulled out of routerconsole.jar in 0.7.12; name without version so we can overwrite if we upgrade  -->
     
    603613        <!-- include systray changes in 0.7.5 -->
    604614        <copy file="build/systray.jar" todir="pkg-temp/lib/" />
     615        <copy file="build/desktopgui.jar" todir="pkg-temp/lib/" />
    605616        <copy file="build/susimail.war" todir="pkg-temp/webapps/" />
    606617        <copy file="build/susidns.war" todir="pkg-temp/webapps/" />
     
    733744                <ant dir="core/java/" target="fullclovertest" />
    734745                <ant dir="router/java/" target="fullclovertest" />
    735     </target>
    736     <target name="desktopgui" depends="builddepSmall">
    737         <ant dir="apps/desktopgui" target="jar" />
    738         <copy file="apps/desktopgui/dist/desktopgui.jar" todir="." />
    739746    </target>
    740747    <target name="syndie" >
     
    781788            <arg value="build/mstreaming.jar"/>
    782789            <arg value="build/router.jar/"/>
     790            <arg value="build/desktopgui.jar"/>
    783791            <arg value="build/routerconsole.jar"/>
    784792            <arg value="build/routerconsole.war"/>
Note: See TracChangeset for help on using the changeset viewer.