Changeset 12893 in josm


Ignore:
Timestamp:
2017-09-24T09:34:17+02:00 (12 months ago)
Author:
bastiK
Message:

see #15229 - add getopt to ant target "compile-cots"; minor fix

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r12890 r12893  
    232232    <target name="compile-cots" depends="init">
    233233        <!-- COTS -->
    234         <javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**" nowarn="on" encoding="iso-8859-1"
     234        <javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,gnu/**" nowarn="on" encoding="iso-8859-1"
    235235            destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
    236236            <!-- get rid of "internal proprietary API" warning -->
     
    312312        <!-- JOSM -->
    313313        <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}"
    314             excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**"
     314            excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**,gnu/**"
    315315            destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
    316316            <compilerclasspath>
  • trunk/src/org/openstreetmap/josm/gui/ProgramArguments.java

    r12892 r12893  
    114114     */
    115115    private void buildCommandLineArgumentMap(String... args) {
     116        Getopt.setI18nHandler(I18n::tr);
    116117        LongOpt[] los = Stream.of(Option.values()).map(Option::toLongOpt).toArray(LongOpt[]::new);
    117 
    118         Getopt.setI18nHandler(I18n::tr);
    119118        Getopt g = new Getopt("JOSM", args, "hv", los);
    120119
Note: See TracChangeset for help on using the changeset viewer.