Changeset 34620 in osm for applications/editors
- Timestamp:
- 2018-09-04T23:47:31+02:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/build-common.xml
r34605 r34620 16 16 <property name="josm.test.build.dir" location="../../core/test/build"/> 17 17 <property name="jmockit.jar" location="../00_core_test_lib/jmockit-1.41.jar"/> 18 <property name="error_prone_ant.jar" location="../00_core_tools/error_prone_ant.jar"/> 18 <property name="error_prone_core.jar" location="../00_core_tools/error_prone_core.jar"/> 19 <property name="error_prone_javac.jar" location="../00_core_tools/error_prone_javac.jar"/> 19 20 <property name="checkstyle.jar" location="../00_core_tools/checkstyle/checkstyle-all.jar"/> 20 21 <property name="checkstyle-build.dir" location="../00_core_tools/checkstyle/build"/> 22 <property name="jformatstring.jar" location="../00_core_tools/spotbugs/jFormatString-3.0.0.jar"/> 21 23 <property name="spotbugs-ant.jar" location="../00_core_tools/spotbugs/spotbugs-ant.jar"/> 22 24 <property name="annotations.jar" location="../00_core_tools/spotbugs/spotbugs-annotations.jar"/> … … 42 44 <os family="Windows"/> 43 45 </condition> 44 <!-- For Java9-specific stuff --> 45 <condition property="isJava9"> 46 <matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" /> 47 </condition> 48 <!-- For Java10-specific stuff --> 49 <condition property="isJava10"> 50 <matches string="${ant.java.version}" pattern="1[0-9]" /> 51 </condition> 52 <!-- For Java11-specific stuff --> 53 <condition property="isJava11"> 54 <matches string="${ant.java.version}" pattern="1[1-9]" /> 55 </condition> 56 <!-- Disable error_prone on Java 10+, see https://github.com/google/error-prone/issues/860 --> 57 <condition property="javac.compiler" value="modern" else="com.google.errorprone.ErrorProneAntCompilerAdapter"> 58 <isset property="isJava10"/> 59 </condition> 60 <!-- Disable jacoco on Java 11+, see https://github.com/jacoco/jacoco/issues/629 --> 46 <!-- For Java specific stuff by version --> 47 <condition property="isJava9"><matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" /></condition> 48 <condition property="isJava10"><matches string="${ant.java.version}" pattern="1[0-9]" /></condition> 49 <condition property="isJava11"><matches string="${ant.java.version}" pattern="1[1-9]" /></condition> 50 <condition property="isJava12"><matches string="${ant.java.version}" pattern="1[2-9]" /></condition> 51 <condition property="isJava13"><matches string="${ant.java.version}" pattern="1[3-9]" /></condition> 52 <!-- Disable jacoco on Java 13+, see https://github.com/jacoco/jacoco/pull/738 --> 61 53 <condition property="coverageByDefault"> 62 54 <not> 63 <isset property="isJava1 1"/>55 <isset property="isJava13"/> 64 56 </not> 65 57 </condition> … … 86 78 <fileset refid="jaxb.jars"/> 87 79 </path> 80 <path id="processor.path"> 81 <pathelement location="${error_prone_core.jar}"/> 82 <pathelement location="${jformatstring.jar}"/> 83 </path> 88 84 89 85 <!-- … … 105 101 <target name="compile" depends="init, pre-compile" unless="skip-compile"> 106 102 <echo message="compiling sources for ${plugin.jar} ..."/> 107 <javac compiler="${javac.compiler}" srcdir="${plugin.src.dir}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false" 108 encoding="UTF-8" target="${java.lang.version}" source="${java.lang.version}"> 109 <compilerclasspath> 110 <pathelement location="${error_prone_ant.jar}"/> 111 </compilerclasspath> 103 <javac srcdir="${plugin.src.dir}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false" 104 encoding="UTF-8" target="${java.lang.version}" source="${java.lang.version}" fork="yes"> 105 <compilerarg value="-J-Xbootclasspath/p:${error_prone_javac.jar}" unless:set="isJava9"/> 106 <compilerarg line="-XDcompilePolicy=simple"/> 107 <compilerarg value="-processorpath"/> 108 <compilerarg pathref="processor.path"/> 112 109 <compilerarg value="-Xlint:deprecation"/> 113 110 <compilerarg value="-Xlint:unchecked"/> 114 <compilerarg value="-Xep:StringSplitter:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/> 115 <compilerarg value="-Xep:ReferenceEquality:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/> 116 <compilerarg value="-Xep:InsecureCryptoUsage:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/> 117 <compilerarg value="-Xep:FutureReturnValueIgnored:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/> 118 <compilerarg value="-Xep:JdkObsolete:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/> 111 <compilerarg value="-Xplugin:ErrorProne -Xep:StringSplitter:OFF -Xep:ReferenceEquality:OFF -Xep:InsecureCryptoUsage:OFF -Xep:FutureReturnValueIgnored:OFF -Xep:JdkObsolete:OFF"/> 119 112 <compilerarg line="-Xmaxwarns 1000"/> 120 113 <classpath refid="plugin.classpath"/>
Note:
See TracChangeset
for help on using the changeset viewer.