Replace med 2.2.2 by med 2.2.3

diff --git a/config.xml b/config.xml
index 010a32ba6ade9bbcfc8833d6975da999e1c5b875..eba502d954bdd5de03a01c32f6374a6503b04df1 100644 (file)
--- a/config.xml
+++ b/config.xml
@@ -137,7 +137,7 @@
           temporarydiskspace="46480"
           script="hdf5-1.6.3.sh"/>
   <product name="Med"
-           version="2.2.2" 
+           version="2.2.3" 
            description="MED format interface library"
            install="install binaries"
           supported="install sources,install binaries"
@@ -145,7 +145,7 @@
           dependancies="gcc,Hdf"
           installdiskspace="18844"
           temporarydiskspace="44112"
-          script="med-2.2.2.sh"/>
+          script="med-2.2.3.sh"/>
   <product name="Vtk"
            version="4.2.6" 
            description="Image processing, 3D graphics and visualization software system"

diff --git a/config_Debian_3.1.xml b/config_Debian_3.1.xml
index 301b91a60d01aa2bce20d2cb8f87788728bd9a6c..269aab86c72fee35389197980cd9449f4678b757 100755 (executable)
--- a/config_Debian_3.1.xml
+++ b/config_Debian_3.1.xml
@@ -137,7 +137,7 @@
           temporarydiskspace="46480"
           script="hdf5-1.6.3.sh"/>
   <product name="Med"
-           version="2.2.2" 
+           version="2.2.3" 
            description="MED format interface library"
            install="install binaries"
           supported="install sources,install binaries"
@@ -145,7 +145,7 @@
           dependancies="gcc,Hdf"
           installdiskspace="18844"
           temporarydiskspace="44112"
-          script="med-2.2.2.sh"/>
+          script="med-2.2.3.sh"/>
   <product name="Vtk"
            version="4.2.6" 
            description="Image processing, 3D graphics and visualization software system"

diff --git a/config_Mandriva_2006.0.xml b/config_Mandriva_2006.0.xml
index 6ec15c866e0893d77c03fc715f949e43972d8556..8be98a46bbff90937e117dc32d4e7a746554cf22 100755 (executable)
--- a/config_Mandriva_2006.0.xml
+++ b/config_Mandriva_2006.0.xml
@@ -137,7 +137,7 @@
           temporarydiskspace="47460"
           script="hdf5-1.6.3.sh"/>
   <product name="Med"
-           version="2.2.2" 
+           version="2.2.3" 
            description="MED format interface library"
            install="install binaries"
           supported="install sources,install binaries"
@@ -145,7 +145,7 @@
           dependancies="gcc,Hdf"
           installdiskspace="7470"
           temporarydiskspace="19052"
-          script="med-2.2.2.sh"/>
+          script="med-2.2.3.sh"/>
   <product name="Vtk"
            version="4.2.6" 
            description="Image processing, 3D graphics and visualization software system"

