# 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.
#
#
# QSCINTILLA version
#
-QSCINTILLA_VERSION=2.4.3
+QSCINTILLA_VERSION=2.7
check_version(){
if [ -z "${QSCINTILLA_DIR}" ]; then
# 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
}
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