Copyright update

[tools/install.git] / config_files / libBatch.sh

diff --git a/config_files/libBatch.sh b/config_files/libBatch.sh
index cbda4ae1bf9f29817d108c5c9341a71b174a12e0..cecbc97106af98a4e709482b930b06d058b1c31d 100755 (executable)
--- a/config_files/libBatch.sh
+++ b/config_files/libBatch.sh
@@ -6,13 +6,13 @@
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2013 CEA
+#  Copyright : 2002-2015 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
 ####################################################################################
 
-LIBBATCH_VERSION=2.1.0
+LIBBATCH_VERSION=2.2.0
 
 check_version(){
 # No way to check version!
@@ -70,13 +70,15 @@ install_source
 cd ${PRODUCT_SRC_DIR}
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG cmake -DCMAKE_INSTALL_PREFIX=${PRODUCT_DIR} 
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=${GCC}
+local CMAKE_OPTIONS="-DCMAKE_INSTALL_PREFIX=${PRODUCT_DIR}"
+cat > ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF
+-------------------
+Used options: ${CMAKE_OPTIONS}
+-------------------
 EOF
-check_job ${PRODUCT_DIR}/MAKE.LOG make
-check_job ${PRODUCT_DIR}/INSTALL.LOG make install
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG cmake ${CMAKE_OPTIONS}
+check_job ${PRODUCT_DIR}/MAKE.LOG make VERBOSE=1
+check_job ${PRODUCT_DIR}/INSTALL.LOG make VERBOSE=1 install
 
 cd ${PRODUCT_DIR};