From 612ed30a391d489d3124d7342dfc3e3da18f436a Mon Sep 17 00:00:00 2001 From: bri Date: Mon, 10 Feb 2014 18:15:41 +0400 Subject: [PATCH] SALOME_V7_siman scripts are updated --- scripts/README | 47 +++++++++++++++++++++---------------- scripts/env_siman.sh | 10 ++++---- scripts/run_salome_siman.sh | 7 +++--- 3 files changed, 34 insertions(+), 30 deletions(-) diff --git a/scripts/README b/scripts/README index 979b32b..70a4f09 100644 --- a/scripts/README +++ b/scripts/README @@ -1,30 +1,37 @@ -How prepare runnable SALOME-SIMAN code +How to get and build SALOME-SIMAN code -1. Use standard SALOME 6.5.0 disctibutive for installation. +1. Take SALOME-SIMAN code from CVS repository for SIMAN +and the following modules "KERNEL GUI GEOM MED SMESH PYHELLO" like this -2. Take from CVS SALOME-SIMAN code for branch "BR_siman_phase1" based on SALOME 6.5.0 +cvs -d :pserver:@cvs.opencascade.com:/home/server/cvs/SIMAN checkout SIMANIO_SRC +cvs -d :pserver:@cvs.opencascade.com:/home/server/cvs/KERNEL checkout -r KERNEL_SRC +cvs -d :pserver:@cvs.opencascade.com:/home/server/cvs/GUI checkout -r GUI_SRC +cvs -d :pserver:@cvs.opencascade.com:/home/server/cvs/GEOM checkout -r GEOM_SRC +cvs -d :pserver:@cvs.opencascade.com:/home/server/cvs/MED checkout -r MED_SRC +cvs -d :pserver:@cvs.opencascade.com:/home/server/cvs/SMESH checkout -r SMESH_SRC +cvs -d :pserver:@cvs.opencascade.com:/home/server/cvs/EXAMPLES checkout -r PYHELLO1_SRC -Start from SIMAN repository like : -cvs -d :pserver:bri@cvs.opencascade.com:/home/server/cvs/SIMAN checkout SIMANIO_SRC +where is : +"BR_siman_phase1" if you are based on SALOME 6.5.0 +"V7_siman" if you are based on SALOME 7.X -Move the required product wso2-wsf-cpp-2.1.0 and all scripts to SALOME root directory -Adjust the scripts if necessary +2. Copy the required Web Services product wso2-wsf-cpp-2.1.0_.tgz from SIMANIO_SRC to root directory (..) and unpack it : +wso2-wsf-cpp-2.1.0_debian60-64.tgz +wso2-wsf-cpp-2.1.0_mandriva_2010-64.tgz -Take from CVS other modules like it is done in SALOME_CVS_checkout_branch_BR_siman_phase1.sh -"KERNEL GUI GEOM MED SMESH VISU PARAVIS YACS NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN PYHELLO" +3. Copy the required scripts from SIMANIO_SRC/scripts directory to root directory (../..) and adjust them as necessary +This README files is also delivered in SIMANIO_SRC/scripts directory -3. Build all modules starting from SIMANIO_SRC using the scripts +4. Build SIMANIO_SRC using these scripts as following : +source env_siman.sh +./siman_build.sh -4. Check runnability of Salome +5. Build all other modules in usual manner -5. Define (export) the environment variable SALOME_ROOT_DIR pointing to the directory there SALOME and scripts are build. -in .bashrc file - -6. If necessary run SIMAN application servers -/usr/share/tomcat6/bin/startup.sh -to stop use -/usr/share/tomcat6/bin/shutdown.sh - -In the file env_siman.sh adjust SIMAN_WS_HOST variable to point to SIMAN application server +Note: additionally the following SALOME modules (not impacted with SIMAN changes) should be also build +"VISU PARAVIS YACS NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN" +6. Check runnability of SALOME in two modes - without and with SIMAN : +runSalome +runSalome --siman diff --git a/scripts/env_siman.sh b/scripts/env_siman.sh index d1458a4..eb23bae 100644 --- a/scripts/env_siman.sh +++ b/scripts/env_siman.sh @@ -3,7 +3,9 @@ #echo dir1 = `dirname $0` #echo dir2 = ${PWD} -env_script=${PWD}/env_products.sh +#env_script=${PWD}/env_products.sh +env_script=/dn40/PRODUCTS/salome/6.x/opt/MANDRIVA.2010.64/6.6.0/env_products.sh + if [ -e $env_script ] ; then echo echo ">>> Setting environment" @@ -16,7 +18,7 @@ if [ -e $env_script ] ; then echo 'Proceed with the current environment.' fi - echo ">>> Setting SALOME_SIMAN environment" + echo ">>> Setting SALOME-SIMAN environment" export WSFCPP_HOME=${PWD}/wso2-wsf-cpp-2.1.0 #export PATH=${WSFCPP_HOME}/lib:${PATH} @@ -27,7 +29,3 @@ export SIMANIO_ROOT_DIR=${PWD}/SIMANIO #export PATH=${SIMANIO_ROOT_DIR}/lib:${PATH} export LD_LIBRARY_PATH=${SIMANIO_ROOT_DIR}/lib:${LD_LIBRARY_PATH} -export SIMAN_WS_HOST="172.22.2.10:8080" - -#export SALOME_ROOT_DIR=${PWD} - diff --git a/scripts/run_salome_siman.sh b/scripts/run_salome_siman.sh index 84b31d5..ee0eb28 100644 --- a/scripts/run_salome_siman.sh +++ b/scripts/run_salome_siman.sh @@ -17,7 +17,8 @@ fi echo "pwd = " ${PWD} >> check_params.txt echo "display = " ${DISPLAY} >> check_params.txt -env_script=${PWD}/env_products.sh +#env_script=${PWD}/env_products.sh +env_script=/dn40/PRODUCTS/salome/6.x/opt/MANDRIVA.2010.64/6.6.0/env_products.sh echo script = $env_script if [ -e $env_script ] ; then @@ -44,9 +45,7 @@ export SIMANIO_ROOT_DIR=${PWD}/SIMANIO export PATH=${SIMANIO_ROOT_DIR}/lib:${PATH} export LD_LIBRARY_PATH=${SIMANIO_ROOT_DIR}/lib:${LD_LIBRARY_PATH} -export SIMAN_WS_HOST="127.0.0.1:8080" - -#export PYTHONPATH="/tmp/SimanSalome/${1##*=}/${2##*=}/${3##*=}":${PYTHONPATH} +export SIMAN_WS_HOST="172.22.2.65:8080" echo "parameters 3: $1 $2 $3" >> check_params.txt -- 2.39.2