From: inv <inv@opencascade.com>
Date: Tue, 3 Apr 2012 16:49:27 +0000 (+0000)
Subject: SALOME 6.5.0 preparation: update script for freetype (2.3.7)
X-Git-Tag: V6_5_0b1~50
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=19af3c6c49b2b6748bc08e33c1614a0d3d96ab46;p=tools%2Finstall.git

SALOME 6.5.0 preparation: update script for freetype (2.3.7)
---

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index 36f0802..55d5aff 100755
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -444,7 +444,7 @@
                     version="2.3.7" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freetype-2.3.7.sh"/>
+		    script="freetype.sh"/>
     </product>
     <product name="ftgl"
 	     type="prerequisite"
diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml
index ae42fa6..076be29 100755
--- a/config_Debian_4.0.xml
+++ b/config_Debian_4.0.xml
@@ -444,7 +444,7 @@
                     version="2.3.7" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freetype-2.3.7.sh"/>
+		    script="freetype.sh"/>
     </product>
     <product name="ftgl"
 	     type="prerequisite"
diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index 6a2904e..05f0c7d 100755
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -444,7 +444,7 @@
                     version="2.3.7" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freetype-2.3.7.sh"/>
+		    script="freetype.sh"/>
     </product>
     <product name="ftgl"
 	     type="prerequisite"
diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml
index 21133f7..455ebdb 100755
--- a/config_Debian_5.0_64bit.xml
+++ b/config_Debian_5.0_64bit.xml
@@ -444,7 +444,7 @@
                     version="2.3.7" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freetype-2.3.7.sh"/>
+		    script="freetype.sh"/>
     </product>
     <product name="ftgl"
 	     type="prerequisite"
diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index be01137..2411c1b 100755
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -444,7 +444,7 @@
                     version="2.3.7" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freetype-2.3.7.sh"/>
+		    script="freetype.sh"/>
     </product>
     <product name="ftgl"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index ffd5efa..f90277f 100755
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -444,7 +444,7 @@
                     version="2.3.7" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freetype-2.3.7.sh"/>
+		    script="freetype.sh"/>
     </product>
     <product name="ftgl"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml
index 7330761..8808657 100755
--- a/config_Mandriva_2008.0_64bit.xml
+++ b/config_Mandriva_2008.0_64bit.xml
@@ -444,7 +444,7 @@
                     version="2.3.7" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freetype-2.3.7.sh"/>
+		    script="freetype.sh"/>
     </product>
     <product name="ftgl"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index bf8db0d..7337041 100755
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -444,7 +444,7 @@
                     version="2.3.7" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freetype-2.3.7.sh"/>
+		    script="freetype.sh"/>
     </product>
     <product name="ftgl"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index fa3e771..101a5fd 100755
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -444,7 +444,7 @@
                     version="2.3.7" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freetype-2.3.7.sh"/>
+		    script="freetype.sh"/>
     </product>
     <product name="ftgl"
 	     type="prerequisite"
diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml
index e677ef0..9e177cf 100755
--- a/config_Red_Hat_Enterprise_WS_4_64bit.xml
+++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml
@@ -444,7 +444,7 @@
                     version="2.3.7" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freetype-2.3.7.sh"/>
+		    script="freetype.sh"/>
     </product>
     <product name="ftgl"
 	     type="prerequisite"
diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml
index 8ccd440..fa08bb3 100755
--- a/config_Scientific_SL_5.1_64bit.xml
+++ b/config_Scientific_SL_5.1_64bit.xml
@@ -444,7 +444,7 @@
                     version="2.3.7" 
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="freetype-2.3.7.sh"/>
+		    script="freetype.sh"/>
     </product>
     <product name="ftgl"
 	     type="prerequisite"
