From ed9761f5fff1c9ab6cde8c8cf39209e4419d709b Mon Sep 17 00:00:00 2001
From: Daniel Peppicelli <daniel.peppicelli@epfl.ch>
Date: Mon, 19 Oct 2015 14:12:33 +0200
Subject: [PATCH] [NRRPLT-2780] gzweb should now be deployed on the GPFS
Change-Id: Id054d0b25ffdbd56bd4feb7925d4881ccaaaf48d
---
gzbridge.init.d.sh | 51 +++++++++++++++++++++++-----------------
gzbridge/ws_server.js | 2 +-
hbp/module_file.template | 5 ++--
3 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/gzbridge.init.d.sh b/gzbridge.init.d.sh
index f71794b..1da641e 100755
--- a/gzbridge.init.d.sh
+++ b/gzbridge.init.d.sh
@@ -19,7 +19,33 @@
# Source function library.
. /etc/rc.d/init.d/functions
-GZBRIDGE_BIN_DIR=/nfs4/bbp.epfl.ch/sw/neurorobotics/gzweb/2014.10.15/rhel-6.5-x86_64/gcc-4.8.2/x86_64/gzweb/gzbridge
+DOMAIN=`hostname -d`
+case $DOMAIN in
+'epfl.ch')
+ export MODULEPATH=$MODULEPATH:/nfs4/bbp.epfl.ch/sw/neurorobotics/modulefiles
+ export MODULEPATH=$MODULEPATH:/nfs4/bbp.epfl.ch/sw/module/modulefiles
+ source /nfs4/bbp.epfl.ch/sw/platform/set_module_path.sh
+ module load boost/1.55zlib-rhel6-x86_64-gcc4.4
+ module load sdf/2.0-rhel6-x86_64-gcc4.4
+ module load gazebo/4.0-rhel6-x86_64-gcc4.8.2
+ module load ogre/1.8.1-rhel6-x86_64-gcc4.8.2
+ export GZBRIDGE_BIN_DIR=/nfs4/bbp.epfl.ch/sw/neurorobotics/gzweb/2014.10.15/rhel-6.5-x86_64/gcc-4.8.2/x86_64/gzweb/gzbridge
+ ;;
+'cscs.ch')
+ export MODULEPATH=$MODULEPATH:/gpfs/bbp.cscs.ch/apps/viz/neurorobotics/modulefiles
+ source /gpfs/bbp.cscs.ch/apps/viz/set_module_path.sh
+ module load boost/1.55zlib-rhel6-x86_64-gcc4.4
+ module load sdf/last-build
+ module load gazebo/last-build
+ module load gzbridge/last-build
+ module load ogre/1.9.0-rhel6-x86_64-gcc-4.8.2
+ ;;
+*)
+ #see if we found a valid path above, could make this exit if we wanted
+ echo "Warning: no valid set_module_path.sh, do you have access to /nfs4 or /gpfs?"
+ exit -1
+ ;;
+esac
if [ -z $GZBRIDGE_BIN_DIR ]; then
echo "Necessary environment variable GZBRIDGE_BIN_DIR not set!"
@@ -29,28 +55,10 @@ fi
exec="$GZBRIDGE_BIN_DIR/ws_server.js"
prog="node"
-lockfile=/var/lock/subsys/$prog
+lockfile=/home/$USER/lock/$prog
start() {
- # loading the environment modules configuration files
- export MODULEPATH=$MODULEPATH:/nfs4/bbp.epfl.ch/sw/neurorobotics/modulefiles
- export MODULEPATH=$MODULEPATH:/nfs4/bbp.epfl.ch/sw/module/modulefiles
-
- # source environment modules init file
- . /usr/share/Modules/init/bash 2> /dev/null
-
- # load the modules
- module load gazebo/4.0-rhel6-x86_64-gcc4.8.2 &&
- module load sdf/2.0-rhel6-x86_64-gcc4.4 &&
- module load ogre/1.8.1-rhel6-x86_64-gcc4.8.2 &&
- module load boost/1.55zlib-rhel6-x86_64-gcc4.4
- retval=$?
- if [ $retval -ne 0 ]; then
- echo "Loading the environment modules was not successful!"
- exit 1
- fi
-
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/nfs4/bbp.epfl.ch/sw/neurorobotics/staging/lib64/
+ echo -n $"Starting $prog: "
# test if the exec file exists and execute permission is granted
# exit with exit code 5 (program not installed) if conditions do not hold
@@ -60,7 +68,6 @@ start() {
# does not work properly :(
cd $GZBRIDGE_BIN_DIR
- echo -n $"Starting $prog: "
# if not running, start gzbridge up here
$exec &>/dev/null &
retval=$?
diff --git a/gzbridge/ws_server.js b/gzbridge/ws_server.js
index 664aaab..07cf735 100755
--- a/gzbridge/ws_server.js
+++ b/gzbridge/ws_server.js
@@ -10,7 +10,7 @@ var http = require('http');
var connections = [];
var materialScriptsMessage = {};
-var addon = require('./build/Debug/gzbridge');
+var addon = require('./build/Release/gzbridge');
if (process.argv.length == 2) {
var gzconnection = new addon.GZNode();
diff --git a/hbp/module_file.template b/hbp/module_file.template
index bda050d..999aab8 100644
--- a/hbp/module_file.template
+++ b/hbp/module_file.template
@@ -14,8 +14,8 @@ set sw_basedir "$NEUROROBOTICS_MODULE_PATH"
set package_name "$BUILD_PACKAGE_NAME"
set version "$BUILD_VERSION"
set platform "rhel6"
-set compiler "$BUILD_COMPILER "
-set architecture "x86_64"
+set compiler "$BUILD_COMPILER "
+set architecture "x86_64"
set root "$sw_basedir/$package_name/$version/$platform/$compiler/$architecture/"
module-whatis "loads the environment for $package_name"
@@ -33,3 +33,4 @@ and 'module avail' to list all the availables ones.
}
# Update PATH environment:
+setenv GZBRIDGE_BIN_DIR $root/gzbridge
--
GitLab