From 9f0727b5e4bb3673869b5b1ae5ccfc1dd614ffa1 Mon Sep 17 00:00:00 2001 From: mpv Date: Wed, 29 Oct 2014 12:42:56 +0300 Subject: [PATCH] Launch of salome in full mode --- linux_env.sh | 12 ++++++------ salome_run.sh | 5 +++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/linux_env.sh b/linux_env.sh index f6bdf5dce..fcbe77b86 100644 --- a/linux_env.sh +++ b/linux_env.sh @@ -35,9 +35,9 @@ export PATH=${CASROOT}:${PATH} ## #------ NewGEOM ------ -export NEW_GEOM_ROOT_DIR=${ROOT_DIR}/install -export PATH=${NEW_GEOM_ROOT_DIR}/bin:${NEW_GEOM_ROOT_DIR}/plugins:${PATH} -export PYTHONPATH=${NEW_GEOM_ROOT_DIR}/swig:${PYTHONPATH} -export LD_LIBRARY_PATH=${NEW_GEOM_ROOT_DIR}/bin:${NEW_GEOM_ROOT_DIR}/swig:${NEW_GEOM_ROOT_DIR}/plugins:${LD_LIBRARY_PATH} -export NEW_GEOM_CONFIG_FILE=${NEW_GEOM_ROOT_DIR}/plugins -export NewGeomResources=${NEW_GEOM_ROOT_DIR}/resources +export NEWGEOM_ROOT_DIR=${ROOT_DIR}/install +export PATH=${NEWGEOM_ROOT_DIR}/bin:${NEWGEOM_ROOT_DIR}/plugins:${PATH} +export PYTHONPATH=${NEWGEOM_ROOT_DIR}/swig:${PYTHONPATH} +export LD_LIBRARY_PATH=${NEWGEOM_ROOT_DIR}/bin:${NEWGEOM_ROOT_DIR}/swig:${NEWGEOM_ROOT_DIR}/plugins:${LD_LIBRARY_PATH} +export NEW_GEOM_CONFIG_FILE=${NEWGEOM_ROOT_DIR}/plugins +export NewGeomResources=${NEWGEOM_ROOT_DIR}/resources diff --git a/salome_run.sh b/salome_run.sh index 5ef39f4ab..78609177a 100755 --- a/salome_run.sh +++ b/salome_run.sh @@ -7,6 +7,7 @@ source ${ROOT_DIR}/sources/linux_env.sh # Correcting path which defined with error export LD_LIBRARY_PATH=${KERNEL_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH} -export LightAppConfig=${ROOT_DIR}/install/share/salome/resources/newgeom:${GUI_ROOT_DIR}/share/salome/resources/gui +export SalomeAppConfig=${ROOT_DIR}/install/share/salome/resources/newgeom:${GUI_ROOT_DIR}/share/salome/resources/gui -SUITApp LightApp --modules=NewGeom \ No newline at end of file +${PYTHONBIN} "${KERNEL_ROOT_DIR}/bin/salome/envSalome.py" +${PYTHONBIN} "${KERNEL_ROOT_DIR}/bin/salome/runSalome.py" -- 2.39.2