From: vsr <vsr@opencascade.com>
Date: Tue, 3 Apr 2012 19:14:15 +0000 (+0000)
Subject: SALOME 6.5.0 preparation: update script for freeimage (3.14.1)
X-Git-Tag: V6_5_0b1~49
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5a1cc9972faec9a6ec52b5f4874ea70ea130e452;p=tools%2Finstall.git

SALOME 6.5.0 preparation: update script for freeimage (3.14.1)
---

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index 55d5aff..8f16f47 100755
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -462,7 +462,7 @@
                     version="3.14.1" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freeimage-3.14.1.sh"/>
+		    script="freeimage.sh"/>
     </product>
     <product name="cmake"
 	     type="prerequisite"
diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml
index 076be29..a1ca3ab 100755
--- a/config_Debian_4.0.xml
+++ b/config_Debian_4.0.xml
@@ -462,7 +462,7 @@
                     version="3.14.1" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freeimage-3.14.1.sh"/>
+		    script="freeimage.sh"/>
     </product>
     <product name="cmake"
 	     type="prerequisite"
diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index 05f0c7d..f509ecf 100755
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -462,7 +462,7 @@
                     version="3.14.1" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freeimage-3.14.1.sh"/>
+		    script="freeimage.sh"/>
     </product>
     <product name="cmake"
 	     type="prerequisite"
diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml
index 455ebdb..0e645c9 100755
--- a/config_Debian_5.0_64bit.xml
+++ b/config_Debian_5.0_64bit.xml
@@ -462,7 +462,7 @@
                     version="3.14.1" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freeimage-3.14.1.sh"/>
+		    script="freeimage.sh"/>
     </product>
     <product name="cmake"
 	     type="prerequisite"
diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index 2411c1b..76d8729 100755
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -462,7 +462,7 @@
                     version="3.14.1" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freeimage-3.14.1.sh"/>
+		    script="freeimage.sh"/>
     </product>
     <product name="cmake"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index f90277f..5b40ce9 100755
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -462,7 +462,7 @@
                     version="3.14.1" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freeimage-3.14.1.sh"/>
+		    script="freeimage.sh"/>
     </product>
     <product name="cmake"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml
index 8808657..4e43ee6 100755
--- a/config_Mandriva_2008.0_64bit.xml
+++ b/config_Mandriva_2008.0_64bit.xml
@@ -462,7 +462,7 @@
                     version="3.14.1" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freeimage-3.14.1.sh"/>
+		    script="freeimage.sh"/>
     </product>
     <product name="cmake"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index 7337041..488480d 100755
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -462,7 +462,7 @@
                     version="3.14.1" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freeimage-3.14.1.sh"/>
+		    script="freeimage.sh"/>
     </product>
     <product name="cmake"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index 101a5fd..6817015 100755
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -462,7 +462,7 @@
                     version="3.14.1" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freeimage-3.14.1.sh"/>
+		    script="freeimage.sh"/>
     </product>
     <product name="cmake"
 	     type="prerequisite"
diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml
index 9e177cf..f65a4e9 100755
--- a/config_Red_Hat_Enterprise_WS_4_64bit.xml
+++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml
@@ -462,7 +462,7 @@
                     version="3.14.1" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freeimage-3.14.1.sh"/>
+		    script="freeimage.sh"/>
     </product>
     <product name="cmake"
 	     type="prerequisite"
diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml
index fa08bb3..fc15abc 100755
--- a/config_Scientific_SL_5.1_64bit.xml
+++ b/config_Scientific_SL_5.1_64bit.xml
@@ -462,7 +462,7 @@
                     version="3.14.1" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freeimage-3.14.1.sh"/>
+		    script="freeimage.sh"/>
     </product>
     <product name="cmake"
 	     type="prerequisite"
