Merge branch 'kenlm_docker'
diff --git a/scripts/language-pack/build_lp.sh b/scripts/language-pack/build_lp.sh
index 15cdb3c..6e40127 100755
--- a/scripts/language-pack/build_lp.sh
+++ b/scripts/language-pack/build_lp.sh
@@ -53,7 +53,7 @@
# Create the jar file if it's not there
JARFILE=$(ls -tr $JOSHUA/target/joshua-*-jar-with-dependencies.jar | tail -n1)
if [[ ! -e "$JARFILE" ]]; then
- (cd $JOSHUA && mvn clean install)
+ (cd $JOSHUA && mvn clean package)
fi
# Create the bundle
@@ -82,11 +82,11 @@
[[ ! -d "$dest/target" ]] && mkdir -p "$dest/target"
cp $JARFILE $dest/target
-# Copy over KenLM if found
-if [[ -e "$JOSHUA/lib/libken.so" ]]; then
- [[ ! -d "$dest/lib" ]] && mkdir -p "$dest/lib"
- cp $JOSHUA/lib/libken.so "$dest/lib"
-fi
+# create the LP config file
+version=3
+git=$(cd $JOSHUA; git describe --long --dirty)
+echo "version = $version" > $dest/lp.conf
+echo "commit = $git" >> $dest/lp.conf
# Copy over the web demonstration
cp -a $JOSHUA/demo $dest/web
diff --git a/scripts/language-pack/copy_model.py b/scripts/language-pack/copy_model.py
index 4b902b5..e8dd515 100755
--- a/scripts/language-pack/copy_model.py
+++ b/scripts/language-pack/copy_model.py
@@ -82,10 +82,7 @@
#
# The default amount of memory is 4gb.
-NUM_ARGS=0
-E_OPTERROR=1
-
-## memory usage; default is 4 GB
+## Java heap space. Increase this if you get errors.
mem=%s
if [[ $1 == "-m" ]]; then
@@ -98,11 +95,7 @@
bundledir=$(dirname $0)
-exec java -mx${mem} \\
- -Dfile.encoding=utf8 \\
- -Djava.library.path=$bundledir/lib \\
- -cp $bundledir/target/joshua-*-jar-with-dependencies.jar \\
- org.apache.joshua.decoder.JoshuaDecoder -c $bundledir/joshua.config -v 0 "$@"
+exec java -mx${mem} -Dfile.encoding=utf8 -cp $bundledir/target/joshua-*-jar-with-dependencies.jar org.apache.joshua.decoder.JoshuaDecoder -c $bundledir/joshua.config -v 0 "$@"
""" % mem
return text
