X-Git-Url: http://gitweb.fperrin.net/?p=DictionaryPC.git;a=blobdiff_plain;f=compile.sh;h=fdbb88739ae19e2b7f9f75c0c26095908fb13d78;hp=da057ce253fc438694da7000074c75141c0efa29;hb=c188fa3368265e362f689b86274f0dd0dd5b3573;hpb=020aa910526ece05ee8514e55a9a951b45ce1fea

diff --git a/compile.sh b/compile.sh
index da057ce..fdbb887 100755
--- a/compile.sh
+++ b/compile.sh
@@ -1,35 +1,8 @@
-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
-COMMONS=/usr/share/java/commons-lang3.jar
-test -r "$COMMONS" || COMMONS=/usr/share/commons-lang-3.3/lib/commons-lang.jar
-COMMONS_COMPRESS=/usr/share/java/commons-compress.jar
-if [ ! -x ../Dictionary ] ; then
-    echo "You need to clone the Dictionary repository (including subprojects) into .."
-    exit 1
-fi
-if [ ! -r "$ICU4J" ] ; then
-    echo "ICU4J needs to be installed"
-    exit 1;
-fi
-if [ ! -r "$JUNIT" ] ; then
-    echo "Junit needs to be installed"
-    exit 1;
-fi
-if [ ! -r "$COMMONS" ] ; then
-    echo "commons-lang needs to be installed"
-    exit 1;
-fi
-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
+#!/bin/bash
+. ./javalibs.sh
 
 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 -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_LANG3:$COMMONS_TEXT:$COMMONS_COMPRESS"