From d8aa00723c8ea8b944cb7c20e29eb1e0ffd66f8a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Reimar=20D=C3=B6ffinger?= Date: Mon, 13 Apr 2020 14:35:54 +0200 Subject: [PATCH] Put compiled .class files into bin/ directory. Cleaner than having them all over. Also update gitignore file. --- .gitignore | 5 ++--- compile.sh | 3 ++- run.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 287cc93..38a503e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -dictInputs -dictOutputs/ +data/inputs/ +data/outputs/ bin wikiSplit wikiSplit_2011 @@ -7,4 +7,3 @@ wikiSplit_201106 wikiSplit_201111 .project .settings/ -*.class diff --git a/compile.sh b/compile.sh index 7cb5a15..422036c 100755 --- a/compile.sh +++ b/compile.sh @@ -30,6 +30,7 @@ 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 -encoding UTF-8 -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 -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" diff --git a/run.sh b/run.sh index e582857..99113e7 100755 --- a/run.sh +++ b/run.sh @@ -7,4 +7,4 @@ COMMONS=/usr/share/java/commons-text.jar COMMONS_COMPRESS=/usr/share/java/commons-compress.jar JAVA=/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java test -x "$JAVA" || JAVA=java -"$JAVA" -Djava.util.logging.config.file="logging.properties" -Xmx4096m -classpath src:../Dictionary/Util/src/:../Dictionary/src/:"$ICU4J":"$XERCES":"$COMMONS":"$COMMONS_COMPRESS" com.hughes.android.dictionary.engine.DictionaryBuilder "$@" +"$JAVA" -Djava.util.logging.config.file="logging.properties" -Xmx4096m -classpath bin/:"$ICU4J":"$XERCES":"$COMMONS":"$COMMONS_COMPRESS" com.hughes.android.dictionary.engine.DictionaryBuilder "$@" -- 2.43.0