Fix pathnames

[DictionaryPC.git] / compile.sh

diff --git a/compile.sh b/compile.sh
index 0d577aa68d7ff364b1c5aeb4c42a83b03acccc3a..da057ce253fc438694da7000074c75141c0efa29 100755 (executable)
--- a/compile.sh
+++ b/compile.sh
@@ -1,4 +1,4 @@
-ICU4J=/usr/share/java/icu4j-49.1.jar
+ICU4J=/usr/share/java/icu4j.jar
 test -r "$ICU4J" || ICU4J=/usr/share/icu4j-55/lib/icu4j.jar
 JUNIT=/usr/share/java/junit.jar
 test -r "$JUNIT" || JUNIT=/usr/share/junit/lib/junit.jar
@@ -25,8 +25,11 @@ if [ ! -r "$COMMONS_COMPRESS" ] ; then
     echo "commons-compress needs to be installed"
     exit 1;
 fi
+JAVAC=/usr/lib/jvm/java-8-openjdk-amd64/bin/javac
+test -x "$JAVAC" || JAVAC=javac
+
 mkdir -p bin
 # -encoding is just a work around for user that still run systems
 # with non-UTF8 locales
 # Limit to Java 11 for compatibility with native-image
-javac --source 11 --target 11 --limit-modules java.xml,java.logging -Xlint:all -encoding UTF-8 -g -d bin/ ../Dictionary/Util/src/com/hughes/util/*.java ../Dictionary/Util/src/com/hughes/util/raf/*.java ../Dictionary/src/com/hughes/android/dictionary/DictionaryInfo.java ../Dictionary/src/com/hughes/android/dictionary/engine/*.java ../Dictionary/src/com/hughes/android/dictionary/C.java src/com/hughes/util/*.java src/com/hughes/android/dictionary/*.java src/com/hughes/android/dictionary/*/*.java src/com/hughes/android/dictionary/*/*/*.java -classpath "$ICU4J:$JUNIT:$COMMONS:$COMMONS_COMPRESS"
+$JAVAC -Xlint:all -encoding UTF-8 -g -d bin/ ../Dictionary/Util/src/com/hughes/util/*.java ../Dictionary/Util/src/com/hughes/util/raf/*.java ../Dictionary/src/com/hughes/android/dictionary/DictionaryInfo.java ../Dictionary/src/com/hughes/android/dictionary/engine/*.java ../Dictionary/src/com/hughes/android/dictionary/C.java src/com/hughes/util/*.java src/com/hughes/android/dictionary/*.java src/com/hughes/android/dictionary/*/*.java src/com/hughes/android/dictionary/*/*/*.java -classpath "$ICU4J:$JUNIT:$COMMONS:$COMMONS_COMPRESS"