Changeset bb00e91 for apps/ministreaming


Ignore:
Timestamp:
Jul 10, 2014 9:28:25 AM (6 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
fccd0da
Parents:
2ef2032 (diff), dfbe3c4 (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 e02e6d733a703970e20e732e5156cbabc394e88e)

to branch 'i2p.i2p.str4d.test2' (head aad766aaf6f0a2563069c6f19c38b33ae6c49ad8)

Location:
apps/ministreaming
Files:
2 added
5 edited

Legend:

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

    r2ef2032 rbb00e91  
    2020        </depend>
    2121    </target>
     22
     23    <!-- only used if not set by a higher build.xml -->
    2224    <property name="javac.compilerargs" value="" />
     25    <property name="javac.version" value="1.6" />
     26    <property name="require.gettext" value="true" />
     27
     28    <condition property="no.bundle">
     29        <isfalse value="${require.gettext}" />
     30    </condition>
     31
    2332    <target name="compile" depends="depend">
    2433        <mkdir dir="./build" />
    2534        <mkdir dir="./build/obj" />
    2635        <!-- half of this is deprecated classes so turn deprecation off -->
    27         <javac srcdir="./src" debug="true" deprecation="off" source="1.5" target="1.5"
     36        <javac srcdir="./src" debug="true" deprecation="off" source="${javac.version}" target="${javac.version}"
    2837               includeAntRuntime="false"
    2938               destdir="./build/obj" classpath="../../../core/java/build/i2p.jar" >
     
    3746        <javac
    3847            srcdir="./test/junit"
    39             debug="true" deprecation="on" source="1.5" target="1.5"
     48            debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
    4049            includeAntRuntime="false"
    4150            destdir="./buildTest/obj"
     
    6372    </target>
    6473
    65     <target name="jar" depends="compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
     74    <target name="jar" depends="compile, bundle, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
    6675        <!-- set if unset -->
    6776        <property name="workspace.changes.tr" value="" />
     
    9099        </condition>
    91100    </target>
     101   
     102    <target name="bundle" depends="compile" unless="no.bundle">
     103        <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
     104            <env key="JAVA_HOME" value="${java.home}" />
     105            <arg value="./bundle-messages.sh" />
     106        </exec>
     107        <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="${require.gettext}" >
     108            <arg value="./bundle-messages.sh" />
     109        </exec>
     110        <exec executable="sh" osfamily="windows" failifexecutionfails="false" >
     111            <arg value="./bundle-messages.sh" />
     112        </exec>
     113    </target>
     114
     115    <target name="poupdate" depends="builddep, compile">
     116        <!-- Update the messages_*.po files.  -->
     117        <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="true" >
     118            <arg value="./bundle-messages.sh" />
     119            <arg value="-p" />
     120        </exec>
     121        <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="true" >
     122            <arg value="./bundle-messages.sh" />
     123            <arg value="-p" />
     124        </exec>
     125        <exec executable="sh" osfamily="windows" failifexecutionfails="true" failonerror="true" >
     126            <arg value="./bundle-messages.sh" />
     127            <arg value="-p" />
     128        </exec>
     129    </target>
    92130
    93131    <target name="javadoc">
  • apps/ministreaming/java/src/net/i2p/client/streaming/AcceptingChannel.java

    r2ef2032 rbb00e91  
    11package net.i2p.client.streaming;
    22
    3 import net.i2p.client.streaming.I2PSocket;
    4 import net.i2p.client.streaming.I2PSocketManager;
    53import net.i2p.I2PException;
    64import java.net.ConnectException;
     
    1210 *
    1311 *  Warning, this interface and implementation is preliminary and subject to change without notice.
     12 *
     13 *  Unimplemented, unlikely to ever be implemented.
    1414 *
    1515 *  @since 0.8.11
  • apps/ministreaming/java/src/net/i2p/client/streaming/I2PServerSocket.java

    r2ef2032 rbb00e91  
    3333
    3434    /**
     35     *  Unimplemented, unlikely to ever be implemented.
     36     *
     37     *  @deprecated
     38     *  @return null always
    3539     *  @since 0.8.11
    3640     */
  • apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocket.java

    r2ef2032 rbb00e91  
    4444
    4545    /**
     46     *  Unimplemented, unlikely to ever be implemented.
     47     *
     48     *  @deprecated
     49     *  @return null always
    4650     *  @since 0.8.9
    4751     */
  • apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketException.java

    r2ef2032 rbb00e91  
    110110
    111111            default:
    112                 return "Failure code: " + _status;
     112                // Translate this one here, can't do it later
     113                return _("Failure code") + ": " + _status;
    113114        }
    114115    }
     
    122123        if (s == null)
    123124            return null;
     125        return _(s);
     126    }
     127
     128    /**
     129     *  Translate
     130     */
     131    private static String _(String s) {
    124132        return Translate.getString(s, I2PAppContext.getGlobalContext(), BUNDLE_NAME);
    125133    }
Note: See TracChangeset for help on using the changeset viewer.