Salome HOME
SALOME 6.5.0 preparation: update script for qwt (5.2.1)
authorvsr <vsr@opencascade.com>
Tue, 3 Apr 2012 19:48:38 +0000 (19:48 +0000)
committervsr <vsr@opencascade.com>
Tue, 3 Apr 2012 19:48:38 +0000 (19:48 +0000)
13 files changed:
config_CentOS_5.5_64bit.xml
config_Debian_4.0.xml
config_Debian_4.0_64bit.xml
config_Debian_5.0_64bit.xml
config_Debian_6.0_64bit.xml
config_Mandriva_2008.0.xml
config_Mandriva_2008.0_64bit.xml
config_Mandriva_2010.0.xml
config_Mandriva_2010.0_64bit.xml
config_Red_Hat_Enterprise_WS_4_64bit.xml
config_Scientific_SL_5.1_64bit.xml
config_files/qwt-5.2.1.sh [deleted file]
config_files/qwt.sh [new file with mode: 0755]

index db96f67b311901bd9311d479851451e8e27c1f6b..defef7241ddb83ef028c423f6fc7235931918dfc 100755 (executable)
                     version="5.2.1" 
                    disable="false"
                    installdiskspace="9988,10828,23964"
-                   script="qwt-5.2.1.sh"/>
+                   script="qwt.sh"/>
     </product>
     <product name="OmniORB"
             type="prerequisite"
index ddc45142a8885e066e88b1b8b3dffa3bda689fb7..7d805aed2ebe1d1abad7b5d66f5427a916d658ea 100755 (executable)
                     version="5.2.1" 
                    disable="false"
                    installdiskspace="9988,10828,23964"
-                   script="qwt-5.2.1.sh"/>
+                   script="qwt.sh"/>
     </product>
     <product name="OmniORB"
             type="prerequisite"
index c6692080bd837f3cc28b0d5873b78ab2f750ae4f..14f41a96c112f3714f01e8be0fc21bca72a8d004 100755 (executable)
                     version="5.2.1" 
                    disable="false"
                    installdiskspace="9988,10828,23964"
-                   script="qwt-5.2.1.sh"/>
+                   script="qwt.sh"/>
     </product>
     <product name="OmniORB"
             type="prerequisite"
index bde8a9ba502abe72d9ff619f7470652c1ffeeace..c2b3200f1023bf98bdf3c877eedcd5682c7e5df7 100755 (executable)
                     version="5.2.1" 
                    disable="false"
                    installdiskspace="9988,10828,23964"
-                   script="qwt-5.2.1.sh"/>
+                   script="qwt.sh"/>
     </product>
     <product name="OmniORB"
             type="prerequisite"
index 51a7fcecc44eaddcdb185d639ed1e64a56214e33..48008a5d672e5cd8978b9f848c55a22003642f2f 100755 (executable)
                     version="5.2.1" 
                    disable="false"
                    installdiskspace="9988,10828,23964"
-                   script="qwt-5.2.1.sh"/>
+                   script="qwt.sh"/>
     </product>
     <product name="OmniORB"
             type="prerequisite"
index 256702178d2ba352cc118b6fdb2b8a22858fd08e..6909b014f4b32eb292cd84b95cd91eb71f8d6510 100755 (executable)
                     version="5.2.1" 
                    disable="false"
                    installdiskspace="9988,10828,23964"
-                   script="qwt-5.2.1.sh"/>
+                   script="qwt.sh"/>
     </product>
     <product name="OmniORB"
             type="prerequisite"
index 8a055e4e17d45222ac6d3d5f70c4574491cdae24..22f050ce7ec25282ea0090e824fd1b37095076c8 100755 (executable)
                     version="5.2.1" 
                    disable="false"
                    installdiskspace="9988,10828,23964"
-                   script="qwt-5.2.1.sh"/>
+                   script="qwt.sh"/>
     </product>
     <product name="OmniORB"
             type="prerequisite"
index cf14dbc9528e9cd68a0f2e29a30217b2eef3eb45..7cfde8ec7050a1ee2e75b01f4de897bccbad90af 100755 (executable)
                     version="5.2.1" 
                    disable="false"
                    installdiskspace="9988,10828,23964"
-                   script="qwt-5.2.1.sh"/>
+                   script="qwt.sh"/>
     </product>
     <product name="OmniORB"
             type="prerequisite"
index 3e973d631743d44d8ceebce1227227f2fe867ecb..0ca9065858b69b60a5595d2d5a88f34d53f9f551 100755 (executable)
                     version="5.2.1" 
                    disable="false"
                    installdiskspace="9988,10828,23964"
-                   script="qwt-5.2.1.sh"/>
+                   script="qwt.sh"/>
     </product>
     <product name="OmniORB"
             type="prerequisite"
index a5646e7884d26c359d213c9334c0b789b67292cf..2eed410d4bdd661606fb0d7d8010b18569df532c 100755 (executable)
                     version="5.2.1" 
                    disable="false"
                    installdiskspace="9988,10828,23964"
-                   script="qwt-5.2.1.sh"/>
+                   script="qwt.sh"/>
     </product>
     <product name="OmniORB"
             type="prerequisite"
