spns #29667: FD32 - use qwt 6.1.4

diff --git a/applications/SALOME-9.9.0-native.pyconf b/applications/SALOME-9.9.0-native.pyconf
index 80e4211219fd48bdcfa9c7834e15c63e696fdb4b..9a944ae687f5fd75eb0c964e2343a6a651b67502 100644 (file)
--- a/applications/SALOME-9.9.0-native.pyconf
+++ b/applications/SALOME-9.9.0-native.pyconf
@@ -245,7 +245,7 @@ __overwrite__ :
     {
         __condition__ : "VARS.dist in ['FD32']"
         'APPLICATION.products.opencv'    : '3.2.0'
-        'APPLICATION.products.qwt'       : '6.1.6'
+        'APPLICATION.products.qwt'       : '6.1.4'
         'APPLICATION.products.PyFMI'     : {tag: '2.5',   base: 'no', section: 'version_2_5_no_pip'              }
         'APPLICATION.products.openturns' : {tag: '1.18',  base: 'no', section: 'version_1_18_FD32'               }
         'APPLICATION.products.Sphinx'    : {tag: '1.7.6', base: 'no', section: 'version_1_7_6_no_pip'            }

diff --git a/products/compil_scripts/qwt-6.1.4.sh b/products/compil_scripts/qwt-6.1.4.sh
new file mode 100755 (executable)
index 0000000..d35dc8c
--- /dev/null
+++ b/products/compil_scripts/qwt-6.1.4.sh
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+echo "##########################################################################"
+echo "qwt" $VERSION
+echo "##########################################################################"
+
+
+
+export TMAKEPATH=${QTDIR}/bin
+export PATH=${TMAKEPATH}:${PATH}
+
+echo
+echo "*** copy source"
+mkdir -p ${PRODUCT_INSTALL}
+#cp -r $SOURCE_DIR/* .
+cd $SOURCE_DIR
+
+QMAKE_BIN=qmake
+if [ "$SAT_qt_IS_NATIVE" == "1" ]; then
+    LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION"
+    case $LINUX_DISTRIBUTION in
+        FD3*)
+            QMAKE_BIN=$(which qmake-qt5)
+            ;;
+        *)
+            echo "WARNING: using QMAKE_BIN = ${QMAKE_BIN}"
+            ;;
+    esac
+fi
+
+echo
+echo "*** prepare $QMAKE_BIN"
+sed -i "s|\(QWT_INSTALL_PREFIX[[:space:]]*\)=\([[:space:]]*\)\(.*\)|\1=\2${PRODUCT_INSTALL}|g" qwtconfig.pri
+sed -i "s|#\(CONFIG[[:space:]]*+=[[:space:]]*QwtSVGItem\)|\1|g" qwtconfig.pri
+
+sed -i "s|\(target\.path[[:space:]]*\)=\([[:space:]]*\).*|\1=\2\$\$QWT_INSTALL_PREFIX/plugins/designer|g" designer/designer.pro 
+
+echo
+echo "** $QMAKE_BIN"
+$QMAKE_BIN
+if [ $? -ne 0 ]
+then
+    echo "ERROR on $QMAKE_BIN"
+    exit 1
+fi
+
+echo
+echo "*** make"
+make 
+if [ $? -ne 0 ]
+then
+    echo "ERROR on make"
+    exit 2
+fi
+
+echo
+echo "*** make install"
+make install
+if [ $? -ne 0 ]
+then
+    echo "ERROR on make install"
+    exit 3
+fi
+
+echo
+echo "########## END"
+

diff --git a/products/qwt.pyconf b/products/qwt.pyconf
index 0d7be4d7bb3b716fec67b00d9703c13214bf0e92..0bebc186ad453b3932d853e9d34d9cf0f70d0a00 100644 (file)
--- a/products/qwt.pyconf
+++ b/products/qwt.pyconf
@@ -57,6 +57,15 @@ version_6_1_2_win :
     }
 }
 
+version_6_1_4 :
+{
+    compil_script :  "qwt-6.1.4.sh"
+    archive_info:
+    {
+        archive_name : "qwt-6.1.4.tar.gz"
+    }
+}
+
 version_6_1_6 :
 {
     compil_script :  "qwt-6.1.6.sh"