Put compiled .class files into bin/ directory.

Cleaner than having them all over.
Also update gitignore file.

diff --git a/.gitignore b/.gitignore
index 287cc93e6762676d75cb896d74389de9ade476e5..38a503e23f5f2e2082bc8682f7d493febfbbadae 100644 (file)
--- 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 7cb5a1500fe15f6084a27ae5e0db4cebec5f3808..422036cccb612d0f6d28bcbef6d652592206d4ee 100755 (executable)
--- 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 e5828577f479b651842c44dd4369d0c8cec357a4..99113e7471da48c2826735781deb36ec661495f7 100755 (executable)
--- 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 "$@"