diff --git a/config_files/freeimage-3.14.1.sh b/config_files/freeimage-3.14.1.sh
deleted file mode 100755
index b2ee2e7..0000000
--- a/config_files/freeimage-3.14.1.sh
+++ /dev/null
@@ -1,153 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : freeimage-3.14.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.
-#
-####################################################################################
-
-FREEIMAGE_REF_VERSION="3.14.1"
-
-check_version()
-{
-# check existance of freeimage and its version
-if [ -n ${FREEIMAGEDIR} ]; then
-  return 0
-fi
-ver_major=`cat ${PRODUCT_SRC_DIR}/FreeImage.rc | grep PRODUCTVERSION | sed -e "s%[A-Z0 ]%%g" | sed -e "s%[,]% %g" | awk '{ print $1}'`
-ver_minor=`cat ${PRODUCT_SRC_DIR}/FreeImage.rc | grep PRODUCTVERSION | sed -e "s%[A-Z0 ]%%g" | sed -e "s%[,]% %g" | awk '{ print $2}'`
-ver_maint=`cat ${PRODUCT_SRC_DIR}/FreeImage.rc | grep PRODUCTVERSION | sed -e "s%[A-Z0 ]%%g" | sed -e "s%[,]% %g" | awk '{ print $3}'`
-ver="$ver_major.$ver_minor.$ver_maint"
-if [ "$ver" == "${FREEIMAGE_REF_VERSION}" ] ; then
-    return 0
-fi
-return 1
-}
-
-print_env_bin()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export FREEIMAGEDIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PATH=\${FREEIMAGEDIR}/bin:\$PATH 
-export LD_LIBRARY_PATH=\${FREEIMAGEDIR}/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
-# 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}
-
-cd ${PRODUCT_SRC_DIR}
-
-## building FreeImage library
-
-# compile
-#check_job ${PRODUCT_DIR}/MAKE.LOG 
-check_job ${PRODUCT_DIR}/MAKE.LOG make -f Makefile.gnu
-
-# install
-#check_job ${PRODUCT_DIR}/INSTALL.LOG 
-check_job ${PRODUCT_DIR}/INSTALL.LOG make -f Makefile.gnu DESTDIR=${PRODUCT_DIR} install 
-
-#clean temporary files. 
-make -f Makefile.fip clean 
-
-## building FreeImagePlus library
-
-# compile
-#check_job ${PRODUCT_DIR}/MAKE.LOG 
-check_job ${PRODUCT_DIR}/MAKEPLUS.LOG make -f Makefile.fip 
-
-# install
-#check_job ${PRODUCT_DIR}/INSTALL.LOG 
-check_job ${PRODUCT_DIR}/INSTALLPLUS.LOG make -f Makefile.fip DESTDIR=${PRODUCT_DIR} install 
-
-#clean temporary files. 
-make -f Makefile.fip clean 
-
-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}
-
-### modifing la files
-cd ${PRODUCT_DIR}/lib
-
-# 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="freeimage-${FREEIMAGE_REF_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/freeimage.sh b/config_files/freeimage.sh
new file mode 100755
index 0000000..a514768
--- /dev/null
+++ b/config_files/freeimage.sh
@@ -0,0 +1,151 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : freeimage.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.
+#
+####################################################################################
+
+#
+# freeimage version
+#
+FREEIMAGE_VERSION=3.14.1
+
+check_version()
+{
+# check existance of freeimage and its version
+if [ "${FREEIMAGEDIR}" != "" ] && [ -f ${FREEIMAGEDIR}/include/FreeImage.h ] ; then
+    ver_major=`grep "#define FREEIMAGE_MAJOR_VERSION"  ${FREEIMAGEDIR}/include/FreeImage.h | awk '{print $3}'`
+    ver_minor=`grep "#define FREEIMAGE_MINOR_VERSION"  ${FREEIMAGEDIR}/include/FreeImage.h | awk '{print $3}'`
+    ver_maint=`grep "#define FREEIMAGE_RELEASE_SERIAL" ${FREEIMAGEDIR}/include/FreeImage.h | awk '{print $3}'`
+    ver="$ver_major.$ver_minor.$ver_maint"
+    if [ "$ver" == "${FREEIMAGE_VERSION}" ] ; then
+        return 0
+    fi
+fi
+return 1
+}
+
+print_env_bin()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export FREEIMAGEDIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PATH=\${FREEIMAGEDIR}/bin:\$PATH 
+export LD_LIBRARY_PATH=\${FREEIMAGEDIR}/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
+# 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}
+
+cd ${PRODUCT_SRC_DIR}
+
+## building FreeImage library
+
+# compile
+check_job ${PRODUCT_DIR}/MAKE.LOG make -f Makefile.gnu
+
+# install
+check_job ${PRODUCT_DIR}/INSTALL.LOG make -f Makefile.gnu DESTDIR=${PRODUCT_DIR} install 
+
+# clean temporary files. 
+make -f Makefile.fip clean 
+
+## building FreeImagePlus library
+
+# compile
+check_job ${PRODUCT_DIR}/MAKEPLUS.LOG make -f Makefile.fip 
+
+# install
+check_job ${PRODUCT_DIR}/INSTALLPLUS.LOG make -f Makefile.fip DESTDIR=${PRODUCT_DIR} install 
+
+# clean temporary files. 
+make -f Makefile.fip clean 
+
+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}
+
+### modifing la files
+cd ${PRODUCT_DIR}/lib
+
+# 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="freeimage-${FREEIMAGE_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