Updated version
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/57b7b82a Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/57b7b82a Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/57b7b82a Branch: refs/heads/master Commit: 57b7b82ae52016538fa81a541d2c978cd3a0ebb0 Parents: 98bbc21 Author: Matt Post <p...@cs.jhu.edu> Authored: Thu Oct 13 12:53:58 2016 -0400 Committer: Matt Post <p...@cs.jhu.edu> Committed: Thu Oct 13 12:53:58 2016 -0400 ---------------------------------------------------------------------- bin/joshua-decoder | 2 +- src/main/java/org/apache/joshua/decoder/ArgsParser.java | 11 ++++------- src/main/java/org/apache/joshua/util/Constants.java | 2 ++ 3 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/57b7b82a/bin/joshua-decoder ---------------------------------------------------------------------- diff --git a/bin/joshua-decoder b/bin/joshua-decoder index 429188e..3be122a 100755 --- a/bin/joshua-decoder +++ b/bin/joshua-decoder @@ -43,7 +43,7 @@ JOSHUA=$(dirname $0)/.. RES_OVERRIDE_PATH=$JOSHUA/src/main/resources # Get the jar file (only the most recent, if there are many) JAR_PATH=$(ls -t $JOSHUA/target/joshua-*-jar-with-dependencies.jar | head -n1) -exec java -Xmx${mem} \ +exec java -mx${mem} \ -Dfile.encoding=utf8 \ -Djava.library.path=$JOSHUA/lib \ -cp $JAR_PATH \ http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/57b7b82a/src/main/java/org/apache/joshua/decoder/ArgsParser.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/joshua/decoder/ArgsParser.java b/src/main/java/org/apache/joshua/decoder/ArgsParser.java index 97baa27..33b808c 100644 --- a/src/main/java/org/apache/joshua/decoder/ArgsParser.java +++ b/src/main/java/org/apache/joshua/decoder/ArgsParser.java @@ -23,6 +23,7 @@ import java.nio.charset.Charset; import java.nio.file.Files; import java.nio.file.Paths; +import org.apache.joshua.util.Constants; import org.apache.joshua.util.io.LineReader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,13 +62,9 @@ public class ArgsParser { } if (args[i].equals("-version")) { - try (LineReader reader = new LineReader(String.format("%s/VERSION", System.getenv("JOSHUA")));) { - reader.readLine(); - String version = reader.readLine().split("\\s+")[2]; - System.out.println(String.format("The Apache Joshua machine translator, version %s", version)); - System.out.println("joshua.incubator.apache.org"); - System.exit(0); - } + System.out.println(String.format("The Apache Joshua Machine Translator, version %s", Constants.VERSION)); + System.out.println("http://joshua.apache.org/";); + System.exit(0); } else if (args[i].equals("-license")) { try { Files.readAllLines(Paths.get(String.format("%s/../LICENSE", http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/57b7b82a/src/main/java/org/apache/joshua/util/Constants.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/joshua/util/Constants.java b/src/main/java/org/apache/joshua/util/Constants.java index b70f6f2..b918ead 100644 --- a/src/main/java/org/apache/joshua/util/Constants.java +++ b/src/main/java/org/apache/joshua/util/Constants.java @@ -25,6 +25,8 @@ package org.apache.joshua.util; */ public final class Constants { + public static final String VERSION = "6.1"; + public static final String defaultNT = "[X]"; public static final String START_SYM = "<s>";
