X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2Fqscintilla.sh;h=163c9b1e9259455817fad1990dfc5ab012ed19b8;hb=013cbdd76b0a52601c8adace9907f2d5d8fc0e80;hp=b118e5f6f08f8b779add02c83b8efb785a3a6adf;hpb=d75f2f70def8f54b5de21df5e2ad7128059f6b9d;p=tools%2Finstall.git

diff --git a/config_files/qscintilla.sh b/config_files/qscintilla.sh
index b118e5f..163c9b1 100755
--- a/config_files/qscintilla.sh
+++ b/config_files/qscintilla.sh
@@ -6,7 +6,7 @@
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2012 CEA
+#  Copyright : 2002-2013 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
@@ -15,7 +15,7 @@
 #
 # QSCINTILLA  version
 #
-QSCINTILLA_VERSION=2.4.3
+QSCINTILLA_VERSION=2.7
 
 check_version(){
 if [ -z "${QSCINTILLA_DIR}" ]; then
@@ -67,6 +67,20 @@ check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
 # apply patch (if there's any)
 ( test -f patches/${PRODUCT}.patch && cp patches/${PRODUCT}.patch ${PRODUCT_SRC_DIR} && cd ${PRODUCT_SRC_DIR} && patch -p1 < ${PRODUCT}.patch )
 
+# patch build procedure
+local patch_build_procedure=1
+if [ "${patch_build_procedure}" = "1" ] ; then
+    # patch installation folder
+    cd ${PRODUCT_SRC_DIR}/Qt4Qt5
+    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
+fi
+
+
 # to generate environment scripts
 try_preinstalled
 }
@@ -85,15 +99,7 @@ cd ${PRODUCT_SRC_DIR}
 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
+cd ${PRODUCT_SRC_DIR}/Qt4Qt5
 
 qmake -o Makefile qscintilla.pro
 check_job ${PRODUCT_DIR}/MAKE.LOG make