# Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
# Project : SALOME
# Module : Installation Wizard
-# Copyright : 2002-2012 CEA
+# Copyright : 2002-2015 CEA
#
# This script is the part of the SALOME installation procedure.
#
#
# QSCINTILLA version
#
-QSCINTILLA_VERSION=2.4.3
+VERSION_QSCINTILLA=2.7
check_version(){
-if [ -z "${QSCINTILLA_DIR}" ]; then
+if [ -z "${QSCINTILLA_ROOT_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
+ver=`grep "QSCINTILLA_VERSION_STR" ${QSCINTILLA_ROOT_DIR}/include/Qsci/qsciglobal.h | sed -e 's%^#define QSCINTILLA_VERSION_STR\([[:space:]]*\)%%g' -e 's%\"%%g'`
+if [ "${ver}" = "${VERSION_QSCINTILLA}" ] ; 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}
+#${DELIM} ${PRODUCT_TYPE} ${DELIM}
+export QSCINTILLA_ROOT_DIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export LD_LIBRARY_PATH=\${QSCINTILLA_ROOT_DIR}/lib:\${LD_LIBRARY_PATH}
##
EOF
(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
print_env_src()
{
cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
+#${DELIM} ${PRODUCT_TYPE}_src ${DELIM}
# nothing to do
##
EOF
install_source()
{
make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
+source ${INSTALL_WORK}/${SHRC}
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
+ sed -i "s%\(target.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}/lib%g;s%\(header.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}/include%g" ${PRODUCT_SRC_DIR}/Qt4Qt5/qscintilla.pro
+ sed -i "s%\(trans.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}/translations%g;s%\(qsci.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}%g" ${PRODUCT_SRC_DIR}/Qt4Qt5/qscintilla.pro
+fi
+
+if [ "${SALOME_IW_COMPSIZE}" = "1" ] ; then
+ du -sk ${PRODUCT_SRC_DIR} > ${INST_ROOT}/${PRODUCT_TYPE}.src.size
+fi
+
# to generate environment scripts
try_preinstalled
}
cd ${PRODUCT_SRC_DIR}
-# workaround : clear temporarily INSTALL_ROOT env.var if it is set
-INSTALL_ROOT_PREV=$INSTALL_ROOT
+# workaround : clear INSTALL_ROOT env.var if it is set
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
+gen_qmake_cache ${PRODUCT_SRC_DIR}/Qt4Qt5
qmake -o Makefile qscintilla.pro
check_job ${PRODUCT_DIR}/MAKE.LOG make
check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
-if [ "${PYQTDIR}" != "" ] ; then
+if [ "${PYQT4_ROOT_DIR}" != "" ] ; then
# install Python wrapping for QScintilla only if pre-installed version of PyQt is used
+ local QSCI_PY_CONFIGURE_OPTIONS="-a ${PRODUCT_DIR}/qsci -n ${PRODUCT_DIR}/include -o ${PRODUCT_DIR}/lib -p 4 -d ${PYQT4_ROOT_DIR}/PyQt4 -v ${PYQT4_ROOT_DIR}/sip"
+ if [ "${CXX}" != "" ] ; then
+ # custom gcc
+ false && QSCI_PY_CONFIGURE_OPTIONS="${QSCI_PY_CONFIGURE_OPTIONS} CC=${CC} CXX=${CXX} LINK=${CXX} LINK_SHLIB=${CXX}"
+ fi
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
+ cat >> ${PRODUCT_DIR}/PYCONFIGURE.LOG <<EOF
+-------------------
+Used options: ${QSCI_PY_CONFIGURE_OPTIONS}
+-------------------
+EOF
+ check_job ${PRODUCT_DIR}/PYCONFIGURE.LOG python configure.py ${QSCI_PY_CONFIGURE_OPTIONS}
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
+cd ${PRODUCT_DIR}
-#rm -rf ${PRODUCT_DIR}/doc
-#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
-cd ${PRODUCT_DIR};
+if [ "${SALOME_IW_COMPSIZE}" = "1" ] ; then
+ du -sk ${PRODUCT_SRC_DIR} > ${INST_ROOT}/${PRODUCT_TYPE}.build.size
+ du -sk ${PRODUCT_DIR} > ${INST_ROOT}/${PRODUCT_TYPE}.bin.size
+fi
# remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+if [ ${REMOVE_SRC_TMP} = "TRUE" ] ; then
test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
fi
install_binary()
{
make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
+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
+if [ "${PYQT4_ROOT_DIR}" != "" ] ; 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}
+ check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}-python.tar.gz -C ${PYQT4_ROOT_DIR}
fi
fi
export INSTALL_PRODUCTS=$7;
shift
REMOVE_SRC_TMP=$8;
-test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="QScintilla-${QSCINTILLA_VERSION}"
+test $# = 10 && shift && SINGLE_DIR=$9
+export PRODUCT="QScintilla-${VERSION_QSCINTILLA}"
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
+${PROCEDURE}
