Changeset 12893 in josm

Timestamp:

2017-09-24T09:34:17+02:00 (7 years ago)

Author:

bastiK

Message:

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

Location:

trunk

Files:

• build.xml (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/ProgramArguments.java (modified) (1 diff)

trunk/build.xml

@@ -232 +232 @@
     <target name="compile-cots" depends="init">
         <!-- COTS -->
-        <javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**" nowarn="on" encoding="iso-8859-1"
+        <javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,gnu/**" nowarn="on" encoding="iso-8859-1"
             destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
             <!-- get rid of "internal proprietary API" warning -->
@@ -312 +312 @@
         <!-- JOSM -->
         <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}"
-            excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**"
+            excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**,gnu/**"
             destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
             <compilerclasspath>

trunk/src/org/openstreetmap/josm/gui/ProgramArguments.java

@@ -114 +114 @@
      */
     private void buildCommandLineArgumentMap(String... args) {
+        Getopt.setI18nHandler(I18n::tr);
         LongOpt[] los = Stream.of(Option.values()).map(Option::toLongOpt).toArray(LongOpt[]::new);
-
-        Getopt.setI18nHandler(I18n::tr);
         Getopt g = new Getopt("JOSM", args, "hv", los);