Add installation script for the med-2.2.2

diff --git a/config.xml b/config.xml
index 8e1f7b225d523a0263e1f57bb8a06ce0f9fe924c..e1f2ee1682f1134a834f984392c9ae1228c7b8ee 100644 (file)
--- a/config.xml
+++ b/config.xml
@@ -141,11 +141,21 @@
            description="MED format interface library"
            install="install binaries"
           supported="install sources,install binaries"
-          disable="false"
+          disable="true"
           dependancies="gcc,Hdf"
           installdiskspace="1067"
           temporarydiskspace="7971"
           script="med-2.1.6.sh"/>
+  <product name="Med"
+           version="2.2.2" 
+           description="MED format interface library"
+           install="install binaries"
+          supported="install sources,install binaries"
+          disable="false"
+          dependancies="gcc,Hdf"
+          installdiskspace="18215"
+          temporarydiskspace="38100"
+          script="med-2.2.2.sh"/>
   <product name="Vtk"
            version="4.2" 
            description="Image processing, 3D graphics and visualization software system"

diff --git a/config_RedHat8_0.xml b/config_RedHat8_0.xml
index 8e1f7b225d523a0263e1f57bb8a06ce0f9fe924c..62b30fcab85a17510b1311bf4a1d21cb8fc97fec 100644 (file)
--- a/config_RedHat8_0.xml
+++ b/config_RedHat8_0.xml
@@ -141,11 +141,21 @@
            description="MED format interface library"
            install="install binaries"
           supported="install sources,install binaries"
-          disable="false"
+          disable="yes"
           dependancies="gcc,Hdf"
           installdiskspace="1067"
           temporarydiskspace="7971"
           script="med-2.1.6.sh"/>
+  <product name="Med"
+           version="2.2.2" 
+           description="MED format interface library"
+           install="install binaries"
+          supported="install sources,install binaries"
+          disable="false"
+          dependancies="gcc,Hdf"
+          installdiskspace="18215"
+          temporarydiskspace="38100"
+          script="med-2.2.2.sh"/>
   <product name="Vtk"
            version="4.2" 
            description="Image processing, 3D graphics and visualization software system"

diff --git a/config_RedHat8_0_with_Mesa.xml b/config_RedHat8_0_with_Mesa.xml
index 71980edce3adfc6db0c769caf8563ca3e9ce4fba..87b564a46bfb382e5188783df5d113b54e6de754 100644 (file)
--- a/config_RedHat8_0_with_Mesa.xml
+++ b/config_RedHat8_0_with_Mesa.xml
@@ -141,11 +141,21 @@
            description="MED format interface library"
            install="install binaries"
           supported="install sources,install binaries"
-          disable="false"
+          disable="yes"
           dependancies="gcc,Hdf"
           installdiskspace="1067"
           temporarydiskspace="7971"
           script="med-2.1.6.sh"/>
+  <product name="Med"
+           version="2.2.2" 
+           description="MED format interface library"
+           install="install binaries"
+          supported="install sources,install binaries"
+          disable="false"
+          dependancies="gcc,Hdf"
+          installdiskspace="18215"
+          temporarydiskspace="38100"
+          script="med-2.2.2.sh"/>
   <product name="Vtk"
            version="4.2" 
            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
new file mode 100755 (executable)
index 0000000..4b547c6
--- /dev/null
+++ b/config_files/med-2.2.2.sh
@@ -0,0 +1,100 @@
+#!/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}/MAKEINSTALL.LOG make install
+
+rm -fr ${PRODUCT_WORK}
+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}
+
+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/doc/readme.html b/doc/readme.html
index 7dd06ddcf9b1904042d7b027cbbf849dc0365232..9133615702e63ac7a3a3fe43069a3db80744ac49 100755 (executable)
--- a/doc/readme.html
+++ b/doc/readme.html
@@ -397,12 +397,12 @@ to use OpenGL drivers installed on your computer locally. This check procedure
   HDF5 Version: 1.4.4</td>
       </tr>
       <tr>
-        <td>Med 2.1.6</td>
+        <td>Med 2.2.2</td>
         <td>existence of MED2HOME <br>
-  existence of libmed.so.0.0.0</td>
+  existence of libmed.so.1.0.1</td>
         <td>set MED2HOME if you have preinstalled version of med</td>
         <td>Unfortunately we can't check version number. <br>
-  We try to find libmed.so.0.0.0 in ${MED2HOME}/lib folder. <br>
+  We try to find libmed.so.1.0.1 in ${MED2HOME}/lib folder. <br>
   If you have problem with preinstalled version of med reinstall it.</td>
       </tr>
       <tr>
@@ -807,7 +807,7 @@ of prerequisite products, separated by space;</font> <br>
  </p>
    
 <p><font color="#000000">Example:</font> <br>
-  <i><font color="#000000">med-2.1.6.sh install_binary /tmp/work ./Products/BINARIES/RedHat8.0
+  <i><font color="#000000">med-2.2.2.sh install_binary /tmp/work ./Products/BINARIES/RedHat8.0
  /usr/salome 'gcc Hdf' med</font></i> </p>
    
 <p><font color="#000000">Copy created script into the <i>&lt;Install_Wizard_root_directory&gt;/config_files</i>