Changeset 36151 in osm


Ignore:
Timestamp:
2023-10-02T17:18:00+02:00 (16 months ago)
Author:
taylor.smock
Message:

Fix #8647: Add Garmin FIT parsing (as a plugin)

Documentation/files used for implementation:

Location:
applications/editors/josm/plugins
Files:
65 added
2 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/build-common.xml

    r36105 r36151  
    5656    <condition property="isMac"><os family="Mac"/></condition>
    5757    <!-- For Java specific stuff by version -->
    58     <condition property="isJava9"><matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9]|2[0-9])" /></condition>
    59     <condition property="isJava10"><matches string="${ant.java.version}" pattern="1[0-9]|2[0-9]" /></condition>
    60     <condition property="isJava11"><matches string="${ant.java.version}" pattern="1[1-9]|2[0-9]" /></condition>
    61     <condition property="isJava12"><matches string="${ant.java.version}" pattern="1[2-9]|2[0-9]" /></condition>
    62     <condition property="isJava13"><matches string="${ant.java.version}" pattern="1[3-9]|2[0-9]" /></condition>
    63     <condition property="isJava14"><matches string="${ant.java.version}" pattern="1[4-9]|2[0-9]" /></condition>
    64     <condition property="isJava15"><matches string="${ant.java.version}" pattern="1[5-9]|2[0-9]" /></condition>
    65     <condition property="isJava16"><matches string="${ant.java.version}" pattern="1[6-9]|2[0-9]" /></condition>
    66     <condition property="isJava20"><matches string="${ant.java.version}" pattern="2[0-9]" /></condition>
    67     <!-- Disable jacoco on Java 20+ (Jacoco does not yet support Java 20+) -->
     58    <condition property="isJava9"><matches string="${ant.java.version}" pattern="(1.)?(9|[1-9][0-9])" /></condition>
     59    <condition property="isJava11"><matches string="${ant.java.version}" pattern="1[1-9]|[2-9][0-9]" /></condition>
     60    <condition property="isJava14"><matches string="${ant.java.version}" pattern="1[4-9]|[2-9][0-9]" /></condition>
     61    <condition property="isJava15"><matches string="${ant.java.version}" pattern="1[5-9]|[2-9][0-9]" /></condition>
     62    <condition property="isJava17"><matches string="${ant.java.version}" pattern="1[7-9]|[2-9][0-9]" /></condition>
     63    <condition property="isJava21"><matches string="${ant.java.version}" pattern="2[1-9]|[3-9][0-9]" /></condition>
     64    <!-- Disable jacoco on Java 21+ (Jacoco does not yet support Java 21+) -->
    6865    <condition property="coverageByDefault">
    6966        <not>
    70             <isset property="isJava20"/>
     67            <isset property="isJava21"/>
    7168        </not>
    7269    </condition>

  • applications/editors/josm/plugins/build.xml

    r36112 r36151  
    88    </target>
    99    <!-- For Java specific stuff by version -->
     10    <condition property="isJava21"><matches string="${ant.java.version}" pattern="2[1-9]|[3-9][0-9]" /></condition>
    1011    <condition property="isJava17"><matches string="${ant.java.version}" pattern="1[7-9]|[2-9][0-9]" /></condition>
    1112    <condition property="isJava11"><matches string="${ant.java.version}" pattern="1[1-9]|[2-9][0-9]" /></condition>
    1213    <!-- Specific plugins -->
     14    <property name="java21_plugins" value="fit/build.xml" />
    1315    <property name="java17_plugins" value="maproulette/build.xml
    1416                                            imageio/build.xml
    … …  
    3638                <!-- Build JavaFX plugins only with Java 11+ -->
    3739                <filelist dir="." files="${javafx_plugins}" if:set="isJava11"/>
    38                <filelist dir="." files="${java17_plugins}" if:set="isJava17"/>
    39                <fileset  dir="." includes="*/build.xml" excludes="00_*/build.xml *.wip/build.xml ${javafx_plugins} ${ordered_plugins} ${java17_plugins}"/>
     40                <filelist dir="." files="${java17_plugins}" if:set="isJava17"/>
     41                <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}"/>
    4043            </subant>
    4144        </sequential>
Note: See TracChangeset for help on using the changeset viewer.