From: inv <inv@opencascade.com>
Date: Tue, 3 Apr 2012 16:35:26 +0000 (+0000)
Subject: SALOME 6.5.0 preparation: update script for expat (2.0.1)
X-Git-Tag: V6_5_0b1~52
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=77b0941c6a23d3d3a7645703351eec552887366a;p=tools%2Finstall.git

SALOME 6.5.0 preparation: update script for expat (2.0.1)
---

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index 8f73384..4ecc4fc 100755
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -597,7 +597,7 @@
                     version="2.0.1" 
 		    disable="false"
 		    installdiskspace="880,2480,5412"
-		    script="expat-2.0.1.sh"/>
+		    script="expat.sh"/>
     </product>
     <product name="Graphviz"
 	     type="prerequisite"
diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml
index 3469135..e7e964a 100755
--- a/config_Debian_4.0.xml
+++ b/config_Debian_4.0.xml
@@ -597,7 +597,7 @@
                     version="2.0.1" 
 		    disable="false"
 		    installdiskspace="880,2480,5412"
-		    script="expat-2.0.1.sh"/>
+		    script="expat.sh"/>
     </product>
     <product name="Graphviz"
 	     type="prerequisite"
diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index 9b66199..84e99c4 100755
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -597,7 +597,7 @@
                     version="2.0.1" 
 		    disable="false"
 		    installdiskspace="880,2480,5412"
-		    script="expat-2.0.1.sh"/>
+		    script="expat.sh"/>
     </product>
     <product name="Graphviz"
 	     type="prerequisite"
diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml
index 3a32254..33b39ab 100755
--- a/config_Debian_5.0_64bit.xml
+++ b/config_Debian_5.0_64bit.xml
@@ -597,7 +597,7 @@
                     version="2.0.1" 
 		    disable="false"
 		    installdiskspace="880,2480,5412"
-		    script="expat-2.0.1.sh"/>
+		    script="expat.sh"/>
     </product>
     <product name="Graphviz"
 	     type="prerequisite"
diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index 9c061d4..d4cf98b 100755
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -597,7 +597,7 @@
                     version="2.0.1" 
 		    disable="false"
 		    installdiskspace="880,2480,5412"
-		    script="expat-2.0.1.sh"/>
+		    script="expat.sh"/>
     </product>
     <product name="Graphviz"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index de0bfc3..b5ccc81 100755
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -597,7 +597,7 @@
                     version="2.0.1" 
 		    disable="false"
 		    installdiskspace="880,2480,5412"
-		    script="expat-2.0.1.sh"/>
+		    script="expat.sh"/>
     </product>
     <product name="Graphviz"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml
index 77f76be..1a752ba 100755
--- a/config_Mandriva_2008.0_64bit.xml
+++ b/config_Mandriva_2008.0_64bit.xml
@@ -597,7 +597,7 @@
                     version="2.0.1" 
 		    disable="false"
 		    installdiskspace="880,2480,5412"
-		    script="expat-2.0.1.sh"/>
+		    script="expat.sh"/>
     </product>
     <product name="Graphviz"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index 541b274..9fd953b 100755
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -597,7 +597,7 @@
                     version="2.0.1" 
 		    disable="false"
 		    installdiskspace="880,2480,5412"
-		    script="expat-2.0.1.sh"/>
+		    script="expat.sh"/>
     </product>
     <product name="Graphviz"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index cc4ea4e..942364c 100755
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -597,7 +597,7 @@
                     version="2.0.1" 
 		    disable="false"
 		    installdiskspace="880,2480,5412"
-		    script="expat-2.0.1.sh"/>
+		    script="expat.sh"/>
     </product>
     <product name="Graphviz"
 	     type="prerequisite"
diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml
index 78ce7b5..485c03a 100755
--- a/config_Red_Hat_Enterprise_WS_4_64bit.xml
+++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml
@@ -597,7 +597,7 @@
                     version="2.0.1" 
 		    disable="false"
 		    installdiskspace="880,2480,5412"
-		    script="expat-2.0.1.sh"/>
+		    script="expat.sh"/>
     </product>
     <product name="Graphviz"
 	     type="prerequisite"
diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml
index 117ee38..bc62a52 100755
--- a/config_Scientific_SL_5.1_64bit.xml
+++ b/config_Scientific_SL_5.1_64bit.xml
@@ -597,7 +597,7 @@
                     version="2.0.1" 
 		    disable="false"
 		    installdiskspace="880,2480,5412"
-		    script="expat-2.0.1.sh"/>
+		    script="expat.sh"/>
     </product>
     <product name="Graphviz"
 	     type="prerequisite"
diff --git a/config_files/expat-2.0.1.sh b/config_files/expat-2.0.1.sh
deleted file mode 100755
index 49a4019..0000000
--- a/config_files/expat-2.0.1.sh
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : expat-2.0.1.sh
-#  Created   : Thu Dec 18 12:01:00 2002
-#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
-#  Project   : SALOME
-#  Module    : Installation Wizard
-#  Copyright : 2002-2008 CEA
-#
-#  This script is the part of the SALOME installation procedure.
-#
-####################################################################################
-
-#
-# expat version
-#
-EXPAT_VERSION=2.0.1
-
-check_version(){
-# It is not necessary to check version!
-return 0
-}
-
-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}
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-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
-# nothing to do
-##
-EOF
-(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-return $?
-}
-
-install_source()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
-
-# unpack
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_source_and_build()
-{
-# install sources
-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
-EOF
-check_job ${PRODUCT_DIR}/MAKE.LOG make
-check_job ${PRODUCT_DIR}/MAKE.LOG make install
-
-cd ${PRODUCT_DIR}
-
-# remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
-    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
-fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_binary()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-# create a product directory
-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 `find $ldir -name "*.la"`; do
-sed -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" $l > $l"_"
-chmod -f --reference=$l $l"_" ; mv -f $l"_" $l
-done
-
-# to generate environment script for sources
-try_preinstalled
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INST_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-export PRODUCT_TYPE=$6;
-export INSTALL_PRODUCTS=$7;
-shift
-REMOVE_SRC_TMP=$8;
-test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="expat-${EXPAT_VERSION}"
-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 
diff --git a/config_files/expat.sh b/config_files/expat.sh
new file mode 100755
index 0000000..d9c81d2
--- /dev/null
+++ b/config_files/expat.sh
@@ -0,0 +1,139 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : expat.sh
+#  Created   : Thu Dec 18 12:01:00 2002
+#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
+#  Project   : SALOME
+#  Module    : Installation Wizard
+#  Copyright : 2002-2012 CEA
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+#
+# expat version
+#
+EXPAT_VERSION=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
+        return 0
+    fi
+fi
+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}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+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
+# nothing to do
+##
+EOF
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+return $?
+}
+
+install_source()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+source ${INSTALL_WORK}/$SHRC
+
+# unpack
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_source_and_build()
+{
+# install sources
+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
+EOF
+check_job ${PRODUCT_DIR}/MAKE.LOG make
+check_job ${PRODUCT_DIR}/MAKE.LOG make install
+
+cd ${PRODUCT_DIR}
+
+# remove sources and temporary files after building
+if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
+fi
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_binary()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+# create a product directory
+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
+done
+
+# to generate environment script for sources
+try_preinstalled
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INST_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+export PRODUCT_TYPE=$6;
+export INSTALL_PRODUCTS=$7;
+shift
+REMOVE_SRC_TMP=$8;
+test $# == 10 && shift && SINGLE_DIR=$9
+export PRODUCT="expat-${EXPAT_VERSION}"
+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