X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=compile.sh;h=dbff5c9b1a6baf7ec1ad5c8d261eb665dbf654e1;hb=84b14ea9dd8885e5084109844089f3fc813283f1;hp=28a6b8e9a448a1ac1da0de78bf0a41f744319f53;hpb=31218ade21839194c5cbbf7e5238f3013b4b196f;p=DictionaryPC.git diff --git a/compile.sh b/compile.sh index 28a6b8e..dbff5c9 100755 --- a/compile.sh +++ b/compile.sh @@ -2,8 +2,6 @@ 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-text.jar COMMONS_COMPRESS=/usr/share/java/commons-compress.jar if [ ! -x ../Dictionary ] ; then @@ -18,10 +16,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; @@ -33,4 +27,4 @@ fi mkdir -p bin # -encoding is just a work around for user that still run systems # with non-UTF8 locales -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:$XERCES:$COMMONS:$COMMONS_COMPRESS" +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"