diff --git a/config_files/med-2.2.2.sh b/config_files/med-2.2.2.sh
deleted file mode 100755 (executable)
index 681619d..0000000
--- a/config_files/med-2.2.2.sh
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/bin/sh
-
-check_version()
-{
-if [ -z "$MED2HOME" ]; then
-   #echo "MED2HOME doesn't set"
-   return 1
-fi
-check_lib_version libmed.so.1.0.1 ${MED2HOME}/lib
-if [ "$?" -eq "0" ]; then
-   #echo "The product ${PRODUCT} has been already installed on yours system"
-   return 0
-fi
-return 1
-}
-
-print_env()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export MED2HOME=\${INSTALL_ROOT}/med-2.2.2
-export PATH=\${MED2HOME}/bin:\${PATH}
-export LD_LIBRARY_PATH=\${MED2HOME}/lib:\${LD_LIBRARY_PATH}
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
-}
-
-# looks for the native product and collects it's environment (used by make_env())
-try_native(){
-check_version
-if [ $? -eq 0 ] ; then
-    tmp="\${MED2HOME}/bin ${MED2HOME}/bin \${PATH} ${PATH}";  
-    path=`sort_path ${tmp}`
-    tmp="\${MED2HOME}/lib ${MED2HOME}/lib \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";  
-    ld_library_path=`sort_path ${tmp}`
-    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export MED2HOME=${MED2HOME}
-export PATH=${path}
-export LD_LIBRARY_PATH=${ld_library_path}
-##
-EOF
-    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
-    return 0
-fi
-return 1;
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
-return $?
-}
-
-install_source()
-{
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-check_jb tar xfz ${SOURCE_DIR}/med_fichier2.2.2.src.tar.gz -C ${INSTALL_WORK}
-
-cd ${PRODUCT_WORK}
-makedir ${PRODUCT_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}/INSTALL.LOG make install
-
-#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
-cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK}
-
-### modify libmed.la libmedC.la files to correct direct path to hdf5 library
-cd ${PRODUCT_DIR}/lib
-sed -e 's%\(.*\)\([[:space:]].*libhdf5.la\)\(.*\)%\1 -lhdf5\3%g' libmed.la > libmed.la.new
-mv -f libmed.la.new libmed.la
-sed -e 's%\(.*\)\([[:space:]].*libhdf5.la\)\(.*\)%\1 -lhdf5\3%g' libmedC.la > libmedC.la.new
-mv -f libmedC.la.new libmedC.la
-tmp=""
-if [ -n "${HDF5HOME}" ]; then
-    tmp="-L${HDF5HOME}/lib"
-fi
-sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.6\.3/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmed.la > libmed.la.new
-mv -f libmed.la.new libmed.la
-sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.6\.3/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmedC.la > libmedC.la.new
-mv -f libmedC.la.new libmedC.la
-
-chmod 755 libmed.la
-chmod 755 libmedC.la
-
-print_env
-}
-
-install_binary()
-{
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-check_jb tar xfz ${SOURCE_DIR}/med-2.2.2.tar.gz -C ${INSTALL_ROOT}
-
-### modify libmed.la libmedC.la files to correct direct path to hdf5 library
-### also modify libmed.la and libmedC.la files to correct direct path to med libraries
-### no need to do this for sources installation because 'make install' does it!
-cd ${PRODUCT_DIR}/lib
-sed -e 's%\(.*\)\([[:space:]].*libhdf5.la\)\(.*\)%\1 -lhdf5\3%g' -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" libmed.la > libmed.la.new
-mv -f libmed.la.new libmed.la
-sed -e 's%\(.*\)\([[:space:]].*libhdf5.la\)\(.*\)%\1 -lhdf5\3%g' -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" libmedC.la > libmedC.la.new
-mv -f libmedC.la.new libmedC.la
-tmp=""
-if [ -n "${HDF5HOME}" ]; then
-    tmp="-L${HDF5HOME}/lib"
-fi
-sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.6\.3/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmed.la > libmed.la.new
-mv -f libmed.la.new libmed.la
-sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.6\.3/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmedC.la > libmedC.la.new
-mv -f libmedC.la.new libmedC.la
-
-chmod 755 libmed.la
-chmod 755 libmedC.la
-
-print_env
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INSTALL_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="med" ; fi
-export PRODUCT="med-2.2.2"
-export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
-export PRODUCT_WORK=${INSTALL_WORK}/med_fichier2.2.2.src
-source ./common.sh
-$PROCEDURE 

diff --git a/config_files/med-2.2.3.sh b/config_files/med-2.2.3.sh
new file mode 100755 (executable)
index 0000000..0577275
--- /dev/null
+++ b/config_files/med-2.2.3.sh
@@ -0,0 +1,140 @@
+#!/bin/sh
+
+check_version()
+{
+if [ -z "$MED2HOME" ]; then
+   #echo "MED2HOME doesn't set"
+   return 1
+fi
+check_lib_version libmed.so.1.0.2 ${MED2HOME}/lib
+if [ "$?" -eq "0" ]; then
+   #echo "The product ${PRODUCT} has been already installed on yours system"
+   return 0
+fi
+return 1
+}
+
+print_env()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export MED2HOME=\${INSTALL_ROOT}/${PRODUCT}
+export PATH=\${MED2HOME}/bin:\${PATH}
+export LD_LIBRARY_PATH=\${MED2HOME}/lib:\${LD_LIBRARY_PATH}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+check_version
+if [ $? -eq 0 ] ; then
+    tmp="\${MED2HOME}/bin ${MED2HOME}/bin \${PATH} ${PATH}";  
+    path=`sort_path ${tmp}`
+    tmp="\${MED2HOME}/lib ${MED2HOME}/lib \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";  
+    ld_library_path=`sort_path ${tmp}`
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export MED2HOME=${MED2HOME}
+export PATH=${path}
+export LD_LIBRARY_PATH=${ld_library_path}
+##
+EOF
+    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+    return 0
+fi
+return 1;
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+return $?
+}
+
+install_source()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/med_fichier2.2.3.src.tar.gz -C ${INSTALL_WORK}
+
+cd ${PRODUCT_WORK}
+makedir ${PRODUCT_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}/INSTALL.LOG make install
+
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
+cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK}
+
+### modify libmed.la libmedC.la files to correct direct path to hdf5 library
+cd ${PRODUCT_DIR}/lib
+sed -e 's%\(.*\)\([[:space:]].*libhdf5.la\)\(.*\)%\1 -lhdf5\3%g' libmed.la > libmed.la.new
+mv -f libmed.la.new libmed.la
+sed -e 's%\(.*\)\([[:space:]].*libhdf5.la\)\(.*\)%\1 -lhdf5\3%g' libmedC.la > libmedC.la.new
+mv -f libmedC.la.new libmedC.la
+tmp=""
+if [ -n "${HDF5HOME}" ]; then
+    tmp="-L${HDF5HOME}/lib"
+fi
+sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.6\.3/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmed.la > libmed.la.new
+mv -f libmed.la.new libmed.la
+sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.6\.3/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmedC.la > libmedC.la.new
+mv -f libmedC.la.new libmedC.la
+
+chmod 755 libmed.la
+chmod 755 libmedC.la
+
+print_env
+}
+
+install_binary()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/med-2.2.3.tar.gz -C ${INSTALL_ROOT}
+
+### modify libmed.la libmedC.la files to correct direct path to hdf5 library
+### also modify libmed.la and libmedC.la files to correct direct path to med libraries
+### no need to do this for sources installation because 'make install' does it!
+cd ${PRODUCT_DIR}/lib
+sed -e 's%\(.*\)\([[:space:]].*libhdf5.la\)\(.*\)%\1 -lhdf5\3%g' -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" libmed.la > libmed.la.new
+mv -f libmed.la.new libmed.la
+sed -e 's%\(.*\)\([[:space:]].*libhdf5.la\)\(.*\)%\1 -lhdf5\3%g' -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" libmedC.la > libmedC.la.new
+mv -f libmedC.la.new libmedC.la
+tmp=""
+if [ -n "${HDF5HOME}" ]; then
+    tmp="-L${HDF5HOME}/lib"
+fi
+sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.6\.3/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmed.la > libmed.la.new
+mv -f libmed.la.new libmed.la
+sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.6\.3/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmedC.la > libmedC.la.new
+mv -f libmedC.la.new libmedC.la
+
+chmod 755 libmed.la
+chmod 755 libmedC.la
+
+print_env
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INSTALL_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="med" ; fi
+export PRODUCT="med-2.2.3"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/med_fichier2.2.3.src
+source ./common.sh
+$PROCEDURE