updated scripts

[tools/simanio.git] / scripts / run_salome_siman.sh

diff --git a/scripts/run_salome_siman.sh b/scripts/run_salome_siman.sh
index 1761fa9a1debb06a8b4bf1c6dcaeee5c29e3f1d0..4a4d82d74246ae581e8e4507612ca82ee9c53248 100644 (file)
--- a/scripts/run_salome_siman.sh
+++ b/scripts/run_salome_siman.sh
@@ -54,19 +54,56 @@ if [ -e $castem_env_script ] ; then
 fi
 
 echo "CASTEM_ROOT_DIR = " $CASTEM_ROOT_DIR 
+echo
+
+eficas_aster_env_script=${SALOME_ROOT_DIR}/eficas_aster_env_products.sh
+
+if [ -e $eficas_aster_env_script ] ; then
+    echo 
+    echo ">>> Setting EFICAS & ASTER environment" 
+    echo ">>> Environment script = " $eficas_aster_env_script
+    . $eficas_aster_env_script 
+    else
+    echo 
+    echo '!!! Warning !!! EFICAS & ASTER Environment is not set.' 
+    echo 'No environment file (eficas_aster_env_products.sh) is found.' 
+    echo 'Proceed with the current environment.' 
+fi
+
+echo "EFICAS_ROOT_DIR = " $EFICAS_ROOT_DIR
+echo "ASTER_ROOT_DIR = " $ASTER_ROOT_DIR
+echo
 
+
+syrthes_env_script=${SALOME_ROOT_DIR}/syrthes_env_products.sh
+
+if [ -e $syrthes_env_script ] ; then
+    echo 
+    echo ">>> Setting SYRTHES environment" 
+    echo ">>> Environment script = " $syrthes_env_script
+    . $syrthes_env_script
+    else
+    echo 
+    echo '!!! Warning !!! SYRTHES Environment is not set.' 
+    echo 'No environment file (syrthes_env_products.sh) is found.' 
+    echo 'Proceed with the current environment.' 
+fi
+
+echo "SYRTHES_ROOT_DIR = " $SYRTHES_ROOT_DIR
 echo
+
 echo ">>> Setting SALOME-SIMAN environment" 
 
 export WSFCPP_HOME=${SALOME_ROOT_DIR}/wso2-wsf-cpp-2.1.0
 export LD_LIBRARY_PATH=${WSFCPP_HOME}/lib:${LD_LIBRARY_PATH}
 echo "WSFCPP_HOME = " ${WSFCPP_HOME} 
+rm -f ${WSFCPP_HOME}/logs/SimanSalomeService.log
 
 export SIMANIO_ROOT_DIR=${SALOME_ROOT_DIR}/SIMANIO
-export PATH=${SIMANIO_ROOT_DIR}/lib:${PATH}
+#export PATH=${SIMANIO_ROOT_DIR}/lib:${PATH}
 export LD_LIBRARY_PATH=${SIMANIO_ROOT_DIR}/lib:${LD_LIBRARY_PATH}
 
-export SIMAN_WS_HOST="172.22.0.102:8080"
+export SIMAN_WS_HOST="172.22.0.100:8080"
 echo "SIMAN_WS_HOST = ${SIMAN_WS_HOST}"
 
 export SimanSalome_DIR="/tmp/SimanSalome/${1##*=}/${2##*=}/${3##*=}/"
@@ -86,8 +123,8 @@ echo "display = " ${DISPLAY}
 echo
 echo ">>> SALOME-SIMAN running"
 
-#modules="KERNEL,GEOM,MED,SMESH,VISU,PARAVIS,YACS,CASTEM"
-modules="KERNEL,GEOM,MED,SMESH,CASTEM,VISU,YACS"
+#modules="KERNEL,GEOM,MED,SMESH,VISU,YACS,CASTEM"
+modules="KERNEL,GEOM,MED,SMESH,VISU,YACS,YACSGEN,EFICAS,ASTER,SYRTHES"
 
 export NOT_INTERCEPT_SIGNALS=1
 
@@ -100,10 +137,8 @@ if [[ $rc != 0 ]] ; then
     exit $rc
 fi
 
+cd ${SALOME_ROOT_DIR}
 rm -rf "/tmp/SimanSalome/${1##*=}/${2##*=}"
-rm -rf ${SalomeWorking_DIR}
 
-echo
-cd -
 echo
 echo = = = = =