Merge pull request #9 from agoravoting/release-17-04

Release 17 04
sequentech · Apr 29, 2017 · 2def680 · 2def680
2 parents 34a0164 + 1228d5a
commit 2def680
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/build.sbt b/build.sbt
@@ -15,7 +15,7 @@
 
 name := "agora-verifier"
 
-version := "3.4"
+version := "17.04"
 
 scalaVersion := "2.10.3"
 

diff --git a/package.sh b/package.sh
@@ -19,7 +19,7 @@ rm -r -f dist
 mkdir dist
 cp -r agora_tally dist
 cp -r agora_results dist
-cp target/scala-2.10/proguard/agora-verifier_2.10-3.4.jar dist
+cp target/scala-2.10/proguard/agora-verifier_2.10-17.04.jar dist
 cp pverify.sh dist
 cp vmnc.sh dist
 cp verify.py dist

diff --git a/pverify.sh b/pverify.sh
@@ -22,5 +22,5 @@ fi
 
 command -v java >/dev/null 2>&1 || { echo >&2 "* I require java but it's not installed.  Aborting."; exit 1; }
 
-java -Djava.security.egd=file:/dev/./urandom -classpath agora-verifier_2.10-3.4.jar org.agoravoting.agora.Verifier $1 $2
+java -Djava.security.egd=file:/dev/./urandom -classpath agora-verifier_2.10-17.04.jar org.agoravoting.agora.Verifier $1 $2
 exit $?
diff --git a/verify.py b/verify.py
@@ -312,6 +312,7 @@ def sig_handler(signum, frame):
         __pretty_print_base(tallyfile_json,
             filter_names=["plurality-at-large",
                           "borda-nauru",
+                          "desborda",
                           "borda",
                           "pairwise-beta"])
 

diff --git a/vmnc.sh b/vmnc.sh
@@ -19,4 +19,4 @@ command -v java >/dev/null 2>&1 || { echo >&2 "* I require java but it's not ins
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-java -Djava.security.egd=file:/dev/./urandom -classpath $DIR/agora-verifier_2.10-3.4.jar org.agoravoting.agora.Vmnc "$@"
+java -Djava.security.egd=file:/dev/./urandom -classpath $DIR/agora-verifier_2.10-17.04.jar org.agoravoting.agora.Vmnc "$@"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,4 @@ command -v java >/dev/null 2>&1 \|\| { echo >&2 "* I require java but it's not ins

		DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

		java -Djava.security.egd=file:/dev/./urandom -classpath $DIR/agora-verifier_2.10-3.4.jar org.agoravoting.agora.Vmnc "$@"
		java -Djava.security.egd=file:/dev/./urandom -classpath $DIR/agora-verifier_2.10-17.04.jar org.agoravoting.agora.Vmnc "$@"