From: vsr <vsr@opencascade.com>
Date: Tue, 3 Apr 2012 19:54:16 +0000 (+0000)
Subject: SALOME 6.5.0 preparation: update script for qscintilla (2.4.3)
X-Git-Tag: V6_5_0b1~45
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8ed80cd2426b9a0f483e2a44f03d392a99cd9c6e;p=tools%2Finstall.git

SALOME 6.5.0 preparation: update script for qscintilla (2.4.3)
---

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index defef72..de1a13e 100755
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -417,7 +417,7 @@
                     version="2.4.3" 
 		    disable="false"
 		    installdiskspace="3228,15692,24220"
-		    script="qscintilla-2.4.3.sh"/>
+		    script="qscintilla.sh"/>
     </product>
     <product name="boost"
 	     type="prerequisite"
diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml
index 7d805ae..2cefcb8 100755
--- a/config_Debian_4.0.xml
+++ b/config_Debian_4.0.xml
@@ -417,7 +417,7 @@
                     version="2.4.3" 
 		    disable="false"
 		    installdiskspace="3228,15692,24220"
-		    script="qscintilla-2.4.3.sh"/>
+		    script="qscintilla.sh"/>
     </product>
     <product name="boost"
 	     type="prerequisite"
diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index 14f41a9..3674f45 100755
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -417,7 +417,7 @@
                     version="2.4.3" 
 		    disable="false"
 		    installdiskspace="3228,15692,24220"
-		    script="qscintilla-2.4.3.sh"/>
+		    script="qscintilla.sh"/>
     </product>
     <product name="boost"
 	     type="prerequisite"
diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml
index c2b3200..f82c28b 100755
--- a/config_Debian_5.0_64bit.xml
+++ b/config_Debian_5.0_64bit.xml
@@ -417,7 +417,7 @@
                     version="2.4.3" 
 		    disable="false"
 		    installdiskspace="3228,15692,24220"
-		    script="qscintilla-2.4.3.sh"/>
+		    script="qscintilla.sh"/>
     </product>
     <product name="boost"
 	     type="prerequisite"
diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index 48008a5..97ac476 100755
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -417,7 +417,7 @@
                     version="2.4.3" 
 		    disable="false"
 		    installdiskspace="3228,15692,24220"
-		    script="qscintilla-2.4.3.sh"/>
+		    script="qscintilla.sh"/>
     </product>
     <product name="boost"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index 6909b01..91979b9 100755
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -417,7 +417,7 @@
                     version="2.4.3" 
 		    disable="false"
 		    installdiskspace="3228,15692,24220"
-		    script="qscintilla-2.4.3.sh"/>
+		    script="qscintilla.sh"/>
     </product>
     <product name="boost"
 	     type="prerequisite"
diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml
index 22f050c..8090c0f 100755
--- a/config_Mandriva_2008.0_64bit.xml
+++ b/config_Mandriva_2008.0_64bit.xml
@@ -417,7 +417,7 @@
                     version="2.4.3" 
 		    disable="false"
 		    installdiskspace="3228,15692,24220"
-		    script="qscintilla-2.4.3.sh"/>
+		    script="qscintilla.sh"/>
     </product>
     <product name="boost"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index 7cfde8e..b18973c 100755
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -417,7 +417,7 @@
                     version="2.4.3" 
 		    disable="false"
 		    installdiskspace="3228,15692,24220"
-		    script="qscintilla-2.4.3.sh"/>
+		    script="qscintilla.sh"/>
     </product>
     <product name="boost"
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index 0ca9065..0e0fda5 100755
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -417,7 +417,7 @@
                     version="2.4.3" 
 		    disable="false"
 		    installdiskspace="3228,15692,24220"
-		    script="qscintilla-2.4.3.sh"/>
+		    script="qscintilla.sh"/>
     </product>
     <product name="boost"
 	     type="prerequisite"
diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml
index 2eed410..3f28e6d 100755
--- a/config_Red_Hat_Enterprise_WS_4_64bit.xml
+++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml
@@ -417,7 +417,7 @@
                     version="2.4.3" 
 		    disable="false"
 		    installdiskspace="3228,15692,24220"
-		    script="qscintilla-2.4.3.sh"/>
+		    script="qscintilla.sh"/>
     </product>
     <product name="boost"
 	     type="prerequisite"
diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml
index c005416..d30a5cd 100755
--- a/config_Scientific_SL_5.1_64bit.xml
+++ b/config_Scientific_SL_5.1_64bit.xml
@@ -417,7 +417,7 @@
                     version="2.4.3" 
 		    disable="false"
 		    installdiskspace="3228,15692,24220"
-		    script="qscintilla-2.4.3.sh"/>
+		    script="qscintilla.sh"/>
     </product>
     <product name="boost"
 	     type="prerequisite"
