Copyright update

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

diff --git a/config_files/OCCT.sh b/config_files/OCCT.sh
index 9db6ecf6e26e2ccc9880772e686d6b82854a6fde..af652c24cc383c961135f310f128886985ba20ef 100755 (executable)
--- a/config_files/OCCT.sh
+++ b/config_files/OCCT.sh
@@ -6,7 +6,7 @@
 #  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.
 #
@@ -15,7 +15,7 @@
 #
 # Open CASCADE Technology version
 #
-VERSION_OCCT=6.7.0
+VERSION_OCCT=6.8.0
 
 check_version()
 {
@@ -54,6 +54,8 @@ export CSF_MDTVFontDirectory=\${CAS_ROOT_DIR}/src/FontMFT
 export CSF_MDTVTexturesDirectory=\${CAS_ROOT_DIR}/src/Textures 
 # Activation of OCCT Kernel multithreading :
 export MMGT_REENTRANT=1
+# this variable only needed for DRAWEXE
+export CASROOT=\${CAS_ROOT_DIR}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -118,15 +120,11 @@ cd ${PRODUCT_SRC_DIR}
 
 # build_configure
 
-echo " +++++++++++ build_configure"
-
 check_job ${PRODUCT_DIR}/BUILD_CONFIGURE.LOG ./build_configure
 
 # configure
 
-echo " +++++++++++ configure"
-
-flags=""
+flags="--prefix=${PRODUCT_DIR}"
 
 # ... tcl/tk options
 if [ "${TCLHOME}" != "" ] ; then
@@ -157,20 +155,19 @@ fi
 # other options
 flags="${flags} --disable-debug --enable-production"
 
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix=${PRODUCT_DIR} ${flags}
+cat > ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF
+-------------------
+Used options: ${flags}
+-------------------
+EOF
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure ${flags}
 
 # make
 
-echo " +++++++++++ make"
-
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=${GCC}
-EOF
 check_job ${PRODUCT_DIR}/MAKE.LOG make -j4 install
 
 # fix libGL dependencies
-echo " +++++++++++ fix libGL dependencies"
+
 ( cd ${PRODUCT_DIR}/lib && fix_gl_libs )
 
 cd ${PRODUCT_DIR}