Changeset 37fc448 for build.xml


Ignore:
Timestamp:
Jan 26, 2011 6:48:45 AM (11 years ago)
Author:
mathiasdm <mathiasdm@…>
Branches:
master
Children:
07b2e3e
Parents:
89e0e66 (diff), a440358 (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 dbe319d674d6a6a53491762262978f53caaaa58a)

to branch 'i2p.i2p.mathiasdm.desktopgui' (head fced1e04334ef1c18bc6ae8a31984e627310b14c)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r89e0e66 r37fc448  
    3333        <echo message="  distclean: clean up all derived files" />
    3434        <echo message="  syndie:    generate a standalone syndie install" />
     35        <echo message="  desktopgui: generate a standalone desktopgui install" />
    3536        <echo message="  i2psnark:  generate a standalone i2psnark install" />
    3637        <echo message="  justBOB:  generate a standalone BOB-one.jar" />
     
    4142        <echo message="          (libc6-i686 and libc6-amd64 required, ant>=1.8 required)" />
    4243        <echo message="  debianrepo: build a Debian repository (reprepro required)" />
    43         <echo message="  updaterWithDesktopgui: tar the built files and desktopgui in an i2pupdate.zip" />
    44         <echo message="  pkgWithDesktopgui: distclean then package everything up with the desktopgui" />
    45         <echo message="  distWithDesktopgui: pkgWithDesktopgui and javadoc" />
    46         <echo message="  distcleanWithDesktopgui: clean up all derived files (including desktopgui files)" />
    4744        <echo message="  poupdate: update the .po files for translators" />
    4845    </target>
     
    6562    <target name="builddep" depends="builddepSmall, buildBOB, buildSAM, buildSusiMail, buildSusiDNS, buildI2PSnark" />
    6663
    67     <target name="builddepSmall" depends="buildrouter, buildSystray, buildRouterConsole, buildStreaming, buildI2PTunnel, buildAddressbook" />
     64    <target name="builddepSmall" depends="buildrouter, buildSystray, buildDesktopGui, buildRouterConsole, buildStreaming, buildI2PTunnel, buildAddressbook" />
    6865
    6966    <!-- start of buildX, one for each sub-build.xml.
     
    10198    </target>
    10299
    103     <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" >
    104105        <ant dir="apps/routerconsole/java/" target="jar" />
    105106    </target>
     
    169170            <manifest>
    170171             <attribute name="Main-Class" value="net.i2p.router.RouterLaunch" />
    171              <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" />
    172173            </manifest>
    173174        </jar>
     
    196197        <copy file="apps/i2ptunnel/java/build/i2ptunnel.war" todir="build/" />
    197198        <copy file="apps/systray/java/build/systray.jar" todir="build/" />
     199        <copy file="apps/desktopgui/dist/desktopgui.jar" todir="build/" />
    198200        <copy file="installer/lib/jbigi/jbigi.jar" todir="build" />
    199201        <copy file="apps/addressbook/dist/addressbook.war" todir="build/" />
     
    205207        <ant dir="apps/i2ptunnel/java/" target="poupdate" />
    206208        <ant dir="apps/susidns/src/" target="poupdate" />
     209        <ant dir="apps/desktopgui" target="poupdate" />
    207210    </target>
    208211    <target name="javadoc">
     
    250253            <group title="SusiMail Application" packages="i2p.susi.webmail:i2p.susi.webmail.*:i2p.susi.debug:i2p.susi.util" />
    251254            <group title="Systray Application" packages="net.i2p.apps.systray" />
     255            <group title="Desktopgui Application" packages="net.i2p.desktopgui.*" />
    252256            <sourcepath>
    253257                <pathelement location="core/java/src" />
     
    259263                <pathelement location="apps/i2ptunnel/java/src" />
    260264                <pathelement location="apps/systray/java/src" />
     265                <pathelement location="apps/desktopgui/src" />
    261266                <pathelement location="apps/routerconsole/java/src" />
    262267                <pathelement location="apps/addressbook/java/src" />
     
    305310        <ant dir="apps/sam/java/" target="distclean" />
    306311        <ant dir="apps/BOB" target="clean" />
     312        <ant dir="apps/desktopgui" target="clean" />
    307313        <ant dir="apps/routerconsole/java/" target="distclean" />
    308314        <ant dir="apps/addressbook/" target="distclean" />
     
    436442        <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
    437443        <copy file="build/router.jar" todir="pkg-temp/lib/" />
     444        <copy file="build/desktopgui.jar" todir="pkg-temp/lib/" />
    438445        <copy file="build/routerconsole.jar" todir="pkg-temp/lib/" />
    439446        <!-- pulled out of routerconsole.jar in 0.7.12; name without version so we can overwrite if we upgrade  -->
     
    606613        <!-- include systray changes in 0.7.5 -->
    607614        <copy file="build/systray.jar" todir="pkg-temp/lib/" />
     615        <copy file="build/desktopgui.jar" todir="pkg-temp/lib/" />
    608616        <copy file="build/susimail.war" todir="pkg-temp/webapps/" />
    609617        <copy file="build/susidns.war" todir="pkg-temp/webapps/" />
     
    780788            <arg value="build/mstreaming.jar"/>
    781789            <arg value="build/router.jar/"/>
     790            <arg value="build/desktopgui.jar"/>
    782791            <arg value="build/routerconsole.jar"/>
    783792            <arg value="build/routerconsole.war"/>
     
    790799        <echo message="Findbugs output stored in i2p.fba" />
    791800        <echo message="Now run: findbugs i2p.fba" />
    792     </target>
    793     <target name="buildWithDesktopgui" depends="buildrouter,builddepSmall">
    794         <ant dir="apps/desktopgui" target="build_jar" />
    795     </target>
    796     <target name="preppkgWithDesktopgui" depends="buildWithDesktopgui,preppkg">
    797         <copy file="apps/desktopgui/dist/desktopgui.jar" todir="pkg-temp/lib/" />
    798         <copy file="apps/desktopgui/lib/swing-worker.jar" todir="pkg-temp/lib/" />
    799         <copy file="apps/desktopgui/lib/appframework.jar" todir="pkg-temp/lib/" />
    800         <mkdir dir="pkg-temp/desktopgui/resources/" />
    801         <copy todir="pkg-temp/desktopgui/resources/">
    802             <fileset dir="apps/desktopgui/desktopgui/resources/" />
    803         </copy>
    804     </target>
    805     <target name="installerWithDesktopgui" depends="preppkgWithDesktopgui,installer" />
    806     <target name="prepupdateWithDesktopgui" depends="buildWithDesktopgui,prepupdate">
    807         <copy file="apps/desktopgui/dist/desktopgui.jar" todir="pkg-temp/lib/" />
    808         <copy file="apps/desktopgui/lib/swing-worker.jar" todir="pkg-temp/lib/" />
    809         <copy file="apps/desktopgui/lib/appframework.jar" todir="pkg-temp/lib/" />
    810         <mkdir dir="pkg-temp/desktopgui/resources/" />
    811         <copy todir="pkg-temp/desktopgui/resources/">
    812             <fileset dir="apps/desktopgui/desktopgui/resources/" />
    813         </copy>
    814     </target>
    815     <target name="updaterWithDesktopgui" depends="prepupdateWithDesktopgui,updater" />
    816     <target name="pkgWithDesktopgui" depends="distclean, updaterWithDesktopgui, installerWithDesktopgui, preppkg" />
    817     <target name="distWithDesktopgui" depends="pkgWithDesktopgui, javadoc" />
    818     <target name="distcleanWithDesktopgui" depends="distclean">
    819         <ant dir="apps/desktopgui" target="build_clean" />
    820801    </target>
    821802
Note: See TracChangeset for help on using the changeset viewer.