Changeset 3063e37


Ignore:
Timestamp:
Oct 25, 2016 11:59:20 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
2b6fd49
Parents:
d2569fa
Message:

Systray: Remove old 32-bit Windows implementation, replaced by DTG

Files:
4 deleted
4 edited

Legend:

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

    rd2569fa r3063e37  
    2929                <pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
    3030                <pathelement location="../../systray/java/build/obj" />
    31                 <pathelement location="../../systray/java/lib/systray4j.jar" />
    3231                <pathelement location="../../desktopgui/build" />
    3332                <pathelement location="../../../installer/lib/wrapper/all/wrapper.jar" />
     
    7473                <pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
    7574                <pathelement location="../../systray/java/build/systray.jar" />
    76                 <pathelement location="../../systray/java/lib/systray4j.jar" />
    7775                <pathelement location="../../desktopgui/dist/desktopgui.jar" />
    7876                <pathelement location="../../../installer/lib/wrapper/all/wrapper.jar" />
     
    375373                <pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
    376374                <pathelement location="../../systray/java/build/obj" />
    377                 <pathelement location="../../systray/java/lib/systray4j.jar" />
    378375                <pathelement location="../../desktopgui/dist/desktopgui.jar" />
    379376                <pathelement location="../../../installer/lib/wrapper/all/wrapper.jar" />
     
    413410                <pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
    414411                <pathelement location="../../systray/java/build/obj" />
    415                 <pathelement location="../../systray/java/lib/systray4j.jar" />
    416412                <pathelement location="../../desktopgui/dist/desktopgui.jar" />
    417413                <pathelement location="../../../installer/lib/wrapper/all/wrapper.jar" />
  • apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java

    rd2569fa r3063e37  
    2626import net.i2p.app.ClientAppState;
    2727import static net.i2p.app.ClientAppState.*;
    28 import net.i2p.apps.systray.SysTray;
    2928import net.i2p.crypto.KeyStoreUtil;
    3029import net.i2p.data.DataHelper;
     
    295294                System.setProperty("java.awt.headless", "true");
    296295                // this check is in SysTray but do it here too
    297                 if (SystemVersion.isWindows() && (!Boolean.getBoolean("systray.disable")) && (!SystemVersion.is64Bit()))
    298                     SysTray.getInstance();
     296                //if (SystemVersion.isWindows() && (!Boolean.getBoolean("systray.disable")) && (!SystemVersion.is64Bit()))
     297                //    SysTray.getInstance();
    299298            }
    300299        } catch (Throwable t) {
  • apps/systray/java/build.xml

    rd2569fa r3063e37  
    1717            <classpath>
    1818                <pathelement location="../../../core/java/build/obj" />
    19                 <pathelement location="lib/systray4j.jar" />
    2019            </classpath>
    2120        </depend>
     
    3736            includeAntRuntime="false"
    3837            includes="**/*.java"
    39             classpath="./lib/systray4j.jar:../../../core/java/build/i2p.jar" >
     38            classpath="../../../core/java/build/i2p.jar" >
    4039            <compilerarg line="${javac.compilerargs}" />
    4140        </javac>
     
    6261            <manifest>
    6362                <attribute name="Main-Class" value="net.i2p.apps.systray.SysTray" />
    64                 <attribute name="Class-Path" value="systray4j.jar" />
    6563                <attribute name="Implementation-Version" value="${full.version}" />
    6664                <attribute name="Built-By" value="${build.built-by}" />
     
    9189        <javadoc
    9290            sourcepath="./src"
    93             classpath="./src:./lib/systray4j.jar"
     91            classpath="./src"
    9492            destdir="./build/javadoc"
    9593            packagenames="*"
  • build.xml

    rd2569fa r3063e37  
    520520            <manifest>
    521521                <attribute name="Main-Class" value="net.i2p.router.RouterLaunch" />
    522                 <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-runtime.jar lib/commons-logging.jar lib/commons-el.jar lib/wrapper.jar lib/systray.jar lib/systray4j.jar lib/desktopgui.jar lib/i2psnark.jar lib/jrobin.jar lib/jstl.jar lib/standard.jar lib/jetty-continuation.jar lib/jetty-deploy.jar lib/jetty-http.jar lib/jetty-i2p.jar lib/jetty-io.jar lib/jetty-rewrite-handler.jar lib/jetty-security.jar lib/jetty-servlet.jar lib/jetty-servlets.jar lib/jetty-start.jar lib/jetty-util.jar lib/jetty-webapp.jar lib/jetty-xml.jar" />
     522                <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-runtime.jar lib/commons-logging.jar lib/commons-el.jar lib/wrapper.jar lib/systray.jar lib/desktopgui.jar lib/i2psnark.jar lib/jrobin.jar lib/jstl.jar lib/standard.jar lib/jetty-continuation.jar lib/jetty-deploy.jar lib/jetty-http.jar lib/jetty-i2p.jar lib/jetty-io.jar lib/jetty-rewrite-handler.jar lib/jetty-security.jar lib/jetty-servlet.jar lib/jetty-servlets.jar lib/jetty-start.jar lib/jetty-util.jar lib/jetty-webapp.jar lib/jetty-xml.jar" />
    523523                <attribute name="Built-By" value="${build.built-by}" />
    524524                <attribute name="Build-Date" value="${build.timestamp}" />
     
    779779                <pathelement location="apps/jetty/jettylib/jetty-webapp.jar" />
    780780                <pathelement location="apps/jetty/jettylib/jetty-xml.jar" />
    781                 <pathelement location="apps/systray/java/lib/systray4j.jar" />
    782781                <pathelement location="apps/jrobin/jrobin-1.5.9.1.jar" />
    783782                <pathelement location="installer/lib/wrapper/all/wrapper.jar" />
     
    11631162    <target name="preppkg-windows" depends="preppkg-base, preplicenses-windows, buildUtilityJar, buildexe">
    11641163        <copy file="build/i2p.exe" todir="pkg-temp/" failonerror="false" />
    1165         <copy file="apps/systray/java/lib/systray4j.jar" todir="pkg-temp/lib" />
    1166         <copy file="apps/systray/java/lib/systray4j.dll" todir="pkg-temp/lib" />
    1167         <copy file="apps/systray/java/resources/iggy.ico" todir="pkg-temp/icons" />
    1168         <copy file="apps/systray/java/resources/iggy.xpm" todir="pkg-temp/icons" />
    11691164        <copy file="installer/resources/eepget.bat" todir="pkg-temp/" />
    11701165        <copy file="installer/resources/i2prouter.bat" todir="pkg-temp/" />
     
    18901885            <arg value="i2p.fba"/>
    18911886            <arg value="-auxclasspath"/>
    1892             <arg value="build/commons-el.jar:build/commons-logging.jar:build/jasper-runtime.jar:build/javax.servlet.jar:build/org.mortbay.jetty.jar:apps/jrobin/jrobin-1.5.9.1.jar:apps/systray/java/lib/systray4j.jar:installer/lib/wrapper/all/wrapper.jar:apps/susidns/src/lib/standard.jar:apps/susidns/src/lib/jstl.jar:apps/jrobin/jrobin-1.5.9.1.jar"/>
     1887            <arg value="build/commons-el.jar:build/commons-logging.jar:build/jasper-runtime.jar:build/javax.servlet.jar:build/org.mortbay.jetty.jar:apps/jrobin/jrobin-1.5.9.1.jar:installer/lib/wrapper/all/wrapper.jar:apps/susidns/src/lib/standard.jar:apps/susidns/src/lib/jstl.jar:apps/jrobin/jrobin-1.5.9.1.jar"/>
    18931888            <arg value="-sourcepath"/>
    18941889            <arg value="apps/BOB/src/:apps/addressbook/java/src/:apps/i2psnark/java/src/:apps/i2ptunnel/java/src/:apps/ministreaming/java/src/:apps/routerconsole/java/src/:apps/sam/java/src/:apps/streaming/java/src/:apps/susidns/src/java/src/:apps/susimail/src/src/:apps/systray/java/src/:core/java/src/:router/java/src/:installer/java/src"/>
     
    21912186            <fileset dir="../i2p-${Extended.Version}/core/java/src/org/apache/http" />
    21922187           -->
    2193             <!-- systray4j -->
    2194             <fileset dir="../i2p-${Extended.Version}/apps/systray/java/lib" />
    2195             <file name="../i2p-${Extended.Version}/apps/systray/java/src/net/i2p/apps/systray/SysTrayImpl.java" />
    21962188            <!-- geoip-database -->
    21972189            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
     
    22762268            <fileset dir="../i2p-${Extended.Version}/core/java/src/org/apache/http" />
    22772269           -->
    2278             <!-- systray4j -->
    2279             <fileset dir="../i2p-${Extended.Version}/apps/systray/java/lib" />
    2280             <file name="../i2p-${Extended.Version}/apps/systray/java/src/net/i2p/apps/systray/SysTrayImpl.java" />
    22812270            <!-- geoip-database -->
    22822271            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
     
    23592348            <fileset dir="../i2p-${Extended.Version}/core/java/src/org/apache/http" />
    23602349           -->
    2361             <fileset dir="../i2p-${Extended.Version}/apps/systray/java/lib" />
    2362             <file name="../i2p-${Extended.Version}/apps/systray/java/src/net/i2p/apps/systray/SysTrayImpl.java" />
    23632350            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    23642351            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
     
    24902477<!-- *3* os dependent procedure/commands -->
    24912478        <target name = "preppkg-portable-win32" depends="preppkg-portable-win32-jbigi,preppkg-portable-basic">
    2492                         <!-- systray4.j  - why do we need trayicons for portable version ? dependency hardcoded in console -->
    2493                 <copy file="apps/systray/java/lib/systray4j.dll" todir="pkg-temp/lib" />
    2494                 <copy file="apps/systray/java/lib/systray4j.jar" todir="pkg-temp/lib" />
    24952479                        <!--wrapper - dont even think about it. i2p cosumes appreantly more mem without it on win32-->
    24962480                <copy file="installer/lib/wrapper/win32/wrapper.dll" todir="pkg-temp/lib" />
Note: See TracChangeset for help on using the changeset viewer.