[PATCH 1 of 2] Use latest WSPLGEN binary

[Wald Commits]

# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1394120325 -3600
# Node ID f9637e6ecf6d01354006c06615727ba86a6cd349
# Parent  a18c97f9d7520556a880caec7620f694a869c41b
Use latest WSPLGEN binary.

diff -r a18c97f9d752 -r f9637e6ecf6d contrib/make_flys_release/bin/run.sh
--- a/contrib/make_flys_release/bin/run.sh	Wed Mar 05 19:47:54 2014 +0100
+++ b/contrib/make_flys_release/bin/run.sh	Thu Mar 06 16:38:45 2014 +0100
@@ -19,7 +19,7 @@
      -Djava.io.tmpdir="$DIR/cache" \
      -Dflys.backend.enablejmx=true \
      -Dflys.uesk.keep.artifactsdir=false \
-     -Dwsplgen.bin.path="$DIR/bin/wsplgen.exe" \
+     -Dwsplgen.bin.path="$DIR/bin/wsplgen-linux-64bit-static" \
      -Dwsplgen.log.output=false \
      -Dartifact.database.dir="$DIR/conf" \
      $APP
diff -r a18c97f9d752 -r f9637e6ecf6d contrib/make_flys_release/make_release.sh
--- a/contrib/make_flys_release/make_release.sh	Wed Mar 05 19:47:54 2014 +0100
+++ b/contrib/make_flys_release/make_release.sh	Thu Mar 06 16:38:45 2014 +0100
@@ -262,9 +262,15 @@
 
 echo "INFO: copy scripts and libraries to target destination"
 cp ${SCRIPT_DIR}/bin/run.sh $WORK_DIR/server/bin/
-cp ${SCRIPT_DIR}/bin/wsplgen.exe $WORK_DIR/server/bin/
 cp ${SCRIPT_DIR}/libs/* $WORK_DIR/server/bin/lib/
 
+echo "INFO: download WSPLGEN"
+wget https://wald.intevation.org/frs/download.php/1496/wsplgen-linux-64bit-static.gz
+gunzip wsplgen-linux-64bit-static.gz
+echo "16d60047aa114d69e9435dbbe56b6981b4e1c445  wsplgen-linux-64bit-static" | \
+    sha1sum -c
+mv wsplgen-linux-64bit-static $WORK_DIR/server/bin/
+chmod +x $WORK_DIR/server/bin/wsplgen-linux-64bit-static
 
 if [ "$BUILD_ORACLE" = "TRUE" ]; then
     echo "INFO: remove PostgreSQL and PostGIS libraries"
diff -r a18c97f9d752 -r f9637e6ecf6d doc/INSTALL_DE
--- a/doc/INSTALL_DE	Wed Mar 05 19:47:54 2014 +0100
+++ b/doc/INSTALL_DE	Thu Mar 06 16:38:45 2014 +0100
@@ -214,17 +214,25 @@
     $ su d4e
     $ mkdir /opt/d4e-river/dgm
     $ cp /home/d4euser/d4e-river/demodaten/dem* /opt/d4e-river/dgm
+    $ exit
+    $ exit
 
 
 Einrichten von WSPLGEN
 ======================
 WSPLGEN kann als ausführbare Datei heruntergeladen werden
-(https://wald.intevation.org/projects/wsplgen/). Die Datei 'wsplgen.exe' muss
+(https://wald.intevation.org/projects/wsplgen/). Die Datei muss
 dann nur noch in das 'bin' Verzeichnis des D4E-river Servers kopiert werden.
 
+    $ cd ~/d4e-river
+    $ wget https://wald.intevation.org/frs/download.php/1496/wsplgen-linux-64bit-static.gz
+    $ gunzip wsplgen-linux-64bit-static.gz
+    $ echo "16d60047aa114d69e9435dbbe56b6981b4e1c445  wsplgen-linux-64bit-static" | \
+      sha1sum -c
     $ su root
     $ su d4e
-    $ cp /path/to/wsplgen.exe /opt/d4e-river/bin
+    $ cp /home/d4euser/d4e-river/wsplgen-linux-64bit-static /opt/d4e-river/bin
+    $ chmod +x /opt/d4e-river/bin/wsplgen-linux-64bit-static
 
 
 Einrichten des Mapserver und Apache