X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=make.sh;h=2ebe12011854c06aad3b33df2221ef0d973cc436;hb=812073961e85e752c543f871b7f47c979bf1427c;hp=0909eb96051617b7e436d68a8b55d0e0897633f0;hpb=15b23d4334159675ad65e41022667dafc857839e;p=modules%2Fshaper.git

diff --git a/make.sh b/make.sh
index 0909eb960..2ebe12011 100755
--- a/make.sh
+++ b/make.sh
@@ -1,22 +1,46 @@
 #!/bin/bash
 
 source env.sh
-source env_standalone.sh
 
-CMAKE_ARGS=""
-if [ -f GCOV ]; then 
-  echo "Use GCOV..."
-  source env_lcov.sh
-  CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_BUILD_TYPE=Debug"
-  CMAKE_ARGS="${CMAKE_ARGS} -DUSE_TEST_COVERAGE=ON"
+while [[ $# > 0 ]]; do
+  key="$1"
+
+  case $key in
+    debug|Debug)
+      BUILD_TYPE=Debug
+      shift
+      ;;
+    lcov|coverage)
+      BUILD_TYPE=Debug
+      USE_TEST_COVERAGE=ON
+      shift
+      ;;
+    standalone|Standalone)
+      MODE=Standalone
+      shift
+      ;;
+    *)
+      shift
+      ;;
+  esac
+done
+
+if [[ ${MODE} = 'Standalone' ]]; then
+  source ${TOOLS_DIR}/env_standalone.sh
 else
-  CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_BUILD_TYPE=Release"
+  source ${TOOLS_DIR}/env_salome.sh
 fi
-CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_DIR}"
+
+CMAKE_ARGS=""
+CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_BUILD_TYPE=${BUILD_TYPE:-Release}"
+CMAKE_ARGS="${CMAKE_ARGS} -DUSE_TEST_COVERAGE=${USE_TEST_COVERAGE:-OFF}"
+CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=${SHAPER_ROOT_DIR}"
 CMAKE_ARGS="${CMAKE_ARGS} ${SOURCES_DIR}"
 
 mkdir -p ${BUILD_DIR}
 cd ${BUILD_DIR}
 
+set -e
+
 cmake -G "Unix Makefiles" ${CMAKE_ARGS}
 make -j$(nproc) install