Correction for case: create auxiliary cirle, try to create several lines coincident...

[modules/shaper.git] / env_linux.sh

diff --git a/env_linux.sh b/env_linux.sh
index 8f431f67b294b9dd49ab1551bb816f0ee7dd9944..5beff47b467a1e0e9ed4e2ac1a26a76f05fcac9d 100644 (file)
--- a/env_linux.sh
+++ b/env_linux.sh
@@ -2,11 +2,10 @@
 
 # This script uses:
 #
-# INST_ROOT - path of SALOME (env_products.sh)
-# SHAPER_PDIR - path of PRODUCTS for SHAPER (SolveSpace, lcov)
+# SHAPER_PDIR - path of PRODUCTS for SHAPER (SolveSpace, lcov, cpplint)
 # SHAPER_ROOT_DIR - path of SHAPER installation
 
-for path in INST_ROOT SHAPER_PDIR SHAPER_ROOT_DIR; do
+for path in SHAPER_PDIR SHAPER_ROOT_DIR; do
   if [[ -z ${!path+x} ]]; then
     echo "${path} not found."; exit 1
   else
@@ -14,11 +13,6 @@ for path in INST_ROOT SHAPER_PDIR SHAPER_ROOT_DIR; do
   fi
 done
 
-set +u
-echo "Source ${INST_ROOT}/$(cd ${INST_ROOT} && ls *env_products.sh)"
-source ${INST_ROOT}/$(cd ${INST_ROOT} && ls *env_products.sh)
-set -u
-
 #------ SolveSpace ------
 export SOLVESPACE_ROOT_DIR=${SHAPER_PDIR}/solvespace-2.1
 export LD_LIBRARY_PATH=${SOLVESPACE_ROOT_DIR}/lib:${LD_LIBRARY_PATH}
@@ -42,10 +36,15 @@ export LCOV_ROOT_DIR=${SHAPER_PDIR}/lcov-1.11
 export PATH=${LCOV_ROOT_DIR}/bin:${PATH}
 ##
 
+#------ cpplint ------
+export CPPLINT_ROOT_DIR=${SHAPER_PDIR}/cpplint-1.3.0
+export PATH=${CPPLINT_ROOT_DIR}:${PATH}
+##
+
 #------ OCCT ------
 # Defaults
-export CSF_PluginDefaults=${CAS_ROOT_DIR}/src/StdResource
-export CSF_StandardDefaults=${CAS_ROOT_DIR}/src/StdResource
+export CSF_PluginDefaults=${CAS_ROOT_DIR}/share/opencascade/resources/StdResource
+export CSF_StandardDefaults=${CAS_ROOT_DIR}/share/opencascade/resources/StdResource
 # For CMake
 export LIB=${LD_LIBRARY_PATH}
 export PATH=${CASROOT}:${PATH}
@@ -53,5 +52,5 @@ export PATH=${CASROOT}:${PATH}
 
 #------ SHAPER ------
 export PATH=${SHAPER_ROOT_DIR}/bin/salome:${PATH}
-export PYTHONPATH=${SHAPER_ROOT_DIR}/bin/salome:${PYTHONPATH}
+export PYTHONPATH=${SHAPER_ROOT_DIR}/bin/salome:${SHAPER_ROOT_DIR}/lib/python2.7/site-packages/salome:${PYTHONPATH}
 export LD_LIBRARY_PATH=${SHAPER_ROOT_DIR}/lib/salome:${LD_LIBRARY_PATH}