Author: Andreas Tille <tille@debian.org>
Last-Update: Wed, 18 Nov 2020 17:51:16 +0100
Description: Fix classpath
 We provide the extensive list of the needed jars instead of using the joker
 character, as several installed jars in /usr/share/java may provide the same
 package, which leads to errors.

--- a/antbuild/build.xml
+++ b/antbuild/build.xml
@@ -19,17 +19,31 @@
 
 	<project name="JLODA" default="jar" basedir=".">
 
-		<property name="jfxDir" value="../../javafx/lib"/>
 		<property name="buildSrcDir" value="../antbuild/src"/>
 		<property name="buildModulesDir" value="../antbuild/modules"/>
 
 		<path id="build.classpath">
-			<fileset dir="../../jloda/jars"  includes="*.jar"/>
+			<fileset dir="/usr/share/java"  includes="batik-all.jar"/>
+			<fileset dir="/usr/share/java"  includes="controlsfx.jar"/>
+			<fileset dir="/usr/share/java"  includes="javafx-base.jar"/>
+			<fileset dir="/usr/share/java"  includes="javafx-controls.jar"/>
+			<fileset dir="/usr/share/java"  includes="javafx-fxml.jar"/>
+			<fileset dir="/usr/share/java"  includes="javafx-graphics.jar"/>
+			<fileset dir="/usr/share/java"  includes="javafx-media.jar"/>
+			<fileset dir="/usr/share/java"  includes="javafx-web.jar"/>
+			<fileset dir="/usr/share/java"  includes="VectorGraphics2D.jar"/>
 		</path>
 
 		<path id="build.modulepath">
-			<fileset dir="../../jloda/jars"  includes="*.jar"/>
-			<fileset dir="${jfxDir}"  includes="*.jar"/>
+			<fileset dir="/usr/share/java"  includes="batik-all.jar"/>
+			<fileset dir="/usr/share/java"  includes="controlsfx.jar"/>
+			<fileset dir="/usr/share/java"  includes="javafx-base.jar"/>
+			<fileset dir="/usr/share/java"  includes="javafx-controls.jar"/>
+			<fileset dir="/usr/share/java"  includes="javafx-fxml.jar"/>
+			<fileset dir="/usr/share/java"  includes="javafx-graphics.jar"/>
+			<fileset dir="/usr/share/java"  includes="javafx-media.jar"/>
+			<fileset dir="/usr/share/java"  includes="javafx-web.jar"/>
+			<fileset dir="/usr/share/java"  includes="VectorGraphics2D.jar"/>
 		</path>
 
 		<target name="init">
@@ -40,13 +54,13 @@
 
 		<target name="copy_sources" depends="init">
 			<copy todir="${buildSrcDir}/jloda" >
-				<fileset dir="../../jloda/src"/>
+				<fileset dir="../src"/>
 			</copy>
 		</target>
 
 		<target name="copy_resources" depends="copy_sources">
 			<copy todir="${buildModulesDir}/jloda">
-				<fileset dir="../../jloda/src" includes="**/*.fxml **/*.png **/*.gif **/*.css"/>
+				<fileset dir="../src" includes="**/*.fxml **/*.png **/*.gif **/*.css"/>
 			</copy>
 		</target>