X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=env.sh;h=5c91e088f15d7988f71d5162d5f10bce376d2711;hb=d1db2c977f2344e4b9c7292a3f7ace0b71d4aefb;hp=ab13dd393f00b5fb2ab37f0d2cae70c79df7ea19;hpb=c3ae28ba30027cc4a6a757ef623f40adaae96ead;p=modules%2Fshaper.git

diff --git a/env.sh b/env.sh
index ab13dd393..5c91e088f 100644
--- a/env.sh
+++ b/env.sh
@@ -1,23 +1,24 @@
 #!/bin/bash -x
 
+export SALOME_DIR=/dn46/SALOME/series9x/current-2020-04-10
+
 # Path to sources
 export SOURCES_DIR=$(pwd)
 # Path to build directory
-export BUILD_DIR=$(cd .. && pwd)/build
+export BUILD_DIR=$(cd ${SOURCES_DIR}/.. && pwd)/build
 # Path to linux_run.sh & salome_run.sh
 export AUT_DIR=$(pwd)
 
 # Path to env_*.sh files
 export TOOLS_DIR=$(pwd)
 
-# Extracts INST_ROOT directory for SALOME
-if [[ ! -f env_config.sh ]]; then
-  echo "Can not find env_config.sh. Please, run config.sh."
-  exit 1
-fi
-source env_config.sh
+source ${SALOME_DIR}/start.sh
+
+# Path to special products dir (lcov, cpplint)
+export SHAPER_PDIR=/dn48/newgeom/common/products
 
-# Path to solvespace-2
-export NEWGEOM_PDIR=/dn48/newgeom/common/products
 # Path to install directory
-export NEWGEOM_ROOT_DIR=$(cd .. && pwd)/install
+export SHAPER_ROOT_DIR=$(cd ${SOURCES_DIR}/.. && pwd)/install
+
+source ${TOOLS_DIR}/env_linux.sh
+source ${TOOLS_DIR}/env_salome.sh