Changeset 2270c47 for apps/ministreaming


Ignore:
Timestamp:
Jul 10, 2016 2:31:03 PM (4 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
6468e9e
Parents:
0bfe45be (diff), 03de374 (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 34802d93f1d32368153a6769608d8e1046d0d117)

to branch 'i2p.i2p.str4d.test2' (head 0981aa4b9874c1752456cbf381aadc2fe829d57b)

Location:
apps/ministreaming
Files:
6 added
8 edited

Legend:

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

    r0bfe45be r2270c47  
    7777        <jar destfile="./build/mstreaming.jar" basedir="./build/obj" includes="**/*.class" >
    7878            <manifest>
     79                <attribute name="Specification-Title" value="I2P Streaming API" />
     80                <attribute name="Specification-Version" value="${release.number}" />
     81                <attribute name="Specification-Vendor" value="The I2P Project https://geti2p.net/" />
     82                <attribute name="Implementation-Title" value="I2P Java Streaming Implementation" />
    7983                <attribute name="Implementation-Version" value="${full.version}" />
     84                <attribute name="Implementation-Vendor" value="The I2P Project https://geti2p.net/" />
    8085                <attribute name="Built-By" value="${build.built-by}" />
    8186                <attribute name="Build-Date" value="${build.timestamp}" />
     
    101106   
    102107    <target name="bundle" depends="compile" unless="no.bundle">
     108        <mkdir dir="build/messages-src" />
    103109        <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
    104110            <env key="JAVA_HOME" value="${java.home}" />
     
    111117            <arg value="./bundle-messages.sh" />
    112118        </exec>
     119        <javac source="${javac.version}" target="${javac.version}"
     120               includeAntRuntime="false"
     121               srcdir="build/messages-src" destdir="build/obj">
     122            <compilerarg line="${javac.compilerargs}" />
     123        </javac>
    113124    </target>
    114125
     
    138149            splitindex="true"
    139150            windowtitle="I2P ministreaming library" />
     151    </target>
     152
     153    <!-- for Maven Central -->
     154    <target name="javadocJar" depends="javadoc">
     155        <jar jarfile="./build/mstreaming-${release.number}-javadoc.jar">
     156            <fileset dir="./build/javadoc" />
     157        </jar>
     158    </target>
     159    <target name="sourcesJar">
     160        <jar jarfile="./build/mstreaming-${release.number}-sources.jar">
     161            <fileset dir="./src" />
     162        </jar>
    140163    </target>
    141164
  • apps/ministreaming/java/bundle-messages.sh

    r0bfe45be r2270c47  
    9797        echo "Generating ${CLASS}_$LG ResourceBundle..."
    9898
    99         # convert to class files in build/obj
    100         msgfmt --java --statistics -r $CLASS -l $LG -d build/obj $i
     99        msgfmt -V | grep -q '0\.19'
    101100        if [ $? -ne 0 ]
    102101        then
    103             echo "ERROR - msgfmt failed on ${i}, not updating translations"
    104             # msgfmt leaves the class file there so the build would work the next time
    105             find build/obj -name messages_${LG}.class -exec rm -f {} \;
    106             RC=1
    107             break
     102            # slow way
     103            # convert to class files in build/obj
     104            msgfmt --java --statistics -r $CLASS -l $LG -d build/obj $i
     105            if [ $? -ne 0 ]
     106            then
     107                echo "ERROR - msgfmt failed on ${i}, not updating translations"
     108                # msgfmt leaves the class file there so the build would work the next time
     109                find build -name messages_${LG}.class -exec rm -f {} \;
     110                RC=1
     111                break
     112            fi
     113        else
     114            # fast way
     115            # convert to java files in build/messages-src
     116            TD=build/messages-src-tmp
     117            TDX=$TD/net/i2p/client/streaming
     118            TD2=build/messages-src
     119            TDY=$TD2/net/i2p/client/streaming
     120            rm -rf $TD
     121            mkdir -p $TD $TDY
     122            msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
     123            if [ $? -ne 0 ]
     124            then
     125                echo "ERROR - msgfmt failed on ${i}, not updating translations"
     126                # msgfmt leaves the class file there so the build would work the next time
     127                find build/obj -name messages_${LG}.class -exec rm -f {} \;
     128                RC=1
     129                break
     130            fi
     131            mv $TDX/messages_$LG.java $TDY
     132            rm -rf $TD
    108133        fi
    109134    fi
  • apps/ministreaming/java/src/net/i2p/client/streaming/I2PServerSocket.java

    r0bfe45be r2270c47  
    4343     *  @since 0.8.11
    4444     */
     45    @Deprecated
    4546    public AcceptingChannel getChannel();
    4647
  • apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocket.java

    r0bfe45be r2270c47  
    6363     *  @since 0.8.9
    6464     */
     65    @Deprecated
    6566    public SelectableChannel getChannel() throws IOException;
    6667
  • apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java

    r0bfe45be r2270c47  
    3838     *  @deprecated
    3939     */
     40    @Deprecated
    4041    public static final String PROP_MANAGER = "i2p.streaming.manager";
    4142
  • apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFull.java

    r0bfe45be r2270c47  
    1111 *  @deprecated
    1212 */
     13@Deprecated
    1314public class I2PSocketManagerFull {}
  • apps/ministreaming/locale/messages_it.po

    r0bfe45be r2270c47  
    66# Translators:
    77# alamir <christianm@libero.it>, 2014
     8# Tristano Ajmone <tajmone@gmail.com>, 2015
    89msgid ""
    910msgstr ""
     
    1112"Report-Msgid-Bugs-To: \n"
    1213"POT-Creation-Date: 2015-03-29 14:30+0000\n"
    13 "PO-Revision-Date: 2015-03-29 14:31+0000\n"
    14 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
    15 "Language-Team: Italian (http://www.transifex.com/projects/p/I2P/language/it/)\n"
     14"PO-Revision-Date: 2015-12-27 22:29+0000\n"
     15"Last-Translator: Tristano Ajmone <tajmone@gmail.com>\n"
     16"Language-Team: Italian (http://www.transifex.com/otf/I2P/language/it/)\n"
    1617"MIME-Version: 1.0\n"
    1718"Content-Type: text/plain; charset=UTF-8\n"
     
    7172#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:105
    7273msgid "Invalid destination"
    73 msgstr ""
     74msgstr "Destinazione non valida"
    7475
    7576#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:111
  • apps/ministreaming/locale/messages_pl.po

    r0bfe45be r2270c47  
    66# Translators:
    77# polacco <polacco@i2pmail.org>, 2015
     8# Verdulo :-) <cybertomek@openmailbox.org>, 2016
    89msgid ""
    910msgstr ""
     
    1112"Report-Msgid-Bugs-To: \n"
    1213"POT-Creation-Date: 2015-03-29 14:30+0000\n"
    13 "PO-Revision-Date: 2015-03-29 14:31+0000\n"
    14 "Last-Translator: kytv <killyourtv@i2pmail.org>\n"
    15 "Language-Team: Polish (http://www.transifex.com/projects/p/I2P/language/pl/)\n"
     14"PO-Revision-Date: 2016-03-12 00:09+0000\n"
     15"Last-Translator: Verdulo :-) <cybertomek@openmailbox.org>\n"
     16"Language-Team: Polish (http://www.transifex.com/otf/I2P/language/pl/)\n"
    1617"MIME-Version: 1.0\n"
    1718"Content-Type: text/plain; charset=UTF-8\n"
     
    2223#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:69
    2324msgid "Message timeout"
    24 msgstr ""
     25msgstr "Limit czasu wiadomości"
    2526
    2627#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:72
    2728msgid "Failed delivery to local destination"
    28 msgstr ""
     29msgstr "Nieudane dostarczenie do lokalnego adresu"
    2930
    3031#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:75
    3132#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:108
    3233msgid "Local router failure"
    33 msgstr ""
     34msgstr "Lokalna awaria węzła"
    3435
    3536#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:78
    3637msgid "Local network failure"
    37 msgstr ""
     38msgstr "Lokalna awaria sieci"
    3839
    3940#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:81
     
    5960#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:96
    6061msgid "Local lease set invalid"
    61 msgstr ""
     62msgstr "Nieprawidłowy lokalny LeaseSet"
    6263
    6364#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:99
     
    7576#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:111
    7677msgid "Destination lease set expired"
    77 msgstr ""
     78msgstr "Adres przeznaczenia LeaseSet wygasł"
    7879
    7980#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:114
    8081msgid "Destination lease set not found"
    81 msgstr ""
     82msgstr "LeaseSet adresu przeznaczenia nie odnaleziony"
    8283
    8384#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:117
    8485msgid "Local destination shutdown"
    85 msgstr ""
     86msgstr "Lokalny adres przeznaczenia wyłączony"
    8687
    8788#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:120
    8889msgid "Connection was reset"
    89 msgstr ""
     90msgstr "Połączenie zostało zresetowane"
    9091
    9192#. Translate this one here, can't do it later
Note: See TracChangeset for help on using the changeset viewer.