diff --git a/config_files/qscintilla-2.4.3.sh b/config_files/qscintilla-2.4.3.sh
deleted file mode 100755
index 32eb789..0000000
--- a/config_files/qscintilla-2.4.3.sh
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : qscintilla-2.4.3.sh
-#  Created   : Thu Oct 23 11:50:00 2008
-#  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.
-#
-####################################################################################
-
-#
-#QSCINTILLA  version
-#
-QSCINTILLA_VERSION=2.4.3
-
-check_version(){
-if [ -z "${QSCINTILLA_DIR}" ]; then
-   return 1
-fi
-ver=`grep "QSCINTILLA_VERSION_STR" ${QSCINTILLA_DIR}/include/Qsci/qsciglobal.h | sed -e 's%^#define QSCINTILLA_VERSION_STR\([[:space:]]*\)%%g' -e 's%\"%%g'`
-if [ "$ver" == "${QSCINTILLA_VERSION}" ] ; then
-    return 0
-fi
-return 1
-}
-
-print_env_bin()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export QSCINTILLA_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export LD_LIBRARY_PATH=\${QSCINTILLA_DIR}/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
-
-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}
-
-# workaround : clear temporarily INSTALL_ROOT env.var if it is set
-INSTALL_ROOT_PREV=$INSTALL_ROOT
-unset INSTALL_ROOT
-
-cd ${PRODUCT_SRC_DIR}/Qt4
-
-# patch installation folder
-sed -e "s%\(target.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}/lib%g" \
-    -e "s%\(header.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}/include%g" \
-    -e "s%\(trans.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}/translations%g" \
-    -e "s%\(qsci.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}%g" \
-    qscintilla.pro > qscintilla.pro.new
-mv -f qscintilla.pro.new qscintilla.pro
-
-qmake -o Makefile qscintilla.pro
-check_job ${PRODUCT_DIR}/MAKE.LOG make 
-check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
-
-if [ "${PYQTDIR}" != "" ] ; then
-    # install Python wrapping for QScintilla only if pre-installed version of PyQt is used
-    cd ${PRODUCT_SRC_DIR}/Python
-    check_job ${PRODUCT_DIR}/PYCONFIGURE.LOG python configure.py -a ${PRODUCT_DIR}/qsci \
-	-n ${PRODUCT_DIR}/include -o ${PRODUCT_DIR}/lib -p 4 \
-	-d ${PYQTDIR}/PyQt4 -v ${PYQTDIR}/sip
-    check_job ${PRODUCT_DIR}/PYMAKE.LOG make 
-    check_job ${PRODUCT_DIR}/PYMAKEINSTALL.LOG make install
-fi
-
-if [ "${INSTALL_ROOT_PREV}" != "" ] ; then
-    export INSTALL_ROOT=$INSTALL_ROOT_PREV
-fi
-
-#rm -rf ${PRODUCT_DIR}/doc
-#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
-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}
-
-if [ "${PYQTDIR}" != "" ] ; then
-    # install Python wrapping for QScintilla only if pre-installed version of PyQt is used
-    if [ -f ${SOURCE_DIR}/${PRODUCT}-python.tar.gz ] ; then
-	check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}-python.tar.gz -C ${PYQTDIR}
-    fi
-fi
-
-# to generate environment scripts
-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="QScintilla-${QSCINTILLA_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/qscintilla.sh b/config_files/qscintilla.sh
new file mode 100755
index 0000000..a30311d
--- /dev/null
+++ b/config_files/qscintilla.sh
@@ -0,0 +1,162 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : qscintilla.sh
+#  Created   : Thu Oct 23 11:50:00 2008
+#  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.
+#
+####################################################################################
+
+#
+# QSCINTILLA  version
+#
+QSCINTILLA_VERSION=2.4.3
+
+check_version(){
+if [ -z "${QSCINTILLA_DIR}" ]; then
+   return 1
+fi
+ver=`grep "QSCINTILLA_VERSION_STR" ${QSCINTILLA_DIR}/include/Qsci/qsciglobal.h | sed -e 's%^#define QSCINTILLA_VERSION_STR\([[:space:]]*\)%%g' -e 's%\"%%g'`
+if [ "$ver" == "${QSCINTILLA_VERSION}" ] ; then
+    return 0
+fi
+return 1
+}
+
+print_env_bin()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export QSCINTILLA_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export LD_LIBRARY_PATH=\${QSCINTILLA_DIR}/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
+
+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}
+
+# workaround : clear temporarily INSTALL_ROOT env.var if it is set
+INSTALL_ROOT_PREV=$INSTALL_ROOT
+unset INSTALL_ROOT
+
+cd ${PRODUCT_SRC_DIR}/Qt4
+
+# patch installation folder
+sed -e "s%\(target.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}/lib%g" \
+    -e "s%\(header.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}/include%g" \
+    -e "s%\(trans.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}/translations%g" \
+    -e "s%\(qsci.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}%g" \
+    qscintilla.pro > qscintilla.pro.new
+mv -f qscintilla.pro.new qscintilla.pro
+
+qmake -o Makefile qscintilla.pro
+check_job ${PRODUCT_DIR}/MAKE.LOG make 
+check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
+
+if [ "${PYQTDIR}" != "" ] ; then
+    # install Python wrapping for QScintilla only if pre-installed version of PyQt is used
+    cd ${PRODUCT_SRC_DIR}/Python
+    check_job ${PRODUCT_DIR}/PYCONFIGURE.LOG python configure.py -a ${PRODUCT_DIR}/qsci \
+	-n ${PRODUCT_DIR}/include -o ${PRODUCT_DIR}/lib -p 4 \
+	-d ${PYQTDIR}/PyQt4 -v ${PYQTDIR}/sip
+    check_job ${PRODUCT_DIR}/PYMAKE.LOG make 
+    check_job ${PRODUCT_DIR}/PYMAKEINSTALL.LOG make install
+fi
+
+if [ "${INSTALL_ROOT_PREV}" != "" ] ; then
+    export INSTALL_ROOT=$INSTALL_ROOT_PREV
+fi
+
+#rm -rf ${PRODUCT_DIR}/doc
+#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
+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}
+
+if [ "${PYQTDIR}" != "" ] ; then
+    # install Python wrapping for QScintilla only if pre-installed version of PyQt is used
+    if [ -f ${SOURCE_DIR}/${PRODUCT}-python.tar.gz ] ; then
+	check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}-python.tar.gz -C ${PYQTDIR}
+    fi
+fi
+
+# to generate environment scripts
+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="QScintilla-${QSCINTILLA_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