X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2Fqscintilla-2.4.3.sh;h=32eb78939c08825814a44f22e5ed293bfb176066;hb=260bf6b42efe9e30501c4e6e99b013da3fe34f77;hp=1bf050cc223e484436051a2fcf919d6cf8ffefeb;hpb=8ba0079b0130f77ab0f3ae4d0e45e6a52d382d55;p=tools%2Finstall.git

diff --git a/config_files/qscintilla-2.4.3.sh b/config_files/qscintilla-2.4.3.sh
index 1bf050c..32eb789 100755
--- a/config_files/qscintilla-2.4.3.sh
+++ b/config_files/qscintilla-2.4.3.sh
@@ -82,7 +82,7 @@ cd ${PRODUCT_SRC_DIR}
 INSTALL_ROOT_PREV=$INSTALL_ROOT
 unset INSTALL_ROOT
 
-cd Qt4
+cd ${PRODUCT_SRC_DIR}/Qt4
 
 # patch installation folder
 sed -e "s%\(target.path[[:space:]]*=[[:space:]]*\).*%\1${PRODUCT_DIR}/lib%g" \
@@ -96,6 +96,16 @@ qmake -o Makefile qscintilla.pro
 check_job ${PRODUCT_DIR}/MAKE.LOG make 
 check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
 
+if [ "${PYQTDIR}" != "" ] ; then
+    # install Python wrapping for QScintilla only if pre-installed version of PyQt is used
+    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
+    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
@@ -123,6 +133,13 @@ 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
+    # 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}
+    fi
+fi
+
 # to generate environment scripts
 try_preinstalled
 }