Changeset 36015 in osm for applications/editors/josm/plugins/geotools/build.xml

Timestamp:

2022-08-23T20:06:58+02:00 (3 years ago)

Author:

taylor.smock

Message:

Fix #22303: Open drone image as background image

• Add additional files to be merged in META-INF for JAI (this fixes an issue where ShadedRelief could not be found). This is done by modifying build.xml to concat multiple files with the same path and name in different jar files together
• Add CompressorSpi and DecompressorSpi so that compressed image formats can be read. This requires us to call CompressionRegistry#registerApplicationClasspathSpis with the geotools plugin classloader.

File:

• applications/editors/josm/plugins/geotools/build.xml (modified) (3 diffs)

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-  <project name="geotools" default="dist" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
+  <project name="geotools" default="dist" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:rsel="antlib:org.apache.tools.ant.types.resources.selectors">
     <!-- enter the SVN commit message -->
     <property name="commit.message" value="Commit message"/>
@@ -29 +29 @@
         <!--<include name="jackson.jar"/>-->
     </fileset>
+    <macrodef name="merge-text-files">
+      <attribute name="mergefile"/>
+      <attribute name="targetdir"/>
+      <sequential>
+        <concat destfile="@{targetdir}/@{mergefile}">
+          <restrict>
+            <rsel:name name="@{mergefile}"/>
+            <archives>
+                <zips>
+                    <fileset dir="${plugin.lib.dir}" includes="*.jar" excludes="*-sources.jar, *-javadoc.jar" erroronmissingdir="no"/>
+                </zips>
+            </archives>
+          </restrict>
+        </concat>
+      </sequential>
+    </macrodef>
 
     <target name="merge-geotools-services" depends="fetch_dependencies">
@@ -40 +56 @@
             </fileset>
         </merge-services>
-    <echo>Check the updated files in jar/META-INF/services for lines where two
-    services got merged. Example:
-    org.geotools.coverage.util.FilterFunction_isCoverageorg.geotools.filter.AreaFunction
-    </echo>
+        <echo>Check the updated files in jar/META-INF/services for lines where two
+        services got merged. Example:
+        org.geotools.coverage.util.FilterFunction_isCoverageorg.geotools.filter.AreaFunction
+        </echo>
+
+        <merge-text-files mergefile="META-INF/javax.media.jai.registryFile.jai" targetdir="jar"/>
+        <merge-text-files mergefile="META-INF/registryFile.jai"                 targetdir="jar"/>
+        <merge-text-files mergefile="META-INF/registryFile.jaiext"              targetdir="jar"/>
     </target>