SALOME 6.5.0 preparation: sip 4.10.2 -> 4.13.2, PyQt 4.7.3 -> 4.9.1, QScintilla 2...

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index 7d066131f09d89dda0bcb2076bb71b01bda443b1..470f1ca0210eca4408f62b40cece0646dd969da6 100755 (executable)
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -396,7 +396,7 @@
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="CentOS 5.5 64bit"
-                    version="4.10.2" 
+                    version="4.13.2" 
                    disable="false"
                    installdiskspace="308,1450,2476"
                    script="sip.sh"/>
@@ -405,7 +405,7 @@
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="CentOS 5.5 64bit"
-                    version="4.7.3" 
+                    version="4.9.1" 
                    disable="false"
                    installdiskspace="14884,28844,120520"
                    script="PyQt.sh"/>
@@ -414,7 +414,7 @@
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="CentOS 5.5 64bit"
-                    version="2.4.3" 
+                    version="2.6.1" 
                    disable="false"
                    installdiskspace="3228,15692,24220"
                    script="qscintilla.sh"/>

diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml
index 02f579542f2e9b577a7506468eaa1bd83a72eb8e..993af9e4b581caf6f22d86740a3d9e8108a1a8f6 100755 (executable)
--- a/config_Debian_4.0.xml
+++ b/config_Debian_4.0.xml
@@ -396,7 +396,7 @@
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="Debian 4.0"
-                    version="4.10.2" 
+                    version="4.13.2" 
                    disable="false"
                    installdiskspace="308,1450,2476"
                    script="sip.sh"/>
@@ -405,7 +405,7 @@
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="Debian 4.0"
-                    version="4.7.3" 
+                    version="4.9.1" 
                    disable="false"
                    installdiskspace="14884,28844,120520"
                    script="PyQt.sh"/>
@@ -414,7 +414,7 @@
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="Debian 4.0"
-                    version="2.4.3" 
+                    version="2.6.1" 
                    disable="false"
                    installdiskspace="3228,15692,24220"
                    script="qscintilla.sh"/>

diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index 5aa0a867835812d3a7fb44e869c5244ce7b2023a..4ba52efb24cdfe3a57e8f4715ae592bc1b30c691 100755 (executable)
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -396,7 +396,7 @@
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="Debian 4.0 64bit"
-                    version="4.10.2" 
+                    version="4.13.2" 
                    disable="false"
                    installdiskspace="308,1450,2476"
                    script="sip.sh"/>
@@ -405,7 +405,7 @@
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="Debian 4.0 64bit"
-                    version="4.7.3" 
+                    version="4.9.1" 
                    disable="false"
                    installdiskspace="14884,28844,120520"
                    script="PyQt.sh"/>
@@ -414,7 +414,7 @@
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="Debian 4.0 64bit"
-                    version="2.4.3" 
+                    version="2.6.1" 
                    disable="false"
                    installdiskspace="3228,15692,24220"
                    script="qscintilla.sh"/>

diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml
index 87dbdb468cc4aef7e8d2c2832bad75292819da39..f7fdff05370b84cea623af2052734bdbd7db9b52 100755 (executable)
--- a/config_Debian_5.0_64bit.xml
+++ b/config_Debian_5.0_64bit.xml
@@ -396,7 +396,7 @@
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="Debian 5.0 64bit"
-                    version="4.10.2" 
+                    version="4.13.2" 
                    disable="false"
                    installdiskspace="308,1450,2476"
                    script="sip.sh"/>
@@ -405,7 +405,7 @@
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="Debian 5.0 64bit"
-                    version="4.7.3" 
+                    version="4.9.1" 
                    disable="false"
                    installdiskspace="14884,28844,120520"
                    script="PyQt.sh"/>
@@ -414,7 +414,7 @@
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="Debian 5.0 64bit"
-                    version="2.4.3" 
+                    version="2.6.1" 
                    disable="false"
                    installdiskspace="3228,15692,24220"
                    script="qscintilla.sh"/>

diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index 42569cda85100a10739158a53f81a72b6511ec54..22bef65141a6fde7a0fe892c8edc27ff5118537a 100755 (executable)
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -396,7 +396,7 @@
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="Debian 6.0 64bit"
-                    version="4.10.2" 
+                    version="4.13.2" 
                    disable="false"
                    installdiskspace="308,1450,2476"
                    script="sip.sh"/>
