X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=make.sh;h=49d78c1f49a41d9d2aec9bc930821cf47f23b364;hb=a47af7109078eea1a585d1f10a176f16ab838b87;hp=258cc11919584e96d119ada589f6a97c3082eec8;hpb=9e8a4cc168dbbe467cbdd4c6db6439a5d7fca409;p=modules%2Fshaper.git

diff --git a/make.sh b/make.sh
index 258cc1191..49d78c1f4 100755
--- a/make.sh
+++ b/make.sh
@@ -1,27 +1,58 @@
 #!/bin/bash
 
-# Find absolute path to ROOT_DIR
-export ROOT_DIR=$(pwd)/..
-export ROOT_DIR=`cd "${ROOT_DIR}";pwd`
+while [[ $# > 0 ]]; do
+  key="$1"
 
-SRC_DIR=${ROOT_DIR}/sources
+  case $key in
+    debug|Debug)
+      BUILD_TYPE=Debug
+      shift
+      ;;
+    lcov|coverage)
+      BUILD_TYPE=Debug
+      USE_TEST_COVERAGE=ON
+      shift
+      ;;
+    models|test-models)
+      ADD_MODELS_TESTS=TRUE
+      shift
+      ;;
+    compatibility|test-compatibility)
+      ADD_COMPATIBILITY_TESTS=TRUE
+      shift
+      ;;
+    hdf|test-hdf-models)
+      ADD_HDF_TESTS=TRUE
+      shift
+      ;;
+    *)
+      shift
+      ;;
+  esac
+done
 
-BUILD_DIR=build
-INSTALL_DIR=install
-if [ $1 ]; then
-  BUILD_DIR=${BUILD_DIR}-$1
-  INSTALL_DIR=${INSTALL_DIR}-$1
+## Preserve PTHONPATH in order to avoid problems with Sphinx on Fedora26 because of Pigments in ParaView
+export PYTHONPATH_OLD=$PYTHONPATH
+source env.sh
+
+if [[ ${OS_NAME} = Fedora26-64 ]]
+then
+  export PYTHONPATH=$PYTHONPATH_OLD
 fi
 
-source ${SRC_DIR}/salome_env.sh
-source ${SRC_DIR}/linux_env.sh $1
-mkdir -p ${ROOT_DIR}/${BUILD_DIR}
-cd ${ROOT_DIR}/${BUILD_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} -DADD_MODELS_TESTS=${ADD_MODELS_TESTS:-FALSE}"
+CMAKE_ARGS="${CMAKE_ARGS} -DADD_COMPATIBILITY_TESTS=${ADD_COMPATIBILITY_TESTS:-FALSE}"
+CMAKE_ARGS="${CMAKE_ARGS} -DADD_HDF_TESTS=${ADD_HDF_TESTS:-FALSE}"
+CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=${SHAPER_ROOT_DIR}"
+CMAKE_ARGS="${CMAKE_ARGS} ${SOURCES_DIR}"
+
+mkdir -p ${BUILD_DIR}
+cd ${BUILD_DIR}
 
-CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_BUILD_TYPE=Release"
-CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=${ROOT_DIR}/${INSTALL_DIR}"
-CMAKE_ARGS="${CMAKE_ARGS} ${SRC_DIR}"
+set -e
 
 cmake -G "Unix Makefiles" ${CMAKE_ARGS}
-make -j4
-make install
+make -j$(nproc) install