Changeset 36308 in osm
- Timestamp:
- 2024-08-15T22:42:47+02:00 (4 months ago)
- Location:
- applications/editors/josm/plugins
- Files:
-
- 2 edited
-
build-common.xml (modified) (8 diffs)
-
build.xml (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/build-common.xml
r36282 r36308 27 27 <!-- this is the directory where the plugin jar is copied to --> 28 28 <property name="plugin.dist.dir" location="../../dist"/> 29 <property name="java.lang.version" value=" 8" />29 <property name="java.lang.version" value="11" /> 30 30 <property name="javadoc.executable" value="javadoc" /> 31 31 <property name="manifest" value="MANIFEST"/> … … 52 52 <condition property="isMac"><os family="Mac"/></condition> 53 53 <!-- For Java specific stuff by version --> 54 <condition property="isJava9"><matches string="${ant.java.version}" pattern="(1.)?(9|[1-9][0-9])" /></condition>55 <condition property="isJava11"><matches string="${ant.java.version}" pattern="1[1-9]|[2-9][0-9]" /></condition>56 54 <condition property="isJava14"><matches string="${ant.java.version}" pattern="1[4-9]|[2-9][0-9]" /></condition> 57 55 <condition property="isJava15"><matches string="${ant.java.version}" pattern="1[5-9]|[2-9][0-9]" /></condition> … … 60 58 61 59 <!-- set the javadoc location --> 62 <property name="javadoc.link" value="https://docs.oracle.com/javase/8/docs/api" unless:set="isJava11"/> 63 <property name="javadoc.link" value="https://docs.oracle.com/en/java/javase/11/docs/api/" if:set="isJava11" unless:set="isJava17"/> 60 <property name="javadoc.link" value="https://docs.oracle.com/en/java/javase/11/docs/api/" unless:set="isJava17"/> 64 61 <property name="javadoc.link" value="https://docs.oracle.com/en/java/javase/17/docs/api/" if:set="isJava17" unless:set="isJava21"/> 65 62 <property name="javadoc.link" value="https://docs.oracle.com/en/java/javase/21/docs/api/" if:set="isJava21"/> … … 115 112 <target name="compile" depends="init, pre-compile, resolve-tools" unless="skip-compile"> 116 113 <echo message="compiling sources for ${plugin.jar} ..."/> 117 <path id="jdk 8.boot.classpath">114 <path id="jdk.boot.classpath"> 118 115 <path refid="errorprone_javac.classpath"/> 119 116 <fileset refid="jaxb.jars"/> … … 121 118 <javac srcdir="${plugin.src.dir}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false" 122 119 encoding="UTF-8" release="${java.lang.version}" fork="yes"> 123 <compilerarg value="-J-Xbootclasspath/p:${toString:jdk8.boot.classpath}" unless:set="isJava9"/> 124 <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" if:set="isJava11" unless:set="noErrorProne"/> 125 <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED" if:set="isJava11" unless:set="noErrorProne"/> 126 <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED" if:set="isJava11" unless:set="noErrorProne"/> 127 <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED" if:set="isJava11" unless:set="noErrorProne"/> 128 <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED" if:set="isJava11" unless:set="noErrorProne"/> 129 <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED" if:set="isJava11" unless:set="noErrorProne"/> 130 <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED" if:set="isJava11" unless:set="noErrorProne"/> 131 <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED" if:set="isJava11" unless:set="noErrorProne"/> 132 <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED" if:set="isJava11" unless:set="noErrorProne"/> 120 <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" unless:set="noErrorProne"/> 121 <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED" unless:set="noErrorProne"/> 122 <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED" unless:set="noErrorProne"/> 123 <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED" unless:set="noErrorProne"/> 124 <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED" unless:set="noErrorProne"/> 125 <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED" unless:set="noErrorProne"/> 126 <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED" unless:set="noErrorProne"/> 127 <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED" unless:set="noErrorProne"/> 128 <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED" unless:set="noErrorProne"/> 133 129 <compilerarg line="-XDcompilePolicy=simple"/> 134 130 <compilerarg value="-processorpath"/> … … 136 132 <compilerarg value="-Xlint:deprecation"/> 137 133 <compilerarg value="-Xlint:unchecked"/> 138 <compilerarg value="-Xplugin:ErrorProne -Xep:StringSplitter:OFF -Xep:ReferenceEquality:OFF -Xep:InsecureCryptoUsage:OFF -Xep:FutureReturnValueIgnored:OFF -Xep:JdkObsolete:OFF -Xep:EqualsHashCode:OFF -Xep:JavaUtilDate:OFF -Xep:DoNotCallSuggester:OFF -Xep:BanSerializableRead:OFF -Xep:RestrictedApiChecker:OFF" unless:set="isJava11"/> 139 <compilerarg value="-Xplugin:ErrorProne -Xep:StringSplitter:OFF -Xep:ReferenceEquality:OFF -Xep:InsecureCryptoUsage:OFF -Xep:FutureReturnValueIgnored:OFF -Xep:JdkObsolete:OFF -Xep:EqualsHashCode:OFF -Xep:JavaUtilDate:OFF -Xep:DoNotCallSuggester:OFF -Xep:BanSerializableRead:OFF" if:set="isJava11"/> 134 <compilerarg value="-Xplugin:ErrorProne -Xep:StringSplitter:OFF -Xep:ReferenceEquality:OFF -Xep:InsecureCryptoUsage:OFF -Xep:FutureReturnValueIgnored:OFF -Xep:JdkObsolete:OFF -Xep:EqualsHashCode:OFF -Xep:JavaUtilDate:OFF -Xep:DoNotCallSuggester:OFF -Xep:BanSerializableRead:OFF" /> 140 135 <compilerarg line="-Xmaxwarns 1000"/> 141 136 <classpath refid="plugin.classpath"/> … … 305 300 <bottom><![CDATA[<a href="https://josm.openstreetmap.de/wiki/Plugins">JOSM Plugins</a>]]></bottom> 306 301 <arg line="-tag license:X" /> 307 <arg value="-html5" if:set="isJava9" /> 308 <arg value="--add-modules" if:set="isJava9" unless:set="isJava11" /> 309 <arg value="java.activation,java.se.ee" if:set="isJava9" unless:set="isJava11" /> 310 <arg value="--add-exports" if:set="isJava9" unless:set="noJavaFX" /> 311 <arg value="javafx.graphics/com.sun.javafx.application=ALL-UNNAMED" if:set="isJava9" unless:set="noJavaFX" /> 302 <arg value="-html5" /> 303 <arg value="--add-exports" unless:set="noJavaFX" /> 304 <arg value="javafx.graphics/com.sun.javafx.application=ALL-UNNAMED" unless:set="noJavaFX" /> 312 305 </javadoc> 313 306 </target> … … 624 617 <jvmarg value="-Djunit.jupiter.extensions.autodetection.enabled=true"/> 625 618 <jvmarg value="-Djunit.jupiter.execution.parallel.enabled=true"/> 626 <jvmarg value="--add-modules" if:set="isJava9" unless:set="isJava11" /> 627 <jvmarg value="java.activation,java.se.ee" if:set="isJava9" unless:set="isJava11" /> 628 <jvmarg value="--add-opens" if:set="isJava9" /> 629 <jvmarg value="java.base/java.lang.reflect=ALL-UNNAMED" if:set="isJava9" /> 630 <jvmarg value="--add-opens" if:set="isJava9" /> 631 <jvmarg value="java.desktop/javax.imageio.spi=ALL-UNNAMED" if:set="isJava9" /> 632 <jvmarg value="--add-exports" if:set="isJava9" /> 633 <jvmarg value="java.desktop/com.sun.imageio.spi=ALL-UNNAMED" if:set="isJava9" /> 619 <jvmarg value="--add-opens" /> 620 <jvmarg value="java.base/java.lang.reflect=ALL-UNNAMED" /> 621 <jvmarg value="--add-opens" /> 622 <jvmarg value="java.desktop/javax.imageio.spi=ALL-UNNAMED" /> 623 <jvmarg value="--add-exports" /> 624 <jvmarg value="java.desktop/com.sun.imageio.spi=ALL-UNNAMED" /> 634 625 <jvmarg value="-XX:+ShowCodeDetailsInExceptionMessages" if:set="isJava14" unless:set="isJava15" /> 635 626 <sysproperty key="josm.home" value="../00_core_test_config/unit-josm.home"/> -
applications/editors/josm/plugins/build.xml
r36291 r36308 10 10 <condition property="isJava21"><matches string="${ant.java.version}" pattern="2[1-9]|[3-9][0-9]" /></condition> 11 11 <condition property="isJava17"><matches string="${ant.java.version}" pattern="1[7-9]|[2-9][0-9]" /></condition> 12 <condition property="isJava11"><matches string="${ant.java.version}" pattern="1[1-9]|[2-9][0-9]" /></condition>13 12 <!-- Specific plugins --> 14 13 <property name="java21_plugins" value="FIT/build.xml … … 30 29 geotools/build.xml 31 30 austriaaddresshelper/build.xml"/> 32 <property name="javafx_plugins" value="javafx/build.xml"/>33 31 <macrodef name="iterate"> 34 32 <attribute name="target"/> … … 36 34 <subant target="@{target}" inheritall="true"> 37 35 <filelist dir="." files="${ordered_plugins}"/> 38 <!-- Build JavaFX plugins only with Java 11+ -->39 <filelist dir="." files="${javafx_plugins}" if:set="isJava11"/>40 36 <filelist dir="." files="${java17_plugins}" if:set="isJava17"/> 41 37 <filelist dir="." files="${java21_plugins}" if:set="isJava21"/> 42 <fileset dir="." includes="*/build.xml" excludes="00_*/build.xml *.wip/build.xml ${ javafx_plugins} ${ordered_plugins} ${java17_plugins} ${java21_plugins} "/>38 <fileset dir="." includes="*/build.xml" excludes="00_*/build.xml *.wip/build.xml ${ordered_plugins} ${java17_plugins} ${java21_plugins} "/> 43 39 </subant> 44 40 </sequential>
Note:
See TracChangeset
for help on using the changeset viewer.
