From: spo <sergey.pokhodenko@opencascade.com>
Date: Mon, 16 Nov 2015 08:19:10 +0000 (+0300)
Subject: Use SALOME V7.7.0
X-Git-Tag: V_2.0.0_alfa2~11
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4fc1651c185a906f2fc5cbbe9264d332e9bf66b8;p=modules%2Fshaper.git

Use SALOME V7.7.0
---

diff --git a/config.sh b/config.sh
index cf1ae4a91..baf296275 100755
--- a/config.sh
+++ b/config.sh
@@ -22,8 +22,8 @@ fi
 
 echo "export PLATFORM=${PLATFORM}" >> env_config.sh
 
-main() {
-  local salome_version='7.6.0'
+include_salome() {
+  local salome_version=$1
   local platform="$(lsb_release -is)"
   local release="$(lsb_release -rs)"
   if [[ ${salome_version} = '7.5.1' ]]; then
@@ -34,12 +34,16 @@ main() {
   elif [[ ${salome_version} = '7.6.0' ]]; then
     if   [[ "${platform}" = 'CentOS' ]]; then export INST_ROOT=/dn23/NEWGEOM/common/SALOME-7.6.0_CentOS-6.3_SOURCES
     elif [[ "${platform}" = 'Debian' && ${release} =~ ^6 ]]; then export INST_ROOT=/dn23/NEWGEOM/common/SALOME-7.6.0_Debian-6.0_SOURCES
-    else 
-      echo "Could not find SALOME for the platform ${platform} ${release}"
-      exit 1
     fi
+  elif [[ ${salome_version} = '7.7.0' ]]; then
+    if   [[ "${platform}" = 'CentOS' ]]; then export INST_ROOT=/dn23/NEWGEOM/common/SALOME-7.7.0_CentOS63-64
+    elif [[ "${platform}" = 'Debian' && ${release} =~ ^6 ]]; then export INST_ROOT=/dn23/NEWGEOM/common/SALOME-7.7.0_Debian60-64
+    fi
+  else 
+    echo "Could not find SALOME for the platform ${platform} ${release}"
+    exit 1
   fi
 }
-main
+include_salome '7.7.0'
 echo "export INST_ROOT=${INST_ROOT}" >> env_config.sh
 
diff --git a/env_linux.sh b/env_linux.sh
index 379bdd24c..fa701589b 100644
--- a/env_linux.sh
+++ b/env_linux.sh
@@ -15,7 +15,8 @@ for path in INST_ROOT NEWGEOM_PDIR NEWGEOM_ROOT_DIR; do
 done
 
 set +u
-source ${INST_ROOT}/env_products.sh
+echo "Source ${INST_ROOT}/$(cd ${INST_ROOT} && ls *env_products.sh)"
+source ${INST_ROOT}/$(cd ${INST_ROOT} && ls *env_products.sh)
 set -u
 
 #------ SolveSpace ------
diff --git a/env_salome.sh b/env_salome.sh
index e4898ba70..7aa4b6992 100644
--- a/env_salome.sh
+++ b/env_salome.sh
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+for path in TOOLS_DIR; do
+  if [[ -z "${!path}" ]]; then
+    echo "${path} not found."; exit 1
+  else
+    echo "Found ${path}: ${!path}"
+  fi
+done
+
 source ${TOOLS_DIR}/env_linux.sh
 
 # Correcting path which defined with error
diff --git a/make.sh b/make.sh
index 725d131dc..fd684dce0 100755
--- a/make.sh
+++ b/make.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 source env.sh
-source ${TOOLS_DIR}/env_standalone.sh
+source ${TOOLS_DIR}/env_salome.sh
 
 CMAKE_ARGS=""
 if [ -f GCOV ]; then