diff --git a/config_files/freetype-2.3.7.sh b/config_files/freetype-2.3.7.sh
deleted file mode 100755
index 9993c87..0000000
--- a/config_files/freetype-2.3.7.sh
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : freetype-2.3.7.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.
-#
-####################################################################################
-
-FREETYPE_REF_VERSION="2.3.7"
-
-check_version()
-{
-# check existance of freetype and its version
-if [ -n ${FREETYPEDIR} ]; then
-  return 0
-fi
-ver=`${PRODUCT_SRC_DIR}/configure --version | grep "FreeType configure" | awk '{ print $3}'`
-if [ "$ver" == "${FREETYPE_REF_VERSION}" ] ; then
-    return 0
-fi
-return 1
-}
-
-print_env_bin()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export FREETYPEDIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export LD_LIBRARY_PATH=\${FREETYPEDIR}/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}
-
-cd ${PRODUCT_SRC_DIR}
-FREETYPE_CONFIGURE_OPTIONS=""
-if test `uname -m` = "x86_64" ; then
-FREETYPE_CONFIGURE_OPTIONS="${FREETYPE_CONFIGURE_OPTIONS} CFLAGS='-m64 -fPIC' CPPFLAGS='-m64 -fPIC'"
-fi
-
-FREETYPE_CONFIGURE_OPTIONS="${FREETYPE_CONFIGURE_OPTIONS} --prefix=${PRODUCT_DIR}"
-
-#congigure
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure ${FREETYPE_CONFIGURE_OPTIONS}
-
-# compile
-check_job ${PRODUCT_DIR}/MAKE.LOG make
-
-# install
-check_job ${PRODUCT_DIR}/INSTALL.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}
-
-### modifing la files
-cd ${PRODUCT_DIR}/lib
-sed -i "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g;" libfreetype.la
-
-# 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="freetype-${FREETYPE_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/freetype.sh b/config_files/freetype.sh
new file mode 100755
index 0000000..b852bc5
--- /dev/null
+++ b/config_files/freetype.sh
@@ -0,0 +1,145 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : freetype.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.
+#
+####################################################################################
+
+#
+# freetype version
+#
+FREETYPE_VERSION=2.3.7
+
+check_version()
+{
+# check existance of freetype and its version
+if [ "${FREETYPEDIR}" != "" ] && [ -f ${FREETYPEDIR}/include/freetype2/freetype/freetype.h ] ; then
+    ver_major=`grep "#define FREETYPE_MAJOR" ${FREETYPEDIR}/include/freetype2/freetype/freetype.h | awk '{print $3}'`
+    ver_minor=`grep "#define FREETYPE_MINOR" ${FREETYPEDIR}/include/freetype2/freetype/freetype.h | awk '{print $3}'`
+    ver_maint=`grep "#define FREETYPE_PATCH" ${FREETYPEDIR}/include/freetype2/freetype/freetype.h | awk '{print $3}'`
+    ver="$ver_major.$ver_minor.$ver_maint"
+    if [ "$ver" == "${FREETYPE_VERSION}" ] ; then
+        return 0
+    fi
+fi
+return 1
+}
+
+print_env_bin()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export FREETYPEDIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export LD_LIBRARY_PATH=\${FREETYPEDIR}/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}
+
+cd ${PRODUCT_SRC_DIR}
+FREETYPE_CONFIGURE_OPTIONS=""
+if test `uname -m` = "x86_64" ; then
+FREETYPE_CONFIGURE_OPTIONS="${FREETYPE_CONFIGURE_OPTIONS} CFLAGS='-m64 -fPIC' CPPFLAGS='-m64 -fPIC'"
+fi
+
+FREETYPE_CONFIGURE_OPTIONS="${FREETYPE_CONFIGURE_OPTIONS} --prefix=${PRODUCT_DIR}"
+
+#congigure
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure ${FREETYPE_CONFIGURE_OPTIONS}
+
+# compile
+check_job ${PRODUCT_DIR}/MAKE.LOG make
+
+# install
+check_job ${PRODUCT_DIR}/INSTALL.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}
+
+### modifing la files
+cd ${PRODUCT_DIR}/lib
+sed -i "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g;" libfreetype.la
+
+# 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="freetype-${FREETYPE_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