X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=env.sh;h=08ecb872d0ac7b3595edc9814f33e5aaa8f54265;hb=ba28103ef01acacf3347102421628e45175cc05d;hp=15f52740115ba542cf601fcfba4eeb6e83954dd8;hpb=d31b2834853f65576fceedcb8dd2ee8fd94d65a0;p=modules%2Fshaper.git

diff --git a/env.sh b/env.sh
index 15f527401..08ecb872d 100644
--- a/env.sh
+++ b/env.sh
@@ -1,23 +1,24 @@
 #!/bin/bash -x
 
+export SALOME_DIR=/dn46/SALOME/series9x/current-2019-03-20
+
 # 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 solvespace-2
+# Path to special products dir (lcov, cpplint)
 export SHAPER_PDIR=/dn48/newgeom/common/products
+
 # Path to install directory
-export SHAPER_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