Changeset d70c22d7


Ignore:
Timestamp:
Aug 24, 2004 6:58:05 AM (16 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
205d8f7d
Parents:
920161b
git-author:
hypercubus <hypercubus> (08/24/04 06:58:05)
git-committer:
zzz <zzz@…> (08/24/04 06:58:05)
Message:
  • systray now fully integrated into global ant build
  • removed two unneeded test files i2psystray.bat, i2psystray.sh
Files:
2 deleted
4 edited

Legend:

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

    r920161b rd70c22d7  
    55    <target name="builddep">
    66        <ant dir="../../../router/java/" target="build" />
    7         <!-- <ant dir="../../systray/java/" target="build" /> -->
     7        <ant dir="../../systray/java/" target="build" />
    88        <!-- router will build core -->
    99    </target>
     
    2222                <pathelement location="../../../router/java/build/router.jar" />
    2323                <pathelement location="../../jetty/jettylib/org.mortbay.jetty-jdk1.2.jar" />
    24                 <!-- <pathelement location="../../systray/java/build/lib/systray.jar" /> -->
    25                 <!-- <pathelement location="../../systray/java/lib/systray4j.jar" /> -->
     24                <pathelement location="../../systray/java/build/systray.jar" />
     25                <pathelement location="../../systray/java/lib/systray4j.jar" />
    2626                <pathelement location="../../../installer/lib/wrapper/win32/wrapper.jar" /> <!-- we dont care if we're not on win32 -->
    2727            </classpath>
     
    8989        <mkdir dir="./build/javadoc" />
    9090        <javadoc
    91             sourcepath="./src:../../../core/java/src:../../router/java/src" destdir="./build/javadoc"
     91            sourcepath="./src:../../../core/java/src:../../../router/java/src:../../systray/java/src" destdir="./build/javadoc"
    9292            packagenames="*"
    9393            use="true"
     
    101101        <!-- router will clean core -->
    102102        <ant dir="../../../router/java/" target="cleandep" />
    103         <!-- <ant dir="../../systray/java/" target="cleandep" /> -->
     103        <ant dir="../../systray/java/" target="cleandep" />
    104104    </target>
    105105    <target name="distclean" depends="clean">
    106106        <!-- router will clean core -->
    107107        <ant dir="../../../router/java/" target="distclean" />
    108         <!-- <ant dir="../../systray/java/" target="distclean" /> -->
     108        <ant dir="../../systray/java/" target="distclean" />
    109109    </target>
    110110</project>
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java

    r920161b rd70c22d7  
    44import net.i2p.router.Router;
    55
    6 //import net.i2p.apps.systray.SysTray;
     6import net.i2p.apps.systray.SysTray;
    77import org.tanukisoftware.wrapper.WrapperManager;
    88
     
    3232            WrapperManager.requestThreadDump();
    3333            addFormNotice("Threads dumped to logs/wrapper.log");
    34         //} else if ("Show systray icon".equals(_action)) {
    35         //    SysTray.instance().show();
    36         //    addFormNotice("Systray icon enabled (if possible)");
    37         //} else if ("Hide systray icon".equals(_action)) {
    38         //    SysTray.instance().hide();
    39         //    addFormNotice("Systray icon disabled");
     34        } else if ("Show systray icon".equals(_action)) {
     35            SysTray.getInstance().show();
     36            addFormNotice("Systray icon enabled (if possible)");
     37        } else if ("Hide systray icon".equals(_action)) {
     38            SysTray.getInstance().hide();
     39            addFormNotice("Systray icon disabled");
    4040        } else {
    4141            addFormNotice("Blah blah blah.  whatever.  I'm not going to " + _action);
  • apps/systray/java/build.xml

    r920161b rd70c22d7  
    2020    </target>
    2121    <target name="jar" depends="compile">
    22         <copy todir="./build/lib">
    23             <fileset dir="./lib" includes="systray4j.dll systray4j.jar" />
    24         </copy>
    25         <copy todir="./build/icons">
    26             <fileset dir="./resources/" />
    27         </copy>
    2822        <mkdir dir="./build/jar_temp" />
    2923        <copy todir="./build/jar_temp">
    3024            <fileset dir="./build/obj" includes="**/*.class" />
    3125        </copy>
    32         <jar destfile="./build/lib/systray.jar" basedir="./build/jar_temp" includes="**/*">
     26        <jar destfile="./build/systray.jar" basedir="./build/jar_temp" includes="**/*">
    3327            <manifest>
    3428                <attribute name="Main-Class" value="net.i2p.apps.systray.SysTray" />
  • build.xml

    r920161b rd70c22d7  
    1414        <echo message="  pkg:       make the tarball and installer jar (depends upon preppkg)" />
    1515        <echo message="  pkgclean:  delete the ./pkg-temp/ dir, tarball and installer jar" />
    16         <echo message="  preppkg:   gather built files for tarball and installer (depends upon prepWEB)" />
     16        <echo message="  preppkg:   gather built files for tarball and installer" />
    1717        <echo message="  tarball:   tar the built files and compress with bz2 (depends upon preppkg)" />
    1818        <echo message="  installer: build the GUI installer (depends upon preppkg)" />
     
    7676        <ant dir="apps/heartbeat/java/" target="jar" />
    7777        <ant dir="apps/netmonitor/java/" target="jar" />
     78        <ant dir="apps/systray/java/" target="jar" />
    7879        <ant dir="apps/routerconsole/java/" target="jar" />
    7980        <ant dir="installer/java/" target="jar" />
     
    8990        <copy file="apps/heartbeat/java/build/heartbeat.jar" todir="build/" />
    9091        <copy file="apps/netmonitor/java/build/netmonitor.jar" todir="build/" />
     92        <copy file="apps/systray/java/build/systray.jar" todir="build/" />
    9193        <copy file="installer/java/build/install.jar" todir="build/" />
    9294        <copy file="installer/java/build/guiinstall.jar" todir="build/" />
     
    98100        <mkdir dir="./build/javadoc" />
    99101        <javadoc
    100             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"
    101             classpath="apps/jetty/jettylib/org.mortbay.jetty.jar:installer/lib/wrapper/win32/wrapper.jar"
     102            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/systray/java/src:apps/routerconsole/java/src"
     103            classpath="apps/jetty/jettylib/org.mortbay.jetty.jar:apps/systray/java/lib/systray4j.jar:installer/lib/wrapper/win32/wrapper.jar"
    102104            destdir="./build/javadoc"
    103105            packagenames="*"
     
    118120        <ant dir="apps/netmonitor/java/" target="distclean" />
    119121        <ant dir="apps/routerconsole/java/" target="distclean" />
     122        <ant dir="apps/systray/java/" target="distclean" />
    120123        <ant dir="installer/java/" target="distclean" />
    121124        <delete>
     
    198201        <copy file="build/jasper-runtime.jar" todir="pkg-temp/lib/" />
    199202        <copy file="build/javax.servlet.jar" todir="pkg-temp/lib/" />
     203        <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
    200204        <copy file="build/jnet.jar" todir="pkg-temp/lib/" />
    201205        <copy file="build/mstreaming.jar" todir="pkg-temp/lib/" />
     
    206210        <copy file="build/routerconsole.jar" todir="pkg-temp/lib/" />
    207211        <copy file="build/sam.jar" todir="pkg-temp/lib/" />
     212        <copy file="build/systray.jar" todir="pkg-temp/lib" />
     213        <copy file="apps/systray/java/lib/systray4j.jar" todir="pkg-temp/lib" />
     214        <copy file="apps/systray/java/lib/systray4j.dll" todir="pkg-temp/lib" />
     215        <copy file="apps/systray/java/resources/iggy.ico" todir="pkg-temp/icons" />
     216        <copy file="apps/systray/java/resources/iggy.xpm" todir="pkg-temp/icons" />
    208217        <copy file="build/xercesImpl.jar" todir="pkg-temp/lib/" />
    209218        <copy file="build/xml-apis.jar" todir="pkg-temp/lib/" />
    210         <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
    211219        <copy file="build/i2ptunnel.war" todir="pkg-temp/webapps/" />
    212220        <copy file="build/routerconsole.war" todir="pkg-temp/webapps/" />
Note: See TracChangeset for help on using the changeset viewer.