X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=env.sh;h=f3aa50d1ce92e8f891baa1726cb61734d2fc0120;hb=b0196aeefbaa53754b1052fab904386707caad87;hp=67da8f7580fc39018bb7b1280a656ec3f500b230;hpb=438157bbee75d04c3737ec50ce1953e9fde8607a;p=modules%2Fshaper.git

diff --git a/env.sh b/env.sh
index 67da8f758..f3aa50d1c 100644
--- a/env.sh
+++ b/env.sh
@@ -1,16 +1,25 @@
 #!/bin/bash -x
 
-set -o nounset
+export SALOME_DIR=/dn46/SALOME/series9x/current-2018-09-28
 
-if [[ ! -f env_config.sh ]]; then
-  echo "Can not find env_config.sh. Please, run config.sh."
-  exit 1
-fi
-source env_config.sh
 
-export ROOT_DIR=$(cd $(dirname $0)/.. && pwd)
-export SOURCES_DIR=${ROOT_DIR}/sources
-export BUILD_DIR=${ROOT_DIR}/build${PLATFORM}
-export INSTALL_DIR=${ROOT_DIR}/install${PLATFORM}
+# Path to sources
+export SOURCES_DIR=$(pwd)
+# Path to build directory
+export BUILD_DIR=$(cd ${SOURCES_DIR}/.. && pwd)/build
+# Path to linux_run.sh & salome_run.sh
+export AUT_DIR=$(pwd)
 
-export NEWGEOM_PDIR=/dn48/newgeom/common/products
+# Path to env_*.sh files
+export TOOLS_DIR=$(pwd)
+
+source ${SALOME_DIR}/start.sh
+
+# Path to special products dir (lcov, cpplint)
+export SHAPER_PDIR=/dn48/newgeom/common/products
+
+# Path to install directory
+export SHAPER_ROOT_DIR=$(cd ${SOURCES_DIR}/.. && pwd)/install
+
+source ${TOOLS_DIR}/env_linux.sh
+source ${TOOLS_DIR}/env_salome.sh