@@ -405,7 +405,7 @@
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="Debian 6.0 64bit"
-                    version="4.7.3" 
+                    version="4.9.1" 
                    disable="false"
                    installdiskspace="14884,28844,120520"
                    script="PyQt.sh"/>
@@ -414,7 +414,7 @@
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="Debian 6.0 64bit"
-                    version="2.4.3" 
+                    version="2.6.1" 
                    disable="false"
                    installdiskspace="3228,15692,24220"
                    script="qscintilla.sh"/>

diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index d01061f152cb6ccd48e259230b42903e5a08d2d4..0c6542004a8109a87b2e5a596870872df30e2306 100755 (executable)
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -396,7 +396,7 @@
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="Mandriva 2008.0"
-                    version="4.10.2" 
+                    version="4.13.2" 
                    disable="false"
                    installdiskspace="308,1450,2476"
                    script="sip.sh"/>
@@ -405,7 +405,7 @@
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="Mandriva 2008.0"
-                    version="4.7.3" 
+                    version="4.9.1" 
                    disable="false"
                    installdiskspace="14884,28844,120520"
                    script="PyQt.sh"/>
@@ -414,7 +414,7 @@
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="Mandriva 2008.0"
-                    version="2.4.3" 
+                    version="2.6.1" 
                    disable="false"
                    installdiskspace="3228,15692,24220"
                    script="qscintilla.sh"/>

diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml
index a93aec223e2a12dd21c3a16e9990f6d65de989e7..ac0242d08c788c2a3672b65914f3724bde4d9c02 100755 (executable)
--- a/config_Mandriva_2008.0_64bit.xml
+++ b/config_Mandriva_2008.0_64bit.xml
@@ -396,7 +396,7 @@
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="Mandriva 2008.0 64bit"
-                    version="4.10.2" 
+                    version="4.13.2" 
                    disable="false"
                    installdiskspace="308,1450,2476"
                    script="sip.sh"/>
@@ -405,7 +405,7 @@
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="Mandriva 2008.0 64bit"
-                    version="4.7.3" 
+                    version="4.9.1" 
                    disable="false"
                    installdiskspace="14884,28844,120520"
                    script="PyQt.sh"/>
@@ -414,7 +414,7 @@
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="Mandriva 2008.0 64bit"
-                    version="2.4.3" 
+                    version="2.6.1" 
                    disable="false"
                    installdiskspace="3228,15692,24220"
                    script="qscintilla.sh"/>

diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index d17c84f09c742049d0e8870c1713298fe3bdbd5e..bd37110d9ba3b13280af3120c00b40cf1e26571d 100755 (executable)
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -396,7 +396,7 @@
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="Mandriva 2010.0"
-                    version="4.10.2" 
+                    version="4.13.2" 
                    disable="false"
                    installdiskspace="308,1450,2476"
                    script="sip.sh"/>
@@ -405,7 +405,7 @@
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="Mandriva 2010.0"
-                    version="4.7.3" 
+                    version="4.9.1" 
                    disable="false"
                    installdiskspace="14884,28844,120520"
                    script="PyQt.sh"/>
@@ -414,7 +414,7 @@
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="Mandriva 2010.0"
-                    version="2.4.3" 
+                    version="2.6.1" 
                    disable="false"
                    installdiskspace="3228,15692,24220"
                    script="qscintilla.sh"/>

diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index 91fd832d3cc8ae22aff477422ebe2e5eafa90eea..28a0ce40f8a8c0d8443de0b4c26850cea2d9b633 100755 (executable)
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -396,7 +396,7 @@
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="Mandriva 2010.0 64bit"
-                    version="4.10.2" 
+                    version="4.13.2" 
                    disable="false"
                    installdiskspace="308,1450,2476"
                    script="sip.sh"/>
@@ -405,7 +405,7 @@
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="Mandriva 2010.0 64bit"
-                    version="4.7.3" 
+                    version="4.9.1" 
                    disable="false"
                    installdiskspace="14884,28844,120520"
                    script="PyQt.sh"/>
