From: vsr <vsr@opencascade.com>
Date: Wed, 21 Oct 2009 20:00:42 +0000 (+0000)
Subject: Minor improvements
X-Git-Tag: V5_1_3~23
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a203e3939965012ae27d14193dd1611a918e25f6;p=tools%2Finstall.git

Minor improvements
---

diff --git a/config_files/PyQt-4.5.4.sh b/config_files/PyQt-4.5.4.sh
index 4b8a34f..e5a84b4 100755
--- a/config_files/PyQt-4.5.4.sh
+++ b/config_files/PyQt-4.5.4.sh
@@ -12,6 +12,12 @@
 #
 ####################################################################################
 
+#
+# PyQt version
+#
+PYQT_VERSION=4.5.4
+PYQT_XVERSION=`echo ${PYQT_VERSION} | awk -F. '{printf("%d",$1*10000+$2*100+$3)}'`
+
 check_version()
 {
 if [ -n "${PYQTDIR}" ] && [ -f ${PYQTDIR}/pyqtconfig.py ] ; then
@@ -21,7 +27,7 @@ if [ -n "${PYQTDIR}" ] && [ -f ${PYQTDIR}/pyqtconfig.py ] ; then
 	min_ver=`echo $ver | awk -F. '{if(NF>1) print $2; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'`
 	rel_ver=`echo $ver | awk -F. '{if(NF>2) print $3; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'`
 	let ver=$maj_ver*10000+$min_ver*100+$rel_ver
-	if [ $ver -eq 040403 ] ; then
+	if [ $ver -eq ${PYQT_XVERSION} ] ; then
 	    return 0
 	fi
     fi
@@ -83,8 +89,9 @@ cd ${PRODUCT_SRC_DIR}
 
 # configure
 
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
-    python configure.py -b ${PRODUCT_DIR}/bin -d ${PRODUCT_DIR} -v ${PRODUCT_DIR}/sip -p ${PRODUCT_DIR}/plugins --confirm-license
+PYQT_CONFIGURE_OPTIONS="-b ${PRODUCT_DIR}/bin -d ${PRODUCT_DIR} -v ${PRODUCT_DIR}/sip -p ${PRODUCT_DIR}/plugins --confirm-license"
+
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG python ./configure.py ${PYQT_CONFIGURE_OPTIONS}
 
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
@@ -154,7 +161,7 @@ export INSTALL_PRODUCTS=$7;
 shift
 REMOVE_SRC_TMP=$8;
 test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="PyQt-4.5.4"
+export PRODUCT="PyQt-${PYQT_VERSION}"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
diff --git a/config_files/sip-4.8.2.sh b/config_files/sip-4.8.2.sh
index 8060756..7e157a2 100755
--- a/config_files/sip-4.8.2.sh
+++ b/config_files/sip-4.8.2.sh
@@ -12,6 +12,12 @@
 #
 ####################################################################################
 
+#
+# sip version
+#
+SIP_VERSION=4.8.2
+SIP_XVERSION=`echo ${SIP_VERSION} | awk -F. '{printf("%d",$1*10000+$2*100+$3)}'`
+
 check_version()
 {
 if [ -n "${SIPDIR}" ]; then
@@ -20,7 +26,7 @@ if [ -n "${SIPDIR}" ]; then
     min_ver=`echo $ver | awk -F. '{if(NF>1) print $2; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'`
     rel_ver=`echo $ver | awk -F. '{if(NF>2) print $3; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'`
     let ver=$maj_ver*10000+$min_ver*100+$rel_ver
-    if [ $ver -eq 40502 ] ; then
+    if [ $ver -eq ${SIP_XVERSION} ] ; then
 	return 0
     fi
 fi
@@ -78,14 +84,15 @@ install_source
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 cd ${PRODUCT_SRC_DIR}
 
+SIP_CONFIGURE_OPTIONS="-b ${PRODUCT_DIR}/bin"
+SIP_CONFIGURE_OPTIONS="${SIP_CONFIGURE_OPTIONS} -d ${PRODUCT_DIR}/lib/python${PYTHON_VERSION}/site-packages"
+SIP_CONFIGURE_OPTIONS="${SIP_CONFIGURE_OPTIONS} -e ${PRODUCT_DIR}/include/python${PYTHON_VERSION}"
+SIP_CONFIGURE_OPTIONS="${SIP_CONFIGURE_OPTIONS} -v ${PRODUCT_DIR}/sip"
 if test `uname -m` = "x86_64" ; then
-    SIP_CONFIGURE_OPTIONS="-b ${PRODUCT_DIR}/bin -d ${PRODUCT_DIR}/lib/python${PYTHON_VERSION}/site-packages -e ${PRODUCT_DIR}/include/python${PYTHON_VERSION} -v ${PRODUCT_DIR}/sip -p linux-g++-64"
-else
-    SIP_CONFIGURE_OPTIONS="-b ${PRODUCT_DIR}/bin -d ${PRODUCT_DIR}/lib/python${PYTHON_VERSION}/site-packages -e ${PRODUCT_DIR}/include/python${PYTHON_VERSION} -v ${PRODUCT_DIR}/sip"
+    SIP_CONFIGURE_OPTIONS="${SIP_CONFIGURE_OPTIONS} -p linux-g++-64"
 fi
 
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
-    python configure.py $SIP_CONFIGURE_OPTIONS
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG python ./configure.py ${SIP_CONFIGURE_OPTIONS}
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC
@@ -114,10 +121,12 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 
+SIP_CONFIGURE_OPTIONS="-b ${PRODUCT_DIR}/bin"
+SIP_CONFIGURE_OPTIONS="${SIP_CONFIGURE_OPTIONS} -d ${PRODUCT_DIR}/lib/python${PYTHON_VERSION}/site-packages"
+SIP_CONFIGURE_OPTIONS="${SIP_CONFIGURE_OPTIONS} -e ${PRODUCT_DIR}/include/python${PYTHON_VERSION}"
+SIP_CONFIGURE_OPTIONS="${SIP_CONFIGURE_OPTIONS} -v ${PRODUCT_DIR}/sip"
 if test `uname -m` = "x86_64" ; then
-    SIP_CONFIGURE_OPTIONS="-b ${PRODUCT_DIR}/bin -d ${PRODUCT_DIR}/lib/python${PYTHON_VERSION}/site-packages -e ${PRODUCT_DIR}/include/python${PYTHON_VERSION} -v ${PRODUCT_DIR}/sip -p linux-g++-64"
-else
-    SIP_CONFIGURE_OPTIONS="-b ${PRODUCT_DIR}/bin -d ${PRODUCT_DIR}/lib/python${PYTHON_VERSION}/site-packages -e ${PRODUCT_DIR}/include/python${PYTHON_VERSION} -v ${PRODUCT_DIR}/sip"
+    SIP_CONFIGURE_OPTIONS="${SIP_CONFIGURE_OPTIONS} -p linux-g++-64"
 fi
 
 # modify sipconfig.py file
@@ -160,7 +169,7 @@ export INSTALL_PRODUCTS=$7;
 shift
 REMOVE_SRC_TMP=$8;
 test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="sip-4.8.2"
+export PRODUCT="sip-${SIP_VERSION}"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC