X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=compile.sh;h=dbff5c9b1a6baf7ec1ad5c8d261eb665dbf654e1;hb=84b14ea9dd8885e5084109844089f3fc813283f1;hp=9fe8e8d894ff7674cc180050afa43a153d19ed27;hpb=31436827de1a489660b273fb3ec34b00368b79e3;p=DictionaryPC.git

diff --git a/compile.sh b/compile.sh
index 9fe8e8d..dbff5c9 100755
--- a/compile.sh
+++ b/compile.sh
@@ -2,12 +2,10 @@ ICU4J=/usr/share/java/icu4j-49.1.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
-if [ ! -x ../Util -o ! -x ../Dictionary ] ; then
-    echo "You need to clone Util and Dictionary repositories into .."
+COMMONS=/usr/share/java/commons-text.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
@@ -18,12 +16,15 @@ 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;
 fi
-javac -g ../Util/src/com/hughes/util/*.java ../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/android/dictionary/*.java src/com/hughes/android/dictionary/*/*.java src/com/hughes/android/dictionary/*/*/*.java -classpath "$ICU4J:$JUNIT:$XERCES:$COMMONS"
+if [ ! -r "$COMMONS_COMPRESS" ] ; then
+    echo "commons-compress needs to be installed"
+    exit 1;
+fi
+mkdir -p bin
+# -encoding is just a work around for user that still run systems
+# with non-UTF8 locales
+javac --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"