X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=compile.sh;h=da057ce253fc438694da7000074c75141c0efa29;hb=370b6e57cca69c186cff4c2cdfd86edfdb3e2f8f;hp=7b0021f4b9f7f6ffa2201a487ebccad7b51ca145;hpb=f37d4e6b31795ca783ab34c4fff7a388f92090ac;p=DictionaryPC.git diff --git a/compile.sh b/compile.sh index 7b0021f..da057ce 100755 --- a/compile.sh +++ b/compile.sh @@ -1,9 +1,7 @@ -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 -XERCES=/usr/share/java/xercesImpl.jar -test -r "$XERCES" || XERCES=/usr/share/xerces-2/lib/xercesImpl.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 @@ -19,10 +17,6 @@ if [ ! -r "$JUNIT" ] ; then echo "Junit needs to be installed" exit 1; fi -if [ ! -r "$XERCES" ] ; then - echo "Xerces needs to be installed" - exit 1; -fi if [ ! -r "$COMMONS" ] ; then echo "commons-lang needs to be installed" exit 1; @@ -31,4 +25,11 @@ if [ ! -r "$COMMONS_COMPRESS" ] ; then echo "commons-compress needs to be installed" exit 1; fi -javac -g ../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:$XERCES:$COMMONS:$COMMONS_COMPRESS" +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 -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"