Changeset 16346 in josm for trunk

Timestamp:

2020-04-18T20:11:48+02:00 (4 years ago)

Author:

simon04

Message:

see #19117 - ant compile: exclude package-info.java files, drop createMissingPackageInfoClass="false"

File:

• trunk/build.xml (modified) (6 diffs)

trunk/build.xml

@@ -287 +287 @@
     <target name="compile-cots" depends="init" description="Compiles third-party dependencies not retrieved with Ivy">
         <!-- COTS -->
-        <javac srcdir="${src.dir}" includes="com/google/**,com/kitfox/**,oauth/**" nowarn="on" encoding="iso-8859-1"
-            destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
+        <javac srcdir="${src.dir}" includes="com/google/**,com/kitfox/**,oauth/**" excludes="**/package-info.java" nowarn="on" encoding="iso-8859-1"
+            destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeAntRuntime="false">
             <!-- get rid of "internal proprietary API" warning -->
             <compilerarg value="-XDignore.symbol.file"/>
@@ -299 +299 @@
         <!-- JOSM -->
         <javac sourcepath="" srcdir="${src.dir}" fork="yes"
-            excludes="com/**,oauth/**,org/apache/commons/**,org/openstreetmap/gui/jmapviewer/**"
-            destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
+            excludes="com/**,oauth/**,org/apache/commons/**,org/openstreetmap/gui/jmapviewer/**,**/package-info.java"
+            destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" encoding="UTF-8">
             <compilerarg value="-J-Xbootclasspath/p:${error_prone_javac.jar}" unless:set="isJava9"/>
             <compilerarg line="-XDcompilePolicy=simple"/>
@@ -418 +418 @@
             <javac srcdir="${test.dir}/@{testfamily}" destdir="${test.dir}/build/@{testfamily}"
                 target="${java.lang.version}" source="${java.lang.version}" debug="on"
-                includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
+                includeantruntime="false" encoding="UTF-8">
                 <compilerarg value="-Xlint:all"/>
                 <compilerarg value="-Xlint:-serial"/>
@@ -805 +805 @@
         <javac sourcepath="" srcdir="${base.dir}/scripts" failonerror="true" includes="*.java"
                destdir="${script-build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on"
-               includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
+               includeantruntime="false" encoding="UTF-8">
             <classpath>
                 <pathelement path="${build.dir}"/>
@@ -886 +886 @@
         <javac sourcepath="" srcdir="${checkstyle.dir}/src" failonerror="true"
             destdir="${checkstyle-build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on"
-            includeantruntime="false" createMissingPackageInfoClass="false"
+            includeantruntime="false"
             encoding="UTF-8" classpathref="checkstyle.classpath">
         </javac>
@@ -964 +964 @@
         <javac sourcepath="" srcdir="${base.dir}/scripts" failonerror="true" includes="BuildProjectionDefinitions.java"
             destdir="${proj-build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on"
-            includeantruntime="false" createMissingPackageInfoClass="false"
+            includeantruntime="false"
             encoding="UTF-8" classpath="${proj-classpath}">
         </javac>