@@ -414,7 +414,7 @@
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="Mandriva 2010.0 64bit"
-                    version="2.4.3" 
+                    version="2.6.1" 
                    disable="false"
                    installdiskspace="3228,15692,24220"
                    script="qscintilla.sh"/>

diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml
index cc00021bf174ca151838f3437281e18839111c5e..670b0955e32c69e6854b7a0bb76e930eb2d85750 100755 (executable)
--- a/config_Red_Hat_Enterprise_WS_4_64bit.xml
+++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml
@@ -396,7 +396,7 @@
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="Red Hat Enterprise WS 4 64bit"
-                    version="4.10.2" 
+                    version="4.13.2" 
                    disable="false"
                    installdiskspace="308,1450,2476"
                    script="sip.sh"/>
@@ -405,7 +405,7 @@
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="Red Hat Enterprise WS 4 64bit"
-                    version="4.7.3" 
+                    version="4.9.1" 
                    disable="false"
                    installdiskspace="14884,28844,120520"
                    script="PyQt.sh"/>
@@ -414,7 +414,7 @@
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="Red Hat Enterprise WS 4 64bit"
-                    version="2.4.3" 
+                    version="2.6.1" 
                    disable="false"
                    installdiskspace="3228,15692,24220"
                    script="qscintilla.sh"/>

diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml
index edebcbd4f4ac20f4ff9191d4a548bba971102320..ee45dfc2e3fd5b0bbf20a99bf00274d0efcd8688 100755 (executable)
--- a/config_Scientific_SL_5.1_64bit.xml
+++ b/config_Scientific_SL_5.1_64bit.xml
@@ -396,7 +396,7 @@
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="Scientific SL 5.1 64bit"
-                    version="4.10.2" 
+                    version="4.13.2" 
                    disable="false"
                    installdiskspace="308,1450,2476"
                    script="sip.sh"/>
@@ -405,7 +405,7 @@
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="Scientific SL 5.1 64bit"
-                    version="4.7.3" 
+                    version="4.9.1" 
                    disable="false"
                    installdiskspace="14884,28844,120520"
                    script="PyQt.sh"/>
@@ -414,7 +414,7 @@
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="Scientific SL 5.1 64bit"
-                    version="2.4.3" 
+                    version="2.6.1" 
                    disable="false"
                    installdiskspace="3228,15692,24220"
                    script="qscintilla.sh"/>

diff --git a/config_files/PyQt.sh b/config_files/PyQt.sh
index 3499af69a017432e4e526b24abf8d6e56cc3c27e..8954bf2051f25933de00332e10f7db7fceedf1d2 100755 (executable)
--- a/config_files/PyQt.sh
+++ b/config_files/PyQt.sh
@@ -15,7 +15,7 @@
 #
 # PyQt version
 #
-PYQT_VERSION=4.7.3
+PYQT_VERSION=4.9.1
 PYQT_XVERSION=`echo ${PYQT_VERSION} | awk -F. '{printf("%d",$1*10000+$2*100+$3)}'`
 
 check_version()

diff --git a/config_files/qscintilla.sh b/config_files/qscintilla.sh
index b118e5f6f08f8b779add02c83b8efb785a3a6adf..e4241d913b64b4838a2fea2feff9b4ed5809ea4b 100755 (executable)
--- a/config_files/qscintilla.sh
+++ b/config_files/qscintilla.sh
@@ -15,7 +15,7 @@
 #
 # QSCINTILLA  version
 #
-QSCINTILLA_VERSION=2.4.3
+QSCINTILLA_VERSION=2.6.1
 
 check_version(){
 if [ -z "${QSCINTILLA_DIR}" ]; then

diff --git a/config_files/sip.sh b/config_files/sip.sh
index 1b8ba04ea19fb1b58046a1491e6c82c7fa045328..9e79651497d11a7cdc3ec0053fa167495f8132d2 100755 (executable)
--- a/config_files/sip.sh
+++ b/config_files/sip.sh
@@ -15,7 +15,7 @@
 #
 # sip version
 #
-SIP_VERSION=4.10.2
+SIP_VERSION=4.13.2
 SIP_XVERSION=`echo ${SIP_VERSION} | awk -F. '{printf("%d",$1*10000+$2*100+$3)}'`
 
 check_version()