commit ba8e25e19a77d53b82582f2a7f2b1025b4c011f7 Author: iwakeh iwakeh@torproject.org Date: Mon Dec 4 11:14:17 2017 +0000

Replace start script for Rserver by ant script.

This includes moving the necessary R sources and config file to a location in the main source tree and removing the now obsolete script. --- build.xml | 14 ++++++++++++++ {website/rserve => src/main/R/rserver}/Rserv.conf | 0 {website/rserve => src/main/R/rserver}/graphs.R | 0 {website/rserve => src/main/R/rserver}/rserve-init.R | 0 {website/rserve => src/main/R/rserver}/tables.R | 0 website/rserve/start.sh | 3 --- 6 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml index bef7e1b..7ebe764 100644 --- a/build.xml +++ b/build.xml @@ -74,6 +74,20 @@ </exec> </target>

+ <!-- Operational tasks. --> + <target name="run-rserver"> + <exec executable="R" + dir="${Rsources}/rserver" + failonerror="true" > + <arg value="CMD"/> + <arg value="Rserve" /> + <arg value="--no-save" /> + <arg value="--quiet" /> + <arg value="--RS-conf" /> + <arg value="Rserv.conf" /> + </exec> + </target> + <!-- The following line adds the common targets and properties for Metrics' Java Projects. --> diff --git a/website/rserve/Rserv.conf b/src/main/R/rserver/Rserv.conf similarity index 100% rename from website/rserve/Rserv.conf rename to src/main/R/rserver/Rserv.conf diff --git a/website/rserve/graphs.R b/src/main/R/rserver/graphs.R similarity index 100% rename from website/rserve/graphs.R rename to src/main/R/rserver/graphs.R diff --git a/website/rserve/rserve-init.R b/src/main/R/rserver/rserve-init.R similarity index 100% rename from website/rserve/rserve-init.R rename to src/main/R/rserver/rserve-init.R diff --git a/website/rserve/tables.R b/src/main/R/rserver/tables.R similarity index 100% rename from website/rserve/tables.R rename to src/main/R/rserver/tables.R diff --git a/website/rserve/start.sh b/website/rserve/start.sh deleted file mode 100755 index f353885..0000000 --- a/website/rserve/start.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -dir=`pwd` -R CMD Rserve --no-save --RS-conf $dir/Rserv.conf >> rserve.log 2>&1