Patch for the new version of the OCCT.

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

diff --git a/config_files/expat.sh b/config_files/expat.sh
index c661ae0741939d22e3f3a32b0a50a9817b765870..a5c7f98585307064ed31b09331a6c3a57ebc8ddf 100755 (executable)
--- a/config_files/expat.sh
+++ b/config_files/expat.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-2014 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
@@ -15,15 +15,15 @@
 #
 # expat version
 #
-EXPAT_VERSION=2.0.1
+VERSION_EXPAT=2.0.1
 
 check_version(){
-if [ "$EXPAT_ROOT" != "" ] && [ -f ${EXPAT_ROOT}/include/expat.h ] ; then
-    ver_major=`grep "#define XML_MAJOR_VERSION" ${EXPAT_ROOT}/include/expat.h | awk '{print $3}'`
-    ver_minor=`grep "#define XML_MINOR_VERSION" ${EXPAT_ROOT}/include/expat.h | awk '{print $3}'`
-    ver_maint=`grep "#define XML_MICRO_VERSION" ${EXPAT_ROOT}/include/expat.h | awk '{print $3}'`
-    ver="$ver_major.$ver_minor.$ver_maint"
-    if [ "$ver" == "${EXPAT_VERSION}" ] ; then
+if [ "${EXPAT_ROOT_DIR}" != "" ] && [ -f ${EXPAT_ROOT_DIR}/include/expat.h ] ; then
+    ver_major=`grep "#define XML_MAJOR_VERSION" ${EXPAT_ROOT_DIR}/include/expat.h | awk '{print $3}'`
+    ver_minor=`grep "#define XML_MINOR_VERSION" ${EXPAT_ROOT_DIR}/include/expat.h | awk '{print $3}'`
+    ver_maint=`grep "#define XML_MICRO_VERSION" ${EXPAT_ROOT_DIR}/include/expat.h | awk '{print $3}'`
+    ver="${ver_major}.${ver_minor}.${ver_maint}"
+    if [ "${ver}" = "${VERSION_EXPAT}" ] ; then
         return 0
     fi
 fi
@@ -32,10 +32,10 @@ return 1
 
 print_env_bin(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export EXPAT_ROOT=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PATH=\${EXPAT_ROOT}/bin:\${PATH}
-export LD_LIBRARY_PATH=\${EXPAT_ROOT}/lib:\${LD_LIBRARY_PATH}
+#${DELIM} ${PRODUCT_TYPE} ${DELIM}
+export EXPAT_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PATH=\${EXPAT_ROOT_DIR}/bin:\${PATH}
+export LD_LIBRARY_PATH=\${EXPAT_ROOT_DIR}/lib:\${LD_LIBRARY_PATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -45,7 +45,7 @@ make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}
 print_env_src()
 {
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
+#${DELIM} ${PRODUCT_TYPE}_src ${DELIM}
 # nothing to do
 ##
 EOF
@@ -62,11 +62,15 @@ return $?
 install_source()
 {
 make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
+source ${INSTALL_WORK}/${SHRC}
 
 # unpack
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
 
+if [ "${SALOME_IW_COMPSIZE}" = "1" ] ; then
+    du -sk ${PRODUCT_SRC_DIR} > ${INST_ROOT}/${PRODUCT_TYPE}.src.size
+fi
+
 # to generate environment scripts
 try_preinstalled
 }
@@ -79,20 +83,28 @@ install_source
 # build sources
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-# install
 cd ${PRODUCT_SRC_DIR}
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix=${PRODUCT_DIR}
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=$GCC
+
+# install
+local CONFIGURE_OPTIONS="--prefix=${PRODUCT_DIR}"
+cat > ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF
+-------------------
+Used options: ${CONFIGURE_OPTIONS}
+-------------------
 EOF
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure ${CONFIGURE_OPTIONS}
 check_job ${PRODUCT_DIR}/MAKE.LOG make
 check_job ${PRODUCT_DIR}/MAKE.LOG make install
 
 cd ${PRODUCT_DIR}
 
+if [ "${SALOME_IW_COMPSIZE}" = "1" ] ; then
+    du -sk ${PRODUCT_SRC_DIR} > ${INST_ROOT}/${PRODUCT_TYPE}.build.size
+    du -sk ${PRODUCT_DIR}     > ${INST_ROOT}/${PRODUCT_TYPE}.bin.size
+fi
+
 # remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+if [ ${REMOVE_SRC_TMP} = "TRUE" ] ; then
     test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
 fi
 
@@ -103,7 +115,7 @@ try_preinstalled
 install_binary()
 {
 make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
+source ${INSTALL_WORK}/${SHRC}
 
 # create a product directory
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
@@ -111,10 +123,9 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 
 # modify libdir
-cd ${PRODUCT_DIR}/lib
-for l in XXX `find $ldir -name "*.la"`; do
-    if [ "$l" == "XXX" ] ; then continue; fi
-    sed -i "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" $l
+for l in XXX `find ${PRODUCT_DIR}/lib -name "*.la"`; do
+    if [ "${l}" = "XXX" ] ; then continue; fi
+    sed -i "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" ${l}
 done
 
 # to generate environment script for sources
@@ -130,10 +141,10 @@ export PRODUCT_TYPE=$6;
 export INSTALL_PRODUCTS=$7;
 shift
 REMOVE_SRC_TMP=$8;
-test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="expat-${EXPAT_VERSION}"
+test $# = 10 && shift && SINGLE_DIR=$9
+export PRODUCT="expat-${VERSION_EXPAT}"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
 source ./common.sh
-$PROCEDURE 
+${PROCEDURE}