index 97163946d424116f04400cdcb2c16e65064fe159..c0054162271d09e5c136b264025d8b55286ef7de 100755 (executable)
                     version="5.2.1" 
                    disable="false"
                    installdiskspace="9988,10828,23964"
-                   script="qwt-5.2.1.sh"/>
+                   script="qwt.sh"/>
     </product>
     <product name="OmniORB"
             type="prerequisite"
diff --git a/config_files/qwt-5.2.1.sh b/config_files/qwt-5.2.1.sh
deleted file mode 100755 (executable)
index 87874b1..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : qwt-5.2.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.
-#
-####################################################################################
-
-#
-# QWT version
-#
-QWT_VERSION=5.2.1
-
-check_version()
-{
-if [ -n "${QWTHOME}" ] ; then 
-    qwtinc=${QWTHOME}/include/qwt_global.h
-    if [ ! -f $qwtinc ] ; then
-       qwtinc=${QWTHOME}/include/qwt/qwt_global.h
-    fi
-    if [ -f $qwtinc ] ; then
-       ver=`grep -e "^#define[[:space:]]\+QWT_VERSION_STR" $qwtinc | sed -e 's/^#define[[:space:]]\+QWT_VERSION_STR[[:space:]]*"\(.*\)"/\1/'`
-       if [ "$ver" == "${QWT_VERSION}" ]; then
-           return 0
-       fi
-    fi
-fi
-return 1
-}
-
-print_env_bin()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export QWTHOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export LD_LIBRARY_PATH=\${QWTHOME}/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
-cd ${PRODUCT_SRC_DIR}
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-sed -e "s%\(INSTALLBASE[[:space:]]*\)=\([[:space:]]*\).*%\1=\2${PRODUCT_DIR}%g" \
-    -e "s%#\(CONFIG[[:space:]]*+=[[:space:]]*QwtSVGItem\)%\1%g" qwtconfig.pri > qwtconfig.pri.new
-mv -f qwtconfig.pri.new qwtconfig.pri
-
-sed -e "s%\(target\.path[[:space:]]*\)=\([[:space:]]*\).*%\1=\2\$\$INSTALLBASE/plugins/designer%g" \
-    designer/designer.pro > designer/designer.pro.new
-mv -f designer/designer.pro.new designer/designer.pro
-
-INSTALL_ROOT_PREV=$INSTALL_ROOT
-unset INSTALL_ROOT
-
-qmake
-
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=$GCC
-EOF
-
-check_job ${PRODUCT_DIR}/MAKE.LOG make
-
-check_job ${PRODUCT_DIR}/MAKE_INSTALL.LOG make install
-
-if [ "${INSTALL_ROOT_PREV}" != "" ] ; then
-    export INSTALL_ROOT=$INSTALL_ROOT_PREV
-fi
-
-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}
-
-# 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="qwt-${QWT_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/qwt.sh b/config_files/qwt.sh
new file mode 100755 (executable)
index 0000000..6ffa469
--- /dev/null
@@ -0,0 +1,158 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : qwt.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.
+#
+####################################################################################
+
+#
+# QWT version
+#
+QWT_VERSION=5.2.1
+
+check_version()
+{
+if [ -n "${QWTHOME}" ] ; then 
+    qwtinc=${QWTHOME}/include/qwt_global.h
+    if [ ! -f $qwtinc ] ; then
+       qwtinc=${QWTHOME}/include/qwt/qwt_global.h
+    fi
+    if [ -f $qwtinc ] ; then
+       ver=`grep -e "^#define[[:space:]]\+QWT_VERSION_STR" $qwtinc | sed -e 's/^#define[[:space:]]\+QWT_VERSION_STR[[:space:]]*"\(.*\)"/\1/'`
+       if [ "$ver" == "${QWT_VERSION}" ]; then
+           return 0
+       fi
+    fi
+fi
+return 1
+}
+
+print_env_bin()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export QWTHOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export LD_LIBRARY_PATH=\${QWTHOME}/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
+cd ${PRODUCT_SRC_DIR}
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+sed -e "s%\(INSTALLBASE[[:space:]]*\)=\([[:space:]]*\).*%\1=\2${PRODUCT_DIR}%g" \
+    -e "s%#\(CONFIG[[:space:]]*+=[[:space:]]*QwtSVGItem\)%\1%g" qwtconfig.pri > qwtconfig.pri.new
+mv -f qwtconfig.pri.new qwtconfig.pri
+
+sed -e "s%\(target\.path[[:space:]]*\)=\([[:space:]]*\).*%\1=\2\$\$INSTALLBASE/plugins/designer%g" \
+    designer/designer.pro > designer/designer.pro.new
+mv -f designer/designer.pro.new designer/designer.pro
+
+INSTALL_ROOT_PREV=$INSTALL_ROOT
+unset INSTALL_ROOT
+
+# configure with qmake
+
+qmake
+
+# make
+
+GCC=`which gcc`
+cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
+used gcc=$GCC
+EOF
+
+check_job ${PRODUCT_DIR}/MAKE.LOG make
+
+# make install
+
+check_job ${PRODUCT_DIR}/MAKE_INSTALL.LOG make install
+
+if [ "${INSTALL_ROOT_PREV}" != "" ] ; then
+    export INSTALL_ROOT=$INSTALL_ROOT_PREV
+fi
+
+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}
+
+# 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="qwt-${QWT_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