Salome HOME
Rollback products: qt -> 4.4.3, sip -> 4.7.7, PyQt -> 4.4.3, qwt -> 5.1.1, QScintilla...
authorvsr <vsr@opencascade.com>
Mon, 15 Jun 2009 13:53:38 +0000 (13:53 +0000)
committervsr <vsr@opencascade.com>
Mon, 15 Jun 2009 13:53:38 +0000 (13:53 +0000)
36 files changed:
README
config_Debian_3.1.xml
config_Debian_4.0.xml
config_Debian_4.0_64bit.xml
config_Mandriva_2006.0.xml
config_Mandriva_2006.0_64bit.xml
config_Mandriva_2008.0.xml
config_Mandriva_2008.0_64bit.xml
config_files/PyQt-4.4.3.sh [new file with mode: 0755]
config_files/PyQt-4.4.4.sh [deleted file]
config_files/build.csh
config_files/build.sh
config_files/common.sh
config_files/qscintilla-2.3.2.sh [deleted file]
config_files/qscintilla-2.3.sh [new file with mode: 0755]
config_files/qt-4.4.3.sh [new file with mode: 0755]
config_files/qt-4.5.0.sh [deleted file]
config_files/qt-4.5.1.sh [deleted file]
config_files/qwt-5.1.1.sh [new file with mode: 0755]
config_files/qwt-5.2.0.sh [deleted file]
config_files/sip-4.7.7.sh [new file with mode: 0755]
config_files/sip-4.7.9.sh [deleted file]
doc/batchmode.png
doc/choicepage.png
doc/directorypage.png
doc/installtypepage.png
doc/intropage.png
doc/platformpage.png
doc/productpage1.png
doc/productpage2.png
doc/productpage3.png
doc/productpage4.png
doc/progresspage1.png
doc/progresspage2.png
doc/readme.html
doc/readmepage.png

diff --git a/README b/README
index 0b3dd510c2daed3c8c61f8e4ea7de365e9c43107..094ca893c58510a7fd5b493aeb59899e5f285903 100644 (file)
--- a/README
+++ b/README
 
                ./build.csh
 
 
                ./build.csh
 
-          By default, build.csh only compiles the modules but does not install them,
-          i.e. does not perform 'make install' step.
-          To do this, use -i option or -p <prefix> where <prefix> is the
+          By default, build.csh builds and installs all SALOME
+          modules. All modules are installed to the INSTALL subfolder
+          of the current directory. If you need to change the installation
+          directory, you can use -p <prefix> option where <prefix> is the
           directory SALOME modules should be installed to.
 
           directory SALOME modules should be installed to.
 
-          If you want to build only some SALOME modules, just pass them as 
-          parameters, e.g.:
+          If you want to build only some subset of SALOME modules,
+          just pass them as parameters, e.g.:
 
 
-               ./build.csh -i KERNEL MED GEOM
+               ./build.csh -p /home/user/salome KERNEL MED GEOM
 
           The script also provides other options which specify compiling and 
           installation parameters. You can learn about these options by using
 
           The script also provides other options which specify compiling and 
           installation parameters. You can learn about these options by using
                ./build.csh -h
 
           When you run build.csh for the first time it is not necessary to pass 
                ./build.csh -h
 
           When you run build.csh for the first time it is not necessary to pass 
-          -b, -c parameters. The script detects if build procedure has not yet
+          -b or -c parameters. The script detects if build procedure has not yet
           been performed and in this case runs build_configure, configure scripts
           automatically.
 
           been performed and in this case runs build_configure, configure scripts
           automatically.
 
           Note: use -d option carefully because in this case the script removes
           the existing (previously installed) SALOME modules.
 
           Note: use -d option carefully because in this case the script removes
           the existing (previously installed) SALOME modules.
 
-          Note: please, take into your account that 'make install' step is
-          obligatory for the KERNEL module. Build directory of KERNEL
-          can not be indicated as KERNEL_ROOT_DIR. This is an exception
-          for the SALOME modules. So you should use either option -i
-          or -p of build.sch script when building KERNEL module.
-
           Note: build.(c)sh scripts do not modify the environment files
           (env_products.csh, etc). You should do it by yourself.
 
           Note: build.(c)sh scripts do not modify the environment files
           (env_products.csh, etc). You should do it by yourself.
 
index dd355320539bdbc1b88152a045f64417b6f55b17..531ce0a7b31820bb4a868d0f1b29ce1f2e9a1de6 100755 (executable)
             type="prerequisite"
             description="Multiplatform C++ GUI application framework">
       <installation os="Debian 3.1"
             type="prerequisite"
             description="Multiplatform C++ GUI application framework">
       <installation os="Debian 3.1"
-                    version="4.5.0
+                    version="4.4.3
                    disable="false"
                    installdiskspace="56161,63120,217501"
                    disable="false"
                    installdiskspace="56161,63120,217501"
-                   script="qt-4.5.0.sh"/>
+                   script="qt-4.4.3.sh"/>
     </product>
     <product name="QScintilla" 
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="Debian 3.1"
     </product>
     <product name="QScintilla" 
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="Debian 3.1"
-                    version="2.3.2
+                    version="2.3" 
                    disable="false"
                    installdiskspace="56161,63120,217501"
                    disable="false"
                    installdiskspace="56161,63120,217501"
-                   script="qscintilla-2.3.2.sh"/>
+                   script="qscintilla-2.3.sh"/>
     </product>
     <product name="Sip"
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="Debian 3.1"
     </product>
     <product name="Sip"
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="Debian 3.1"
-                    version="4.7.9
+                    version="4.7.7
                    disable="false"
                    installdiskspace="308,1450,2476"
                    disable="false"
                    installdiskspace="308,1450,2476"
-                   script="sip-4.7.9.sh"/>
+                   script="sip-4.7.7.sh"/>
     </product>
     <product name="PyQt"
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="Debian 3.1"
     </product>
     <product name="PyQt"
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="Debian 3.1"
-                    version="4.4.4
+                    version="4.4.3
                    disable="false"
                    installdiskspace="15914,3936,76034"
                    disable="false"
                    installdiskspace="15914,3936,76034"
-                   script="PyQt-4.4.4.sh"/>
+                   script="PyQt-4.4.3.sh"/>
     </product>
     <product name="boost"
             type="prerequisite"
     </product>
     <product name="boost"
             type="prerequisite"
             type="prerequisite"
              description="2-D plotting extension for Qt library">
       <installation os="Debian 3.1"
             type="prerequisite"
              description="2-D plotting extension for Qt library">
       <installation os="Debian 3.1"
-                    version="5.2.0
+                    version="5.1.1
                    disable="false"
                    installdiskspace="1034,7200,13134"
                    disable="false"
                    installdiskspace="1034,7200,13134"
-                   script="qwt-5.2.0.sh"/>
+                   script="qwt-5.1.1.sh"/>
     </product>
     <product name="OmniORB"
             type="prerequisite"
     </product>
     <product name="OmniORB"
             type="prerequisite"
index 834908b65a1912c4d249ff386b13fd75c8de5a92..8459cb9b0af982e887abf30ea1366037e1722755 100755 (executable)
             type="prerequisite"
             description="Multiplatform C++ GUI application framework">
       <installation os="Debian 4.0"
             type="prerequisite"
             description="Multiplatform C++ GUI application framework">
       <installation os="Debian 4.0"
-                    version="4.5.0
+                    version="4.4.3
                    disable="false"
                    installdiskspace="56161,63120,217501"
                    disable="false"
                    installdiskspace="56161,63120,217501"
-                   script="qt-4.5.0.sh"/>
+                   script="qt-4.4.3.sh"/>
     </product>
     <product name="QScintilla" 
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="Debian 4.0"
     </product>
     <product name="QScintilla" 
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="Debian 4.0"
-                    version="2.3.2
+                    version="2.3" 
                    disable="false"
                    installdiskspace="56161,63120,217501"
                    disable="false"
                    installdiskspace="56161,63120,217501"
-                   script="qscintilla-2.3.2.sh"/>
+                   script="qscintilla-2.3.sh"/>
     </product>
     <product name="Sip"
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="Debian 4.0"
     </product>
     <product name="Sip"
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="Debian 4.0"
-                    version="4.7.9
+                    version="4.7.7
                    disable="false"
                    installdiskspace="308,1450,2476"
                    disable="false"
                    installdiskspace="308,1450,2476"
-                   script="sip-4.7.9.sh"/>
+                   script="sip-4.7.7.sh"/>
     </product>
     <product name="PyQt"
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="Debian 4.0"
     </product>
     <product name="PyQt"
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="Debian 4.0"
-                    version="4.4.4
+                    version="4.4.3
                    disable="false"
                    installdiskspace="15914,3936,76034"
                    disable="false"
                    installdiskspace="15914,3936,76034"
-                   script="PyQt-4.4.4.sh"/>
+                   script="PyQt-4.4.3.sh"/>
     </product>
     <product name="boost"
             type="prerequisite"
     </product>
     <product name="boost"
             type="prerequisite"
             type="prerequisite"
              description="2-D plotting extension for Qt library">
       <installation os="Debian 4.0"
             type="prerequisite"
              description="2-D plotting extension for Qt library">
       <installation os="Debian 4.0"
-                    version="5.2.0
+                    version="5.1.1
                    disable="false"
                    installdiskspace="1034,7200,13134"
                    disable="false"
                    installdiskspace="1034,7200,13134"
-                   script="qwt-5.2.0.sh"/>
+                   script="qwt-5.1.1.sh"/>
     </product>
     <product name="OmniORB"
             type="prerequisite"
     </product>
     <product name="OmniORB"
             type="prerequisite"
index 67d5576cb5165fd5d7fc947fd19a30b1954307d6..fec9be065a2931943dc5669c8f007bd6391c02a6 100755 (executable)
             type="prerequisite"
             description="Multiplatform C++ GUI application framework">
       <installation os="Debian 4.0 64bit"
             type="prerequisite"
             description="Multiplatform C++ GUI application framework">
       <installation os="Debian 4.0 64bit"
-                    version="4.5.0
+                    version="4.4.3
                    disable="false"
                    installdiskspace="56161,63120,217501"
                    disable="false"
                    installdiskspace="56161,63120,217501"
-                   script="qt-4.5.0.sh"/>
+                   script="qt-4.4.3.sh"/>
     </product>
     <product name="QScintilla" 
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="Debian 4.0 64bit"
     </product>
     <product name="QScintilla" 
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="Debian 4.0 64bit"
-                    version="2.3.2
+                    version="2.3" 
                    disable="false"
                    installdiskspace="56161,63120,217501"
                    disable="false"
                    installdiskspace="56161,63120,217501"
-                   script="qscintilla-2.3.2.sh"/>
+                   script="qscintilla-2.3.sh"/>
     </product>
     <product name="Sip"
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="Debian 4.0 64bit"
     </product>
     <product name="Sip"
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="Debian 4.0 64bit"
-                    version="4.7.9
+                    version="4.7.7
                    disable="false"
                    installdiskspace="308,1450,2476"
                    disable="false"
                    installdiskspace="308,1450,2476"
-                   script="sip-4.7.9.sh"/>
+                   script="sip-4.7.7.sh"/>
     </product>
     <product name="PyQt"
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="Debian 4.0 64bit"
     </product>
     <product name="PyQt"
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="Debian 4.0 64bit"
-                    version="4.4.4
+                    version="4.4.3
                    disable="false"
                    installdiskspace="15914,3936,76034"
                    disable="false"
                    installdiskspace="15914,3936,76034"
-                   script="PyQt-4.4.4.sh"/>
+                   script="PyQt-4.4.3.sh"/>
     </product>
     <product name="boost"
             type="prerequisite"
     </product>
     <product name="boost"
             type="prerequisite"
             type="prerequisite"
              description="2-D plotting extension for Qt library">
       <installation os="Debian 4.0 64bit"
             type="prerequisite"
              description="2-D plotting extension for Qt library">
       <installation os="Debian 4.0 64bit"
-                    version="5.2.0
+                    version="5.1.1
                    disable="false"
                    installdiskspace="1034,7200,13134"
                    disable="false"
                    installdiskspace="1034,7200,13134"
-                   script="qwt-5.2.0.sh"/>
+                   script="qwt-5.1.1.sh"/>
     </product>
     <product name="OmniORB"
             type="prerequisite"
     </product>
     <product name="OmniORB"
             type="prerequisite"
index 08cf5c382c5172055d5c934f6414687f8230c2ca..ff9656bc7563ddfcb9c783fd745175fa51ba5f65 100755 (executable)
             type="prerequisite"
             description="Multiplatform C++ GUI application framework">
       <installation os="Mandriva 2006.0"
             type="prerequisite"
             description="Multiplatform C++ GUI application framework">
       <installation os="Mandriva 2006.0"
-                    version="4.5.0
+                    version="4.4.3
                    disable="false"
                    installdiskspace="56161,63120,217501"
                    disable="false"
                    installdiskspace="56161,63120,217501"
-                   script="qt-4.5.0.sh"/>
+                   script="qt-4.4.3.sh"/>
     </product>
     <product name="QScintilla" 
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="Mandriva 2006.0"
     </product>
     <product name="QScintilla" 
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="Mandriva 2006.0"
-                    version="2.3.2
+                    version="2.3" 
                    disable="false"
                    installdiskspace="56161,63120,217501"
                    disable="false"
                    installdiskspace="56161,63120,217501"
-                   script="qscintilla-2.3.2.sh"/>
+                   script="qscintilla-2.3.sh"/>
     </product>
     <product name="Sip"
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="Mandriva 2006.0"
     </product>
     <product name="Sip"
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="Mandriva 2006.0"
-                    version="4.7.9
+                    version="4.7.7
                    disable="false"
                    installdiskspace="308,1450,2476"
                    disable="false"
                    installdiskspace="308,1450,2476"
-                   script="sip-4.7.9.sh"/>
+                   script="sip-4.7.7.sh"/>
     </product>
     <product name="PyQt"
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="Mandriva 2006.0"
     </product>
     <product name="PyQt"
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="Mandriva 2006.0"
-                    version="4.4.4
+                    version="4.4.3
                    disable="false"
                    installdiskspace="15914,3936,76034"
                    disable="false"
                    installdiskspace="15914,3936,76034"
-                   script="PyQt-4.4.4.sh"/>
+                   script="PyQt-4.4.3.sh"/>
     </product>
     <product name="boost"
             type="prerequisite"
     </product>
     <product name="boost"
             type="prerequisite"
             type="prerequisite"
              description="2-D plotting extension for Qt library">
       <installation os="Mandriva 2006.0"
             type="prerequisite"
              description="2-D plotting extension for Qt library">
       <installation os="Mandriva 2006.0"
-                    version="5.2.0
+                    version="5.1.1
                    disable="false"
                    installdiskspace="1034,7200,13134"
                    disable="false"
                    installdiskspace="1034,7200,13134"
-                   script="qwt-5.2.0.sh"/>
+                   script="qwt-5.1.1.sh"/>
     </product>
     <product name="OmniORB"
             type="prerequisite"
     </product>
     <product name="OmniORB"
             type="prerequisite"
index 94c42962b294547f6b0d9d30d76a8c63d10ccf8a..1ee247d6a5c31edd3680079d5968e4f7acae4a10 100755 (executable)
             type="prerequisite"
             description="Multiplatform C++ GUI application framework">
       <installation os="Mandriva 2006.0 64bit"
             type="prerequisite"
             description="Multiplatform C++ GUI application framework">
       <installation os="Mandriva 2006.0 64bit"
-                    version="4.5.0
+                    version="4.4.3
                    disable="false"
                    installdiskspace="56161,63120,217501"
                    disable="false"
                    installdiskspace="56161,63120,217501"
-                   script="qt-4.5.0.sh"/>
+                   script="qt-4.4.3.sh"/>
     </product>
     <product name="QScintilla" 
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="Mandriva 2006.0 64bit"
     </product>
     <product name="QScintilla" 
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="Mandriva 2006.0 64bit"
-                    version="2.3.2
+                    version="2.3" 
                    disable="false"
                    installdiskspace="56161,63120,217501"
                    disable="false"
                    installdiskspace="56161,63120,217501"
-                   script="qscintilla-2.3.2.sh"/>
+                   script="qscintilla-2.3.sh"/>
     </product>
     <product name="Sip"
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="Mandriva 2006.0 64bit"
     </product>
     <product name="Sip"
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="Mandriva 2006.0 64bit"
-                    version="4.7.9
+                    version="4.7.7
                    disable="false"
                    installdiskspace="308,1450,2476"
                    disable="false"
                    installdiskspace="308,1450,2476"
-                   script="sip-4.7.9.sh"/>
+                   script="sip-4.7.7.sh"/>
     </product>
     <product name="PyQt"
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="Mandriva 2006.0 64bit"
     </product>
     <product name="PyQt"
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="Mandriva 2006.0 64bit"
-                    version="4.4.4
+                    version="4.4.3
                    disable="false"
                    installdiskspace="15914,3936,76034"
                    disable="false"
                    installdiskspace="15914,3936,76034"
-                   script="PyQt-4.4.4.sh"/>
+                   script="PyQt-4.4.3.sh"/>
     </product>
     <product name="boost"
             type="prerequisite"
     </product>
     <product name="boost"
             type="prerequisite"
             type="prerequisite"
              description="2-D plotting extension for Qt library">
       <installation os="Mandriva 2006.0 64bit"
             type="prerequisite"
              description="2-D plotting extension for Qt library">
       <installation os="Mandriva 2006.0 64bit"
-                    version="5.2.0
+                    version="5.1.1
                    disable="false"
                    installdiskspace="1034,7200,13134"
                    disable="false"
                    installdiskspace="1034,7200,13134"
-                   script="qwt-5.2.0.sh"/>
+                   script="qwt-5.1.1.sh"/>
     </product>
     <product name="OmniORB"
             type="prerequisite"
     </product>
     <product name="OmniORB"
             type="prerequisite"
index 0395c4631e0f566938ee49cd45924ff020d37c01..9a31d51a3a56f5c39e8d76877fc5d305d5edd893 100755 (executable)
             type="prerequisite"
             description="Multiplatform C++ GUI application framework">
       <installation os="Mandriva 2008.0"
             type="prerequisite"
             description="Multiplatform C++ GUI application framework">
       <installation os="Mandriva 2008.0"
-                    version="4.5.0
+                    version="4.4.3
                    disable="false"
                    installdiskspace="56161,63120,217501"
                    disable="false"
                    installdiskspace="56161,63120,217501"
-                   script="qt-4.5.0.sh"/>
+                   script="qt-4.4.3.sh"/>
     </product>
     <product name="QScintilla" 
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="Mandriva 2008.0"
     </product>
     <product name="QScintilla" 
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="Mandriva 2008.0"
-                    version="2.3.2
+                    version="2.3" 
                    disable="false"
                    installdiskspace="56161,63120,217501"
                    disable="false"
                    installdiskspace="56161,63120,217501"
-                   script="qscintilla-2.3.2.sh"/>
+                   script="qscintilla-2.3.sh"/>
     </product>
     <product name="Sip"
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="Mandriva 2008.0"
     </product>
     <product name="Sip"
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="Mandriva 2008.0"
-                    version="4.7.9
+                    version="4.7.7
                    disable="false"
                    installdiskspace="308,1450,2476"
                    disable="false"
                    installdiskspace="308,1450,2476"
-                   script="sip-4.7.9.sh"/>
+                   script="sip-4.7.7.sh"/>
     </product>
     <product name="PyQt"
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="Mandriva 2008.0"
     </product>
     <product name="PyQt"
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="Mandriva 2008.0"
-                    version="4.4.4
+                    version="4.4.3
                    disable="false"
                    installdiskspace="15914,3936,76034"
                    disable="false"
                    installdiskspace="15914,3936,76034"
-                   script="PyQt-4.4.4.sh"/>
+                   script="PyQt-4.4.3.sh"/>
     </product>
     <product name="boost"
             type="prerequisite"
     </product>
     <product name="boost"
             type="prerequisite"
             type="prerequisite"
              description="2-D plotting extension for Qt library">
       <installation os="Mandriva 2008.0"
             type="prerequisite"
              description="2-D plotting extension for Qt library">
       <installation os="Mandriva 2008.0"
-                    version="5.2.0
+                    version="5.1.1
                    disable="false"
                    installdiskspace="1034,7200,13134"
                    disable="false"
                    installdiskspace="1034,7200,13134"
-                   script="qwt-5.2.0.sh"/>
+                   script="qwt-5.1.1.sh"/>
     </product>
     <product name="OmniORB"
             type="prerequisite"
     </product>
     <product name="OmniORB"
             type="prerequisite"
index 18e6741636bf87db89f26cbd480c3b697735271e..71796649ef756284aebaa567c153ff6ac9cda375 100755 (executable)
             type="prerequisite"
             description="Multiplatform C++ GUI application framework">
       <installation os="Mandriva 2008.0 64bit"
             type="prerequisite"
             description="Multiplatform C++ GUI application framework">
       <installation os="Mandriva 2008.0 64bit"
-                    version="4.5.0
+                    version="4.4.3
                    disable="false"
                    installdiskspace="56161,63120,217501"
                    disable="false"
                    installdiskspace="56161,63120,217501"
-                   script="qt-4.5.0.sh"/>
+                   script="qt-4.4.3.sh"/>
     </product>
     <product name="QScintilla" 
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="Mandriva 2008.0 64bit"
     </product>
     <product name="QScintilla" 
             type="prerequisite"
             description="Auxiliary tool for source code editing and debugging">
       <installation os="Mandriva 2008.0 64bit"
-                    version="2.3.2
+                    version="2.3" 
                    disable="false"
                    installdiskspace="56161,63120,217501"
                    disable="false"
                    installdiskspace="56161,63120,217501"
-                   script="qscintilla-2.3.2.sh"/>
+                   script="qscintilla-2.3.sh"/>
     </product>
     <product name="Sip"
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="Mandriva 2008.0 64bit"
     </product>
     <product name="Sip"
             type="prerequisite"
              description="C++ to Python bindings generation tool">
       <installation os="Mandriva 2008.0 64bit"
-                    version="4.7.9
+                    version="4.7.7
                    disable="false"
                    installdiskspace="308,1450,2476"
                    disable="false"
                    installdiskspace="308,1450,2476"
-                   script="sip-4.7.9.sh"/>
+                   script="sip-4.7.7.sh"/>
     </product>
     <product name="PyQt"
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="Mandriva 2008.0 64bit"
     </product>
     <product name="PyQt"
             type="prerequisite"
             description="Python bindings for Qt library">
       <installation os="Mandriva 2008.0 64bit"
-                    version="4.4.4
+                    version="4.4.3
                    disable="false"
                    installdiskspace="15914,3936,76034"
                    disable="false"
                    installdiskspace="15914,3936,76034"
-                   script="PyQt-4.4.4.sh"/>
+                   script="PyQt-4.4.3.sh"/>
     </product>
     <product name="boost"
             type="prerequisite"
     </product>
     <product name="boost"
             type="prerequisite"
             type="prerequisite"
              description="2-D plotting extension for Qt library">
       <installation os="Mandriva 2008.0 64bit"
             type="prerequisite"
              description="2-D plotting extension for Qt library">
       <installation os="Mandriva 2008.0 64bit"
-                    version="5.2.0
+                    version="5.1.1
                    disable="false"
                    installdiskspace="1034,7200,13134"
                    disable="false"
                    installdiskspace="1034,7200,13134"
-                   script="qwt-5.2.0.sh"/>
+                   script="qwt-5.1.1.sh"/>
     </product>
     <product name="OmniORB"
             type="prerequisite"
     </product>
     <product name="OmniORB"
             type="prerequisite"
diff --git a/config_files/PyQt-4.4.3.sh b/config_files/PyQt-4.4.3.sh
new file mode 100755 (executable)
index 0000000..6ab5b23
--- /dev/null
@@ -0,0 +1,162 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : PyQt-4.4.3.sh
+#  Created   : Thu Dec 18 12:01:00 2002
+#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
+#  Project   : SALOME
+#  Module    : Installation Wizard
+#  Copyright : 2002-2008 CEA
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+check_version()
+{
+if [ -n "${PYQTDIR}" ] && [ -f ${PYQTDIR}/pyqtconfig.py ] ; then
+    ver=`cd ${PYQTDIR} && python -c "from pyqtconfig import Configuration; c=Configuration();print c.__getattr__('pyqt_version_str')" 2>/dev/null`
+    if [ -n "$ver" ] ; then
+       maj_ver=`echo $ver | awk -F. '{if(NF>0) print $1; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'`
+       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
+           return 0
+       fi
+    fi
+fi
+return 1
+}
+
+print_env_bin()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export PYQTDIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PYQT_SIPS=\${PYQTDIR}/sip
+export PATH=\${PYQTDIR}/bin:\$PATH
+export PYTHONPATH=\${PYQTDIR}:\${PYQTDIR}/PyQt4:\${PYTHONPATH}
+export LD_LIBRARY_PATH=\${PYQTDIR}/PyQt4:\$LD_LIBRARY_PATH
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+print_env_src()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
+#$DELIM ${PRODUCT_TYPE}_src $DELIM
+# nothing to do
+##
+EOF
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+return $?
+}
+
+install_source()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+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
+
+GCC=`which gcc`
+cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
+used gcc=$GCC
+EOF
+check_job ${PRODUCT_DIR}/MAKE.LOG make
+check_job ${PRODUCT_DIR}/INSTALL.LOG make install
+
+cd ${PRODUCT_DIR};
+
+# remove sources and temporary files after building
+if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
+fi
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_binary()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+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}
+
+PYQT_CONFIGURE_OPTIONS="-b ${PRODUCT_DIR}/bin -d ${PRODUCT_DIR} -v ${PRODUCT_DIR}/sip -p ${PRODUCT_DIR}/plugins --confirm-license"
+
+# modify pyqtconfig.py file
+if [ -n "${PYTHONROOT}" ] && [ -n "${QTDIR}" ] ; then
+    cd ${PRODUCT_DIR}/PyQt4
+    python_version=`python -V 2>&1 | awk '{print $2}' | awk -F. '{printf("0x%02d%02d%02d",$1,$2,$3)}'`
+    qt_version=`grep -e "^#define[[:space:]]\+QT_VERSION[[:space:]]\+" ${QTDIR}/include/Qt/qglobal.h | sed -e 's%^#define[[:space:]\+QT_VERSION[[:space:]]\+\(.*\)$%\1%g'`
+    sed -e "s%\('pyqt_bin_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}',%g" \
+       -e "s%\('pyqt_mod_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}',%g" \
+       -e "s%\('pyqt_sip_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/sip',%g" \
+       -e "s%\('qt_dir':[[:space:]]*\).*%\1'${QTDIR}',%g" \
+       -e "s%\('qt_data_dir':[[:space:]]*\).*%\1'${QTDIR}',%g" \
+       -e "s%\('qt_version':[[:space:]]*\).*%\1${qt_version},%g" \
+       -e "s%\('qt_inc_dir':[[:space:]]*\).*%\1'${QTDIR}/include',%g" \
+       -e "s%\('qt_lib_dir':[[:space:]]*\).*%\1'${QTDIR}/lib',%g" \
+       -e "s%\('INCDIR_QT':[[:space:]]*\).*%\1'${QTDIR}/include',%g" \
+       -e "s%\('LIBDIR_QT':[[:space:]]*\).*%\1'${QTDIR}/lib',%g" \
+       -e "s%\('MOC':[[:space:]]*\).*%\1'${QTDIR}/bin/moc',%g" \
+       -e "s%\('pyqt_config_args':[[:space:]]*\).*%\1'${PYQT_CONFIGURE_OPTIONS}',%g" \
+       pyqtconfig.py > pyqtconfig.py.1
+    mv -f pyqtconfig.py.1 pyqtconfig.py
+    cd ${PRODUCT_DIR}/bin
+    sed -e "s%exec.*pyuic.py%exec ${PYTHONROOT}/bin/python ${PRODUCT_DIR}/PyQt4/uic/pyuic.py%g" pyuic4 > pyuic4.1
+    mv -f pyuic4.1 pyuic4 && chmod a+x pyuic4
+fi
+
+# to generate environment script for sources
+try_preinstalled
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INST_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+export PRODUCT_TYPE=$6;
+export INSTALL_PRODUCTS=$7;
+shift
+REMOVE_SRC_TMP=$8;
+test $# == 10 && shift && SINGLE_DIR=$9
+export PRODUCT="PyQt-4.4.3"
+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 
diff --git a/config_files/PyQt-4.4.4.sh b/config_files/PyQt-4.4.4.sh
deleted file mode 100755 (executable)
index fc9c92e..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : PyQt-4.4.4.sh
-#  Created   : Thu Dec 18 12:01:00 2002
-#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
-#  Project   : SALOME
-#  Module    : Installation Wizard
-#  Copyright : 2002-2008 CEA
-#
-#  This script is the part of the SALOME installation procedure.
-#
-####################################################################################
-
-check_version()
-{
-if [ -n "${PYQTDIR}" ] && [ -f ${PYQTDIR}/pyqtconfig.py ] ; then
-    ver=`cd ${PYQTDIR} && python -c "from pyqtconfig import Configuration; c=Configuration();print c.__getattr__('pyqt_version_str')" 2>/dev/null`
-    if [ -n "$ver" ] ; then
-       maj_ver=`echo $ver | awk -F. '{if(NF>0) print $1; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'`
-       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
-           return 0
-       fi
-    fi
-fi
-return 1
-}
-
-print_env_bin()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export PYQTDIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PYQT_SIPS=\${PYQTDIR}/sip
-export PATH=\${PYQTDIR}/bin:\$PATH
-export PYTHONPATH=\${PYQTDIR}:\${PYQTDIR}/PyQt4:\${PYTHONPATH}
-export LD_LIBRARY_PATH=\${PYQTDIR}/PyQt4:\$LD_LIBRARY_PATH
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-print_env_src()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
-# nothing to do
-##
-EOF
-(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-return $?
-}
-
-install_source()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_source_and_build()
-{
-# install sources
-install_source
-
-# build sources
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-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
-
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=$GCC
-EOF
-check_job ${PRODUCT_DIR}/MAKE.LOG make
-check_job ${PRODUCT_DIR}/INSTALL.LOG make install
-
-cd ${PRODUCT_DIR};
-
-# remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
-    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
-fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_binary()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-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}
-
-PYQT_CONFIGURE_OPTIONS="-b ${PRODUCT_DIR}/bin -d ${PRODUCT_DIR} -v ${PRODUCT_DIR}/sip -p ${PRODUCT_DIR}/plugins --confirm-license"
-
-# modify pyqtconfig.py file
-if [ -n "${PYTHONROOT}" ] && [ -n "${QTDIR}" ] ; then
-    cd ${PRODUCT_DIR}/PyQt4
-    python_version=`python -V 2>&1 | awk '{print $2}' | awk -F. '{printf("0x%02d%02d%02d",$1,$2,$3)}'`
-    qt_version=`grep -e "^#define[[:space:]]\+QT_VERSION[[:space:]]\+" ${QTDIR}/include/Qt/qglobal.h | sed -e 's%^#define[[:space:]\+QT_VERSION[[:space:]]\+\(.*\)$%\1%g'`
-    sed -e "s%\('pyqt_bin_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}',%g" \
-       -e "s%\('pyqt_mod_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}',%g" \
-       -e "s%\('pyqt_sip_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/sip',%g" \
-       -e "s%\('qt_dir':[[:space:]]*\).*%\1'${QTDIR}',%g" \
-       -e "s%\('qt_data_dir':[[:space:]]*\).*%\1'${QTDIR}',%g" \
-       -e "s%\('qt_version':[[:space:]]*\).*%\1${qt_version},%g" \
-       -e "s%\('qt_inc_dir':[[:space:]]*\).*%\1'${QTDIR}/include',%g" \
-       -e "s%\('qt_lib_dir':[[:space:]]*\).*%\1'${QTDIR}/lib',%g" \
-       -e "s%\('INCDIR_QT':[[:space:]]*\).*%\1'${QTDIR}/include',%g" \
-       -e "s%\('LIBDIR_QT':[[:space:]]*\).*%\1'${QTDIR}/lib',%g" \
-       -e "s%\('MOC':[[:space:]]*\).*%\1'${QTDIR}/bin/moc',%g" \
-       -e "s%\('pyqt_config_args':[[:space:]]*\).*%\1'${PYQT_CONFIGURE_OPTIONS}',%g" \
-       pyqtconfig.py > pyqtconfig.py.1
-    mv -f pyqtconfig.py.1 pyqtconfig.py
-    cd ${PRODUCT_DIR}/bin
-    sed -e "s%exec.*pyuic.py%exec ${PYTHONROOT}/bin/python ${PRODUCT_DIR}/PyQt4/uic/pyuic.py%g" pyuic4 > pyuic4.1
-    mv -f pyuic4.1 pyuic4 && chmod a+x pyuic4
-fi
-
-# to generate environment script for sources
-try_preinstalled
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INST_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-export PRODUCT_TYPE=$6;
-export INSTALL_PRODUCTS=$7;
-shift
-REMOVE_SRC_TMP=$8;
-test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="PyQt-4.4.4"
-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 
index 6ffee6a6b835139d36a8b1ff32ee7915992c6634..79dbe7a15cfe239ef01b7ce00e5deacb39c7eeb1 100755 (executable)
@@ -21,13 +21,14 @@ set inst_with_gui=1
 set is_delete=0
 set verbose_level=2
 set params=""
 set is_delete=0
 set verbose_level=2
 set params=""
-set b_params=""
-set modules=(KERNEL GUI GEOM MED SMESH VISU NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT PYLIGHT SIERPINSKY RANDOMIZER YACS)
+set modules=(KERNEL GUI GEOM MED SMESH VISU YACS NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT PYLIGHT SIERPINSKY RANDOMIZER)
 set optim=""
 set optim=""
-set is_install=0
+set is_install=1
 set is_help=0
 set is_tui=0
 set prefix=""
 set is_help=0
 set is_tui=0
 set prefix=""
+set def_install_dir="/INSTALL"
+set b_params=""
 
 #########################################################
 # parse parameters
 
 #########################################################
 # parse parameters
@@ -44,8 +45,6 @@ while ( ${%1} > 0 )
        set is_delete=1
     else if ( "$1" == "-o" ) then
        set optim="--enable-production=yes --disable-debug"
        set is_delete=1
     else if ( "$1" == "-o" ) then
        set optim="--enable-production=yes --disable-debug"
-    else if ( "$1" == "-i" ) then
-       set is_install=1
     else if ( "$1" == "-v" ) then
        shift
        set verbose_level=$1
     else if ( "$1" == "-v" ) then
        shift
        set verbose_level=$1
@@ -58,12 +57,12 @@ while ( ${%1} > 0 )
     else if ( "$1" == "-t" ) then
        set is_tui=1
     else
     else if ( "$1" == "-t" ) then
        set is_tui=1
     else
-       set ckt=`echo ${modules} | grep $1`
+       set ckt=`echo ${modules} | grep -E "\<$1\>"`
        if ( "$ckt" != "" ) then
            set params="$params $1"
        else
            set b_params="$b_params $1"
        if ( "$ckt" != "" ) then
            set params="$params $1"
        else
            set b_params="$b_params $1"
-           echo "\!\!\! Warning \!\!\! Unknown module: $1. Skipping."
+           echo "\!\!\! Warning \!\!\! Unknown module: $1."
        endif
     endif
     shift
        endif
     endif
     shift
@@ -96,8 +95,8 @@ echo "-w          Add --without-gui key to build_configure and configure command
 echo "            to build SALOME module sources without GUI."
 echo "            By default sources are built with GUI."
 echo ""
 echo "            to build SALOME module sources without GUI."
 echo "            By default sources are built with GUI."
 echo ""
-echo "-d          Delete build directories before calling configure, to enforce full rebuild"
-echo "            (and reinstall if -i or -p option is used) of module."
+echo "-d          Delete build directories before calling configure, to force full rebuild"
+echo "            and reinstall of the module."
 echo "            Use this option carefully."
 echo ""
 echo "-o          Build sources in optimized mode. Default is off that means debug mode."
 echo "            Use this option carefully."
 echo ""
 echo "-o          Build sources in optimized mode. Default is off that means debug mode."
@@ -108,8 +107,6 @@ echo ""
 echo "-t          Performs make dev_docs step to build TUI documentation for those modules"
 echo "            which support this. Default is off."
 echo ""
 echo "-t          Performs make dev_docs step to build TUI documentation for those modules"
 echo "            which support this. Default is off."
 echo ""
-echo "-i          Performs make install step. Default is off that means only make step."
-echo ""
 echo "-p <prefix> Define the directory where to install modules after compilation."
 echo "            By default the directory where compilation is performed is used."
 echo ""
 echo "-p <prefix> Define the directory where to install modules after compilation."
 echo "            By default the directory where compilation is performed is used."
 echo ""
@@ -123,7 +120,7 @@ echo ""
 echo "Note:       If no keys are given script just performs make step."
 echo ""
 echo "Example:"
 echo "Note:       If no keys are given script just performs make step."
 echo ""
 echo "Example:"
-echo "            ./build.csh -o -i -b KERNEL MED GEOM"
+echo "            ./build.csh -o -p /home/user/salome -b KERNEL MED GEOM"
 echo ""
 echo "            This will make KERNEL, GEOM and MED modules: build_configure, configure, make"
 echo "            and install procedures will be performed for all specified modules."
 echo ""
 echo "            This will make KERNEL, GEOM and MED modules: build_configure, configure, make"
 echo "            and install procedures will be performed for all specified modules."
@@ -138,20 +135,17 @@ endif
 if ( "${params}" != "" ) then
     set xparams=""
     foreach module (${modules})
 if ( "${params}" != "" ) then
     set xparams=""
     foreach module (${modules})
-       set ckt=`echo ${params} | grep ${module}`
+       set ckt=`echo ${params} | grep -E "\<${module}\>"`
        if ( "$ckt" != "" ) then
            set xparams="$xparams $module"
        endif
     end
        if ( "$ckt" != "" ) then
            set xparams="$xparams $module"
        endif
     end
-    set modules=($xparams)
-else
-    if ( "${b_params}" != "" ) then
-       echo "Nothing to be built. Exiting."
-       exit
-    endif
+    set modules=($xparams $b_params)
+else if ( "${b_params}" != "" ) then
+    set modules=($b_params)
 endif
 
 endif
 
-echo ">>> The following SALOME packages will be built:"
+echo ">>> The following modules will be built:"
 echo $modules
 
 #########################################################
 echo $modules
 
 #########################################################
@@ -161,11 +155,16 @@ set env_script=`dirname $0`/env_build.csh
 if ( ! -e $env_script ) then
     set env_script=`dirname $0`/env_products.csh
 endif
 if ( ! -e $env_script ) then
     set env_script=`dirname $0`/env_products.csh
 endif
+if ( ! -e $env_script ) then
+    set env_script=`dirname $0`/env.sh
+endif
 if ( -e $env_script ) then
     echo ">>> Setting environment"
     source $env_script
 else
 if ( -e $env_script ) then
     echo ">>> Setting environment"
     source $env_script
 else
-    echo "\!\!\! Warning \!\!\! Environment is not set: file env_products.csh is not found."
+    echo "\!\!\! Warning \!\!\! Environment is not set."
+    echo "No environment file (env_build.sh, env_products.sh, env.sh) is found."
+    echo "Proceed with the current environment."
 endif
 
 set BUILD_DIR=${PWD}
 endif
 
 set BUILD_DIR=${PWD}
@@ -175,18 +174,8 @@ set LOG_DIR=${BUILD_DIR}/LOGS
 # define installation prefix
 #########################################################
 if ( "$prefix" == "" ) then
 # define installation prefix
 #########################################################
 if ( "$prefix" == "" ) then
-    set prefix=${BUILD_DIR}/INSTALL
-    if ( $is_install == 1 ) then
-       echo "\!\!\! Warning \!\!\! Installation directory is not set."
-       echo "All the modules will be installed to the $prefix"
-    else
-       set is_kernel=`echo ${modules} | grep KERNEL`
-       if ( "$is_kernel" != "" ) then
-           echo "\!\!\! Warning \!\!\! KERNEL module requires install step to be performed."
-           echo "For this module -i option will be forced."
-           echo "The module(s) will be installed to the $prefix"
-       endif
-    endif
+    echo "\!\!\! Warning \!\!\! Installation directory is not set."
+    echo "All the modules will be installed to the ${BUILD_DIR}${def_install_dir}"
 else
     set is_absolute=`echo $prefix | grep -e "^/"`
     if ( "$is_absolute" == "" ) then
 else
     set is_absolute=`echo $prefix | grep -e "^/"`
     if ( "$is_absolute" == "" ) then
@@ -217,7 +206,6 @@ foreach module (${modules})
   set module_build=${BUILD_DIR}/${module}_BUILD
 
   if ( ${module_src} != "" ) then
   set module_build=${BUILD_DIR}/${module}_BUILD
 
   if ( ${module_src} != "" ) then
-    set add_keys=""
     cd ${BUILD_DIR}
     #########################################################
     # check if sources directory exists
     cd ${BUILD_DIR}
     #########################################################
     # check if sources directory exists
@@ -248,11 +236,12 @@ foreach module (${modules})
            #########################################################
            # call build_configure
            #########################################################
            #########################################################
            # call build_configure
            #########################################################
+           set mybuildconf_keys="${BUILDCONF_OPTS}"
            if ( $inst_with_gui == 0 ) then
            if ( $inst_with_gui == 0 ) then
-               set add_keys="--without-gui"
+               set mybuildconf_keys="${mybuildconf_keys} --without-gui"
            endif
            cd ${module_src}
            endif
            cd ${module_src}
-           ./build_configure ${add_keys} >& ${LOG_DIR}/build_configure_${module}.log
+           ./build_configure ${mybuildconf_keys} >& ${LOG_DIR}/build_configure_${module}.log
            #########################################################
            # echo possible errors
            #########################################################
            #########################################################
            # echo possible errors
            #########################################################
@@ -266,13 +255,20 @@ foreach module (${modules})
     #########################################################
     if ( -e ${module_build} && $is_delete == 1 ) then
        echo "... Removing ${module_build}"
     #########################################################
     if ( -e ${module_build} && $is_delete == 1 ) then
        echo "... Removing ${module_build}"
-       rm -rf ${module_build}
+       chmod -R +w ${module_build} && rm -rf ${module_build} >& /dev/null
+       if ( "$?" != "0" ) then
+            echo "\!\!\! Warning \!\!\! Cannot remove build directory ${module_build}. Permission denied."
+       endif
     endif
     #########################################################
     # creating build directory if it does not exist
     #########################################################
     if ( ! -e ${module_build} ) then
     endif
     #########################################################
     # creating build directory if it does not exist
     #########################################################
     if ( ! -e ${module_build} ) then
-       mkdir -p ${module_build}
+        mkdir -p ${module_build} >& /dev/null
+       if ( "$?" != "0" ) then
+           echo "\!\!\! Error \!\!\! Cannot create build directory ${module_build}. Permission denied."
+           continue
+       endif
     endif
     cd ${module_build}
     #########################################################
     endif
     cd ${module_build}
     #########################################################
@@ -299,22 +295,26 @@ foreach module (${modules})
     # number); default is a build directory
     #########################################################
     set vx=""
     # number); default is a build directory
     #########################################################
     set vx=""
-    set cfg_file=configure.ac
-    if ( ! -e ${module_src}/${cfg_file} ) then
-       set cfg_file=configure.in.base
-    endif
-    if ( -e ${module_src}/${cfg_file} ) then
-       set vx=`grep -e "^VERSION=" ${module_src}/${cfg_file} | awk -F= '{ if (NF>1) print $NF; }' | tr -d '[:space:]'`
+    if ( -e ${module_src}/configure.ac ) then
+       set vx=`grep -e "^AC_INIT" ${module_src}/configure.ac | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"`
+    else if ( -e ${module_src}/configure.in.base ) then
+       set vx=`grep -e "^VERSION=" ${module_src}/configure.in.base | awk -F= '{ if (NF>1) print $NF; }' | tr -d '[:space:]'`
        if ( "$vx" == "" ) then
        if ( "$vx" == "" ) then
-           set vx=`grep -e "^AC_INIT" ${module_src}/${cfg_file} | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"`
+           set vx=`grep -e "^AC_INIT" ${module_src}/configure.in.base | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"`
        endif
     endif
        endif
     endif
-    set px=${BUILD_DIR}/${module}
-    if ( "$prefix" != "" ) then
-       set px=$prefix/${module}
-    endif
     if ( "$vx" != "" ) then
     if ( "$vx" != "" ) then
-       set px="$px"_"$vx"
+        set vx="_$vx"
+    endif
+    if ( "$prefix" == "" ) then
+        #set module_root_dir=`printenv ${module}_ROOT_DIR`
+       #if ( "$module_root_dir" != "" ) then
+       #    set px=$module_root_dir
+       #else
+            set px=${BUILD_DIR}${def_install_dir}/${module}${vx}
+       #endif
+    else
+       set px=${prefix}/${module}${vx}
     endif
     #########################################################
     # perform configure if -c flag is given or if 
     endif
     #########################################################
     # perform configure if -c flag is given or if 
@@ -328,16 +328,17 @@ foreach module (${modules})
        if ( ! -e ${module_src}/configure ) then
            echo "\!\!\! Warning \!\!\! Can not find configure script in ${module_src}."
        else
        if ( ! -e ${module_src}/configure ) then
            echo "\!\!\! Warning \!\!\! Can not find configure script in ${module_src}."
        else
+           set myconf_keys="${CONF_OPTS}"
            if ( $inst_with_gui == 0 ) then
            if ( $inst_with_gui == 0 ) then
-               set add_keys="--without-gui"
+               set myconf_keys="${myconf_keys} --without-gui"
            endif
            endif
-           if (  "${module}" == "MED" && ($?METISDIR)  && ($?SCOTCHDIR) ) then
-               set add_keys="--enable-splitter=yes --with-metis=${METISDIR} --with-scotch=${SCOTCHDIR}"
+           if ( "${module}" == "MED" && ($?METISDIR) && ($?SCOTCHDIR) ) then
+               set myconf_keys="${myconf_keys} --enable-splitter=yes --with-metis=${METISDIR} --with-scotch=${SCOTCHDIR}"
            endif
            if ( "${module}" == "NETGENPLUGIN" && ($?NETGENHOME) ) then
            endif
            if ( "${module}" == "NETGENPLUGIN" && ($?NETGENHOME) ) then
-               set add_keys="--with-netgen=${NETGENHOME}"
+               set myconf_keys="${myconf_keys} --with-netgen=${NETGENHOME}"
            endif
            endif
-           ${module_src}/configure --prefix=$px ${optim} ${add_keys} >& ${LOG_DIR}/configure_${module}.log
+           ${module_src}/configure --prefix=$px ${optim} ${myconf_keys} >& ${LOG_DIR}/configure_${module}.log
            #########################################################
            # echo possible errors
            #########################################################
            #########################################################
            # echo possible errors
            #########################################################
@@ -363,9 +364,9 @@ foreach module (${modules})
     # if make step is successful set the ${module}_ROOT_DIR
     # environment variable
     #########################################################
     # if make step is successful set the ${module}_ROOT_DIR
     # environment variable
     #########################################################
-    if ( $sts == 0 ) then
-       setenv ${module}_ROOT_DIR ${module_build}
-    endif
+    #if ( $sts == 0 ) then
+       setenv ${module}_ROOT_DIR ${module_build}
+    #endif
     #########################################################
     # print make errors
     #########################################################
     #########################################################
     # print make errors
     #########################################################
@@ -405,7 +406,10 @@ foreach module (${modules})
        #########################################################
        if ( -e $px && $is_delete == 1 ) then
            echo "... Removing $px"
        #########################################################
        if ( -e $px && $is_delete == 1 ) then
            echo "... Removing $px"
-           rm -rf $px
+           rm -rf $px >& /dev/null
+           if ( "$?" != "0" ) then
+               echo "\!\!\! Warning \!\!\! Cannot remove install directory ${px}. Permission denied."
+           endif
        endif
        echo "... Performing make install"
        make install >& ${LOG_DIR}/make_install_${module}.log
        endif
        echo "... Performing make install"
        make install >& ${LOG_DIR}/make_install_${module}.log
index 178cae277aad0d73ae258d1c8d5af0ba3838b43c..56f8c5a74fed84bd4eedd63ae458286d2e2ffbf0 100755 (executable)
@@ -42,8 +42,8 @@ usage(){
     echo "            to build SALOME module sources without GUI."
     echo "            By default sources are built with GUI."
     echo ""
     echo "            to build SALOME module sources without GUI."
     echo "            By default sources are built with GUI."
     echo ""
-    echo "-d          Delete build directories before calling configure, to enforce full"
-    echo "            rebuild (and reinstall if -i or -p option is used) of module."
+    echo "-d          Delete build directories before calling configure, to force full"
+    echo "            rebuild and reinstall of the module."
     echo "            Use this option carefully."
     echo ""
     echo "-o          Build sources in optimized mode. Default is off that means"
     echo "            Use this option carefully."
     echo ""
     echo "-o          Build sources in optimized mode. Default is off that means"
@@ -56,9 +56,6 @@ usage(){
     echo "-t          Performs make dev_docs step to build TUI documentation for those"
     echo "            modules which support this. Default is off."
     echo ""
     echo "-t          Performs make dev_docs step to build TUI documentation for those"
     echo "            modules which support this. Default is off."
     echo ""
-    echo "-i          Performs make install step. Default is off that means only make"
-    echo "            step."
-    echo ""
     echo "-p <prefix> Define the directory where to install modules after compilation."
     echo "            By default the directory where compilation is performed is used."
     echo ""
     echo "-p <prefix> Define the directory where to install modules after compilation."
     echo "            By default the directory where compilation is performed is used."
     echo ""
@@ -72,7 +69,7 @@ usage(){
     echo "Note:       If no keys are given script just performs make step."
     echo ""
     echo "Example:"
     echo "Note:       If no keys are given script just performs make step."
     echo ""
     echo "Example:"
-    echo "            ./build.csh -o -i -b KERNEL MED GEOM"
+    echo "            ./build.csh -o -p /home/user/salome -b KERNEL MED GEOM"
     echo ""
     echo "            This will make KERNEL, GEOM and MED modules: build_configure,"
     echo "            configure, make and install procedures will be performed for all"
     echo ""
     echo "            This will make KERNEL, GEOM and MED modules: build_configure,"
     echo "            configure, make and install procedures will be performed for all"
@@ -87,17 +84,17 @@ inst_with_gui=1
 is_delete=0
 verbose_level=2
 params=""
 is_delete=0
 verbose_level=2
 params=""
-b_params=""
-modules="KERNEL GUI GEOM MED SMESH VISU NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT PYLIGHT SIERPINSKY RANDOMIZER YACS"
+modules="KERNEL GUI GEOM MED SMESH VISU YACS NETGENPLUGIN GHS3DPLUGIN BLSURFPLUGIN HexoticPLUGIN GHS3DPRLPLUGIN COMPONENT PYCALCULATOR CALCULATOR HELLO PYHELLO LIGHT PYLIGHT SIERPINSKY RANDOMIZER"
 optim=""
 optim=""
-is_install=0
+is_install=1
 is_tui=0
 prefix=""
 is_tui=0
 prefix=""
+def_install_dir="/INSTALL"
 
 #########################################################
 # parse parameters
 #########################################################
 
 #########################################################
 # parse parameters
 #########################################################
-while getopts ":hbcwdoitv:p:" option ; do
+while getopts ":hbcwdotv:p:" option ; do
     case $option in
         h ) usage ;;
         b ) is_build_configure=1 ; is_configure=1 ;;
     case $option in
         h ) usage ;;
         b ) is_build_configure=1 ; is_configure=1 ;;
@@ -105,7 +102,6 @@ while getopts ":hbcwdoitv:p:" option ; do
         w ) inst_with_gui=0 ;;
         d ) is_delete=1 ;;
         o ) optim="--enable-production=yes --disable-debug" ;;
         w ) inst_with_gui=0 ;;
         d ) is_delete=1 ;;
         o ) optim="--enable-production=yes --disable-debug" ;;
-        i ) is_install=1 ;;
        t ) is_tui=1 ;;
         v ) verbose_level=$OPTARG ;;
         p ) is_install=1 ; prefix=$OPTARG ;;
        t ) is_tui=1 ;;
         v ) verbose_level=$OPTARG ;;
         p ) is_install=1 ; prefix=$OPTARG ;;
@@ -115,17 +111,19 @@ done
 # shift to have the good number of other args
 shift $((OPTIND - 1))
 
 # shift to have the good number of other args
 shift $((OPTIND - 1))
 
+b_params=""
+
 for arg in $@ ; do
     known=0
     for m in $modules ; do
        if [ "$m" == "$arg" ] ; then known=1 ; break ; fi
     done
 for arg in $@ ; do
     known=0
     for m in $modules ; do
        if [ "$m" == "$arg" ] ; then known=1 ; break ; fi
     done
-    if [ $known -eq 1 ] ; then
-       params="$params $arg"
-    else
-       b_params="$b_params $arg"
+    if [ $known -eq 0 ] ; then
        echo
        echo
-       echo '!!! Warning !!! Unknown module: '$arg'. Skipping.'
+       echo '!!! Warning !!! Unknown module: '$arg'.'
+       b_params="$b_params $arg"
+    else
+       params="$params $arg"
     fi
 done
 
     fi
 done
 
@@ -139,19 +137,19 @@ if [ "${params}" != "" ] ; then
        for p in $params ; do
            if [ "$p" == "$module" ] ; then found=1 ; break ; fi
        done
        for p in $params ; do
            if [ "$p" == "$module" ] ; then found=1 ; break ; fi
        done
-       if [ $found -eq 1 ] ; then xparams="$xparams $module" ; fi
+       if [ $found -eq 1 ] ; then 
+           xparams="$xparams $module"
+       fi
     done
     done
-    modules="$xparams"
+    modules="$xparams $b_params"
 elif [ "${b_params}" != "" ] ; then
 elif [ "${b_params}" != "" ] ; then
-    echo
-    echo "Nothing to be built. Exiting."
-    echo
-    exit 1
+    modules="$b_params"
 fi
 
 echo
 fi
 
 echo
-echo ">>> The following SALOME packages will be built:"
+echo ">>> The following modules will be built:"
 echo $modules
 echo $modules
+echo
 
 #########################################################
 # set environment
 
 #########################################################
 # set environment
@@ -160,6 +158,9 @@ env_script=`dirname $0`/env_build.sh
 if [ ! -e $env_script ] ; then
     env_script=`dirname $0`/env_products.sh
 fi
 if [ ! -e $env_script ] ; then
     env_script=`dirname $0`/env_products.sh
 fi
+if [ ! -e $env_script ] ; then
+    env_script=`dirname $0`/env.sh
+fi
 if [ -e $env_script ] ; then
     echo
     echo ">>> Setting environment"
 if [ -e $env_script ] ; then
     echo
     echo ">>> Setting environment"
@@ -167,7 +168,7 @@ if [ -e $env_script ] ; then
 else
     echo
     echo '!!! Warning !!! Environment is not set.'
 else
     echo
     echo '!!! Warning !!! Environment is not set.'
-    echo 'Neither env_build.sh nor env_products.sh file is found.'
+    echo 'No environment file (env_build.sh, env_products.sh, env.sh) is found.'
     echo 'Proceed with the current environment.'
 fi
 
     echo 'Proceed with the current environment.'
 fi
 
@@ -178,17 +179,9 @@ LOG_DIR=${BUILD_DIR}/LOGS
 # define installation prefix
 #########################################################
 if [ "$prefix" == "" ] ; then
 # define installation prefix
 #########################################################
 if [ "$prefix" == "" ] ; then
-    prefix=${BUILD_DIR}/INSTALL
-    if [ $is_install -eq 1 ] ; then
-       echo
-       echo '!!! Warning !!! Installation directory is not set.'
-       echo "All the modules will be installed to the $prefix"
-    elif [ "`echo ${modules} | grep KERNEL`" != "" ] ; then
-       echo
-       echo '!!! Warning !!! KERNEL module requires install step to be performed.'
-       echo "For this module -i option will be forced."
-       echo "The module(s) will be installed to the $prefix"
-    fi
+    echo
+    echo '!!! Warning !!! Installation directory is not set.'
+    echo "All the modules will be installed to the ${BUILD_DIR}${def_install_dir}"
 else
     if [ "`echo $prefix | grep -E '^/'`" == "" ] ; then
        prefix=${BUILD_DIR}/$prefix
 else
     if [ "`echo $prefix | grep -E '^/'`" == "" ] ; then
        prefix=${BUILD_DIR}/$prefix
@@ -221,7 +214,6 @@ for module in ${modules}; do
     module_build=${BUILD_DIR}/${module}_BUILD
     
     if [ "${module_src}" != "" ] ; then
     module_build=${BUILD_DIR}/${module}_BUILD
     
     if [ "${module_src}" != "" ] ; then
-       add_keys=""
        cd ${BUILD_DIR}
         #########################################################
         # check if sources directory exists
        cd ${BUILD_DIR}
         #########################################################
         # check if sources directory exists
@@ -255,11 +247,12 @@ for module in ${modules}; do
                #########################################################
                 # call build_configure
                #########################################################
                #########################################################
                 # call build_configure
                #########################################################
+               mybuildconf_keys="${BUILDCONF_OPTS}"
                if [ $inst_with_gui -eq 0 ] ; then
                if [ $inst_with_gui -eq 0 ] ; then
-                   add_keys="--without-gui"
+                   mybuildconf_keys="${mybuildconf_keys} --without-gui"
                fi
                cd ${module_src}
                fi
                cd ${module_src}
-               ./build_configure ${add_keys} >& ${LOG_DIR}/build_configure_${module}.log
+               ./build_configure ${mybuildconf_keys} >& ${LOG_DIR}/build_configure_${module}.log
                #########################################################
                # echo possible errors
                #########################################################
                #########################################################
                # echo possible errors
                #########################################################
@@ -273,13 +266,24 @@ for module in ${modules}; do
         #########################################################
        if [ -e ${module_build} ] && [ $is_delete -eq 1 ] ; then
            echo "... Removing ${module_build}"
         #########################################################
        if [ -e ${module_build} ] && [ $is_delete -eq 1 ] ; then
            echo "... Removing ${module_build}"
-           rm -rf ${module_build}
+           chmod -R +w ${module_build} && rm -rf ${module_build} >& /dev/null
+           if [ "$?" != "0" ] ; then
+               echo
+               echo '!!! Warning !!! Cannot remove build directory ${module_build}. Permission denied.'
+               echo
+           fi
        fi
         #########################################################
         # creating build directory if it does not exist
         #########################################################
        if [ ! -e ${module_build} ] ; then
        fi
         #########################################################
         # creating build directory if it does not exist
         #########################################################
        if [ ! -e ${module_build} ] ; then
-           mkdir -p ${module_build}
+           mkdir -p ${module_build} >& /dev/null
+           if [ "$?" != "0" ] ; then
+               echo
+               echo '!!! Error !!! Cannot create build directory ${module_build}. Permission denied.'
+               echo
+               continue
+           fi
        fi
        cd ${module_build}
         #########################################################
        fi
        cd ${module_build}
         #########################################################
@@ -306,22 +310,26 @@ for module in ${modules}; do
         # number); default is a build directory
         #########################################################
        vx=""
         # number); default is a build directory
         #########################################################
        vx=""
-       cfg_file=configure.ac
-       if [ ! -e ${module_src}/${cfg_file} ] ; then
-           cfg_file=configure.in.base
-       fi
-       if [ -e ${module_src}/${cfg_file} ] ; then
-           vx=`grep -e "^VERSION=" ${module_src}/${cfg_file} | awk -F= '{ if (NF>1) print $NF; }' | tr -d '[:space:]'`
+       if [ -e ${module_src}/configure.ac ] ; then
+           vx=`grep -e "^AC_INIT" ${module_src}/configure.ac | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"`
+       elif [ -e ${module_src}/configure.in.base ] ; then
+           vx=`grep -e "^VERSION=" ${module_src}/configure.in.base | awk -F= '{ if (NF>1) print $NF; }' | tr -d '[:space:]'`
            if [ "$vx" == "" ] ; then
            if [ "$vx" == "" ] ; then
-               vx=`grep -e "^AC_INIT" ${module_src}/${cfg_file} | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"`
+               vx=`grep -e "^AC_INIT" ${module_src}/configure.in.base | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"`
            fi
        fi
            fi
        fi
-       px=${BUILD_DIR}/${module}
-       if [ "$prefix" != "" ] ; then
-           px=$prefix/${module}
-       fi
        if [ "$vx" != "" ] ; then
        if [ "$vx" != "" ] ; then
-           px="$px"_"$vx"
+           vx="_$vx"
+       fi
+       if [ "$prefix" == "" ] ; then
+           #module_root_dir=`printenv ${module}_ROOT_DIR`
+           #if [ "$module_root_dir" != "" ] ; then
+           #    px=$module_root_dir
+           #else
+               px=${BUILD_DIR}${def_install_dir}/${module}${vx}
+           #fi
+       else
+           px=$prefix/${module}${vx}
        fi
         #########################################################
         # perform configure if -c flag is given or if 
        fi
         #########################################################
         # perform configure if -c flag is given or if 
@@ -337,16 +345,17 @@ for module in ${modules}; do
                echo '!!! Warning !!! Can not find configure script in '${module_src}'.'
                echo
            else
                echo '!!! Warning !!! Can not find configure script in '${module_src}'.'
                echo
            else
+               myconf_keys="${CONF_OPTS}"
                if [ $inst_with_gui -eq 0 ] ; then
                if [ $inst_with_gui -eq 0 ] ; then
-                   add_keys="--without-gui"
+                   myconf_keys="${myconf_keys} --without-gui"
                fi
                fi
-               if [  "${module}" == "MED" ] && [ "${METISDIR}" != "" ] && [ "${SCOTCHDIR}" != "" ] ; then
-                   add_keys="--enable-splitter=yes --with-metis=${METISDIR} --with-scotch=${SCOTCHDIR}"
+               if [ "${module}" == "MED" ] && [ "${METISDIR}" != "" ] && [ "${SCOTCHDIR}" != "" ] ; then
+                   myconf_keys="${myconf_keys} --enable-splitter=yes --with-metis=${METISDIR} --with-scotch=${SCOTCHDIR}"
                fi
                if [ "${module}" == "NETGENPLUGIN" ] && [ "$NETGENHOME" != "" ] ; then
                fi
                if [ "${module}" == "NETGENPLUGIN" ] && [ "$NETGENHOME" != "" ] ; then
-                   add_keys="--with-netgen=${NETGENHOME}"
+                   myconf_keys="${myconf_keys} --with-netgen=${NETGENHOME}"
                fi
                fi
-               ${module_src}/configure --prefix=$px ${optim} ${add_keys} >& ${LOG_DIR}/configure_${module}.log
+               ${module_src}/configure --prefix=$px ${optim} ${myconf_keys} >& ${LOG_DIR}/configure_${module}.log
                #########################################################
                # echo possible errors
                #########################################################
                #########################################################
                # echo possible errors
                #########################################################
@@ -372,9 +381,9 @@ for module in ${modules}; do
         # if make step is successful set the ${module}_ROOT_DIR
         # environment variable
         #########################################################
         # if make step is successful set the ${module}_ROOT_DIR
         # environment variable
         #########################################################
-        if [ $sts -eq 0 ] ; then
-           export ${module}_ROOT_DIR=${module_build}
-       fi
+        #if [ $sts -eq 0 ] ; then
+       #    export ${module}_ROOT_DIR=${module_build}
+       #fi
         #########################################################
         # print make errors
         #########################################################
         #########################################################
         # print make errors
         #########################################################
@@ -414,7 +423,12 @@ for module in ${modules}; do
            #########################################################
            if [ -e $px ] && [ $is_delete -eq 1 ] ; then
                echo "... Removing $px"
            #########################################################
            if [ -e $px ] && [ $is_delete -eq 1 ] ; then
                echo "... Removing $px"
-               rm -rf $px
+               rm -rf $px >& /dev/null
+               if [ "$?" != "0" ] ; then
+                   echo
+                   echo '!!! Warning !!! Cannot remove install directory ${px}. Permission denied.'
+                   echo
+               fi
            fi
            echo "... Performing make install"
            make install >& ${LOG_DIR}/make_install_${module}.log
            fi
            echo "... Performing make install"
            make install >& ${LOG_DIR}/make_install_${module}.log
index beaff54802a6d67c74eba7334e0448261b98ea3a..0c82b35f180db8943f5844b5761786d08570bfe4 100755 (executable)
@@ -843,7 +843,7 @@ if [ "$l" != "X" ] ; then
    # 20. process QScintilla-2.3 dependencies
     qscintilladir=`printenv QSCINTILLA_DIR`/lib
     if [ ! -d ${qscintilladir} ] ; then qscintilladir=`printenv QSCINTILLA_DIR`/lib ; fi
    # 20. process QScintilla-2.3 dependencies
     qscintilladir=`printenv QSCINTILLA_DIR`/lib
     if [ ! -d ${qscintilladir} ] ; then qscintilladir=`printenv QSCINTILLA_DIR`/lib ; fi
-    sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*QScintilla-[0-9]\.[0-9]\.[0-9]/lib% \1${qscintilladir}%g" $l > $l"_"
+    sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*QScintilla-[0-9]\.[0-9]\(\.[0-9]\)\?/lib% \1${qscintilladir}%g" $l > $l"_"
     chmod -f --reference=$l $l"_"
     mv -f $l"_" $l     
 
     chmod -f --reference=$l $l"_"
     mv -f $l"_" $l     
 
diff --git a/config_files/qscintilla-2.3.2.sh b/config_files/qscintilla-2.3.2.sh
deleted file mode 100755 (executable)
index 4d21391..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : qscintilla-2.3.2.sh
-#  Created   : Thu Oct 23 11:50:00 2008
-#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
-#  Project   : SALOME
-#  Module    : Installation Wizard
-#  Copyright : 2002-2008 CEA
-#
-#  This script is the part of the SALOME installation procedure.
-#
-####################################################################################
-
-check_version(){
-if [ -z "${QSCINTILLA_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" == "2.3.2" ] ; 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}
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-print_env_src()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
-# nothing to do
-##
-EOF
-(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-return $?
-}
-
-install_source()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_source_and_build()
-{
-# install sources
-install_source
-
-# build sources
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-cd ${PRODUCT_SRC_DIR}
-
-# workaround : clear temporarily INSTALL_ROOT env.var if it is set
-INSTALL_ROOT_PREV=$INSTALL_ROOT
-unset INSTALL_ROOT
-
-cd 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
-
-qmake -o Makefile qscintilla.pro
-check_job ${PRODUCT_DIR}/MAKE.LOG make 
-check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
-
-if [ "${INSTALL_ROOT_PREV}" != "" ] ; then
-    export INSTALL_ROOT=$INSTALL_ROOT_PREV
-fi
-
-#rm -rf ${PRODUCT_DIR}/doc
-#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
-cd ${PRODUCT_DIR};
-
-# remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
-    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
-fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_binary()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-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}
-
-# to generate environment scripts
-try_preinstalled
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INST_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-export PRODUCT_TYPE=$6;
-export INSTALL_PRODUCTS=$7;
-shift
-REMOVE_SRC_TMP=$8;
-test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="QScintilla-2.3.2"
-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
diff --git a/config_files/qscintilla-2.3.sh b/config_files/qscintilla-2.3.sh
new file mode 100755 (executable)
index 0000000..1e3ce30
--- /dev/null
@@ -0,0 +1,140 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : qscintilla-2.3.sh
+#  Created   : Thu Oct 23 11:50:00 2008
+#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
+#  Project   : SALOME
+#  Module    : Installation Wizard
+#  Copyright : 2002-2008 CEA
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+check_version(){
+if [ -z "${QSCINTILLA_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" == "2.3" ] ; 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}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+print_env_src()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE}_src $DELIM
+# nothing to do
+##
+EOF
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+return $?
+}
+
+install_source()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+cd ${PRODUCT_SRC_DIR}
+
+# workaround : clear temporarily INSTALL_ROOT env.var if it is set
+INSTALL_ROOT_PREV=$INSTALL_ROOT
+unset INSTALL_ROOT
+
+cd 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
+
+qmake -o Makefile qscintilla.pro
+check_job ${PRODUCT_DIR}/MAKE.LOG make 
+check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
+
+if [ "${INSTALL_ROOT_PREV}" != "" ] ; then
+    export INSTALL_ROOT=$INSTALL_ROOT_PREV
+fi
+
+#rm -rf ${PRODUCT_DIR}/doc
+#du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log
+cd ${PRODUCT_DIR};
+
+# remove sources and temporary files after building
+if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
+fi
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_binary()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+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}
+
+# to generate environment scripts
+try_preinstalled
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INST_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+export PRODUCT_TYPE=$6;
+export INSTALL_PRODUCTS=$7;
+shift
+REMOVE_SRC_TMP=$8;
+test $# == 10 && shift && SINGLE_DIR=$9
+export PRODUCT="QScintilla-2.3"
+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
diff --git a/config_files/qt-4.4.3.sh b/config_files/qt-4.4.3.sh
new file mode 100755 (executable)
index 0000000..b1ce675
--- /dev/null
@@ -0,0 +1,176 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : qt-4.4.3.sh
+#  Created   : Thu Dec 18 12:01:00 2002
+#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
+#  Project   : SALOME
+#  Module    : Installation Wizard
+#  Copyright : 2002-2008 CEA
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+QT_REF_VERSION="4.4.3"
+
+check_version(){
+if [ -z "$QTDIR" ]; then
+   return 1
+fi
+ver=`grep "QT_VERSION_STR" ${QTDIR}/include/Qt/qglobal.h | sed -e 's%^#define QT_VERSION_STR\([[:space:]]*\)%%g' -e 's%\"%%g'`
+if [ "$ver" == "${QT_REF_VERSION}" ] ; then
+    return 0
+fi
+return 1
+}
+
+print_env_bin()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export QTDIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PATH=\${QTDIR}/bin:\$PATH 
+export LD_LIBRARY_PATH=\${QTDIR}/lib:\${LD_LIBRARY_PATH}
+export QT_PLUGIN_PATH=\${QTDIR}/plugins
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+print_env_src()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE}_src $DELIM
+# nothing to do
+##
+EOF
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+return $?
+}
+
+install_source()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+cd ${PRODUCT_SRC_DIR}
+
+# configure
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure -prefix ${PRODUCT_DIR} -no-separate-debug-info -confirm-license
+
+GCC=`which gcc`
+cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
+used gcc=$GCC
+EOF
+
+check_job ${PRODUCT_DIR}/MAKE.LOG make 
+check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
+
+if test `uname -m` = "x86_64" ; then
+     cd ${PRODUCT_DIR}; ln -sf lib lib64
+fi
+
+# remove sources and temporary files after building
+if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
+fi
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_binary()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+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}
+
+# modify libdir
+cd ${PRODUCT_DIR}/lib
+
+# modify qt la files
+for l in `find $ldir -name "*.la"`; do
+sed -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" $l > $l"_"
+chmod -f --reference=$l $l"_" ; mv -f $l"_" $l
+sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${PRODUCT}% \1${PRODUCT_DIR}%g" $l > $l"_"
+chmod -f --reference=$l $l"_" ; mv -f $l"_" $l
+sed -e "s%^dependency_libs='\(-L\)\?[^[:space:]]*${PRODUCT}%dependency_libs=\'\1${PRODUCT_DIR}%g" $l > $l"_"
+chmod -f --reference=$l $l"_" ; mv -f $l"_" $l
+
+done
+
+# modify libGL.so flags
+has_gl_dep=`grep -E "^dependency_libs=.*-lGL.*" libQtOpenGL.la`
+gllibdir="`where_gl_libs`"
+if [ "$has_gl_dep" != "" ] && [ "$gllibdir" != "" ] ; then
+    sed -e "s%-lGL\b%%g" \
+       -e "s%^dependency_libs='\(.*\)%dependency_libs='-L$gllibdir -lGL \1%g" \
+       libQtOpenGL.la > libQtOpenGL.la.new
+    mv -f libQtOpenGL.la.new libQtOpenGL.la
+fi
+
+# modify qt package config
+cd ${PRODUCT_DIR}/lib/pkgconfig
+for l in X `find . -name "*.pc"`; do
+    if [ "${l}" != "X" ] ; then
+       sed -e "s%^prefix=\(.*\)%prefix=${PRODUCT_DIR}%g" \
+           -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \
+           -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-x11-opensource-src-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \
+           -e "s%moc_location=.*%moc_location=${PRODUCT_DIR}/bin/moc%g" \
+           -e "s%uic_location=.*%uic_location=${PRODUCT_DIR}/bin/uic%g" \
+           ${l} > ${l}_
+       chmod -f --reference=${l} ${l}_ ; mv -f ${l}_ ${l}
+    fi
+done
+
+# generate qt.conf file
+cat > ${PRODUCT_DIR}/bin/qt.conf <<EOF
+[Paths]
+Prefix=${PRODUCT_DIR}
+EOF
+# to generate environment scripts
+try_preinstalled
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INST_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+export PRODUCT_TYPE=$6;
+export INSTALL_PRODUCTS=$7;
+shift
+REMOVE_SRC_TMP=$8;
+test $# == 10 && shift && SINGLE_DIR=$9
+export PRODUCT="qt-${QT_REF_VERSION}"
+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 
diff --git a/config_files/qt-4.5.0.sh b/config_files/qt-4.5.0.sh
deleted file mode 100755 (executable)
index 144a7b2..0000000
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : qt-4.5.0.sh
-#  Created   : Thu Dec 18 12:01:00 2002
-#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
-#  Project   : SALOME
-#  Module    : Installation Wizard
-#  Copyright : 2002-2008 CEA
-#
-#  This script is the part of the SALOME installation procedure.
-#
-####################################################################################
-
-QT_REF_VERSION="4.5.0"
-
-check_version(){
-if [ -z "$QTDIR" ]; then
-   return 1
-fi
-ver=`grep "QT_VERSION_STR" ${QTDIR}/include/Qt/qglobal.h | sed -e 's%^#define QT_VERSION_STR\([[:space:]]*\)%%g' -e 's%\"%%g'`
-if [ "$ver" == "${QT_REF_VERSION}" ] ; then
-    return 0
-fi
-return 1
-}
-
-print_env_bin()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export QTDIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PATH=\${QTDIR}/bin:\$PATH 
-export LD_LIBRARY_PATH=\${QTDIR}/lib:\${LD_LIBRARY_PATH}
-export QT_PLUGIN_PATH=\${QTDIR}/plugins
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-print_env_src()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
-# nothing to do
-##
-EOF
-(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-return $?
-}
-
-install_source()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_source_and_build()
-{
-# install sources
-install_source
-
-# build sources
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-cd ${PRODUCT_SRC_DIR}
-
-sed -e "s%\(QLinearGradient gradient(QPoint(\)\(width()/2, 0), QPoint(width()/2, height()));\)%\1this->\2%g" \
-    examples/xmlpatterns/trafficinfo/mainwindow.cpp > examples/xmlpatterns/trafficinfo/mainwindow.cpp.1
-    mv -f examples/xmlpatterns/trafficinfo/mainwindow.cpp.1 examples/xmlpatterns/trafficinfo/mainwindow.cpp
-
-# configure
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure -prefix ${PRODUCT_DIR} -no-separate-debug-info -confirm-license -opensource
-
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=$GCC
-EOF
-
-check_job ${PRODUCT_DIR}/MAKE.LOG make 
-check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
-
-if test `uname -m` = "x86_64" ; then
-     cd ${PRODUCT_DIR}; ln -sf lib lib64
-fi
-
-# remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
-    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
-fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_binary()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-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}
-
-# modify libdir
-cd ${PRODUCT_DIR}/lib
-
-# modify qt la files
-for l in `find $ldir -name "*.la"`; do
-sed -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" $l > $l"_"
-chmod -f --reference=$l $l"_" ; mv -f $l"_" $l
-sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${PRODUCT}% \1${PRODUCT_DIR}%g" $l > $l"_"
-chmod -f --reference=$l $l"_" ; mv -f $l"_" $l
-sed -e "s%^dependency_libs='\(-L\)\?[^[:space:]]*${PRODUCT}%dependency_libs=\'\1${PRODUCT_DIR}%g" $l > $l"_"
-chmod -f --reference=$l $l"_" ; mv -f $l"_" $l
-
-done
-
-# modify libGL.so flags
-has_gl_dep=`grep -E "^dependency_libs=.*-lGL.*" libQtOpenGL.la`
-gllibdir="`where_gl_libs`"
-if [ "$has_gl_dep" != "" ] && [ "$gllibdir" != "" ] ; then
-    sed -e "s%-lGL\b%%g" \
-       -e "s%^dependency_libs='\(.*\)%dependency_libs='-L$gllibdir -lGL \1%g" \
-       libQtOpenGL.la > libQtOpenGL.la.new
-    mv -f libQtOpenGL.la.new libQtOpenGL.la
-fi
-
-# modify qt package config
-cd ${PRODUCT_DIR}/lib/pkgconfig
-for l in X `find . -name "*.pc"`; do
-    if [ "${l}" != "X" ] ; then
-       sed -e "s%^prefix=\(.*\)%prefix=${PRODUCT_DIR}%g" \
-           -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \
-           -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-x11-opensource-src-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \
-           -e "s%moc_location=.*%moc_location=${PRODUCT_DIR}/bin/moc%g" \
-           -e "s%uic_location=.*%uic_location=${PRODUCT_DIR}/bin/uic%g" \
-           ${l} > ${l}_
-       chmod -f --reference=${l} ${l}_ ; mv -f ${l}_ ${l}
-    fi
-done
-
-# generate qt.conf file
-cat > ${PRODUCT_DIR}/bin/qt.conf <<EOF
-[Paths]
-Prefix=${PRODUCT_DIR}
-EOF
-# to generate environment scripts
-try_preinstalled
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INST_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-export PRODUCT_TYPE=$6;
-export INSTALL_PRODUCTS=$7;
-shift
-REMOVE_SRC_TMP=$8;
-test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="qt-${QT_REF_VERSION}"
-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 
diff --git a/config_files/qt-4.5.1.sh b/config_files/qt-4.5.1.sh
deleted file mode 100755 (executable)
index a5d6115..0000000
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : qt-4.5.1.sh
-#  Created   : Thu Dec 18 12:01:00 2002
-#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
-#  Project   : SALOME
-#  Module    : Installation Wizard
-#  Copyright : 2002-2008 CEA
-#
-#  This script is the part of the SALOME installation procedure.
-#
-####################################################################################
-
-QT_REF_VERSION="4.5.1"
-
-check_version(){
-if [ -z "$QTDIR" ]; then
-   return 1
-fi
-ver=`grep "QT_VERSION_STR" ${QTDIR}/include/Qt/qglobal.h | sed -e 's%^#define QT_VERSION_STR\([[:space:]]*\)%%g' -e 's%\"%%g'`
-if [ "$ver" == "${QT_REF_VERSION}" ] ; then
-    return 0
-fi
-return 1
-}
-
-print_env_bin()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export QTDIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PATH=\${QTDIR}/bin:\$PATH 
-export LD_LIBRARY_PATH=\${QTDIR}/lib:\${LD_LIBRARY_PATH}
-export QT_PLUGIN_PATH=\${QTDIR}/plugins
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-print_env_src()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
-# nothing to do
-##
-EOF
-(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-return $?
-}
-
-install_source()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_source_and_build()
-{
-# install sources
-install_source
-
-# build sources
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-cd ${PRODUCT_SRC_DIR}
-
-sed -e "s%\(QLinearGradient gradient(QPoint(\)\(width()/2, 0), QPoint(width()/2, height()));\)%\1this->\2%g" \
-    examples/xmlpatterns/trafficinfo/mainwindow.cpp > examples/xmlpatterns/trafficinfo/mainwindow.cpp.1
-    mv -f examples/xmlpatterns/trafficinfo/mainwindow.cpp.1 examples/xmlpatterns/trafficinfo/mainwindow.cpp
-
-# configure
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure -prefix ${PRODUCT_DIR} -no-separate-debug-info -confirm-license -opensource
-
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=$GCC
-EOF
-
-check_job ${PRODUCT_DIR}/MAKE.LOG make 
-check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
-
-if test `uname -m` = "x86_64" ; then
-     cd ${PRODUCT_DIR}; ln -sf lib lib64
-fi
-
-# remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
-    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
-fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_binary()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-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}
-
-# modify libdir
-cd ${PRODUCT_DIR}/lib
-
-# modify qt la files
-for l in `find $ldir -name "*.la"`; do
-sed -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" $l > $l"_"
-chmod -f --reference=$l $l"_" ; mv -f $l"_" $l
-sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*${PRODUCT}% \1${PRODUCT_DIR}%g" $l > $l"_"
-chmod -f --reference=$l $l"_" ; mv -f $l"_" $l
-sed -e "s%^dependency_libs='\(-L\)\?[^[:space:]]*${PRODUCT}%dependency_libs=\'\1${PRODUCT_DIR}%g" $l > $l"_"
-chmod -f --reference=$l $l"_" ; mv -f $l"_" $l
-
-done
-
-# modify libGL.so flags
-has_gl_dep=`grep -E "^dependency_libs=.*-lGL.*" libQtOpenGL.la`
-gllibdir="`where_gl_libs`"
-if [ "$has_gl_dep" != "" ] && [ "$gllibdir" != "" ] ; then
-    sed -e "s%-lGL\b%%g" \
-       -e "s%^dependency_libs='\(.*\)%dependency_libs='-L$gllibdir -lGL \1%g" \
-       libQtOpenGL.la > libQtOpenGL.la.new
-    mv -f libQtOpenGL.la.new libQtOpenGL.la
-fi
-
-# modify qt package config
-cd ${PRODUCT_DIR}/lib/pkgconfig
-for l in X `find . -name "*.pc"`; do
-    if [ "${l}" != "X" ] ; then
-       sed -e "s%^prefix=\(.*\)%prefix=${PRODUCT_DIR}%g" \
-           -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \
-           -e "s%[[:space:]]\(-L\)\?[^[:space:]]*qt-x11-opensource-src-${QT_REF_VERSION}% \1${PRODUCT_DIR}%g" \
-           -e "s%moc_location=.*%moc_location=${PRODUCT_DIR}/bin/moc%g" \
-           -e "s%uic_location=.*%uic_location=${PRODUCT_DIR}/bin/uic%g" \
-           ${l} > ${l}_
-       chmod -f --reference=${l} ${l}_ ; mv -f ${l}_ ${l}
-    fi
-done
-
-# generate qt.conf file
-cat > ${PRODUCT_DIR}/bin/qt.conf <<EOF
-[Paths]
-Prefix=${PRODUCT_DIR}
-EOF
-# to generate environment scripts
-try_preinstalled
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INST_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-export PRODUCT_TYPE=$6;
-export INSTALL_PRODUCTS=$7;
-shift
-REMOVE_SRC_TMP=$8;
-test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="qt-${QT_REF_VERSION}"
-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 
diff --git a/config_files/qwt-5.1.1.sh b/config_files/qwt-5.1.1.sh
new file mode 100755 (executable)
index 0000000..a5e83fd
--- /dev/null
@@ -0,0 +1,147 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : qwt-5.1.1.sh
+#  Created   : Thu Dec 18 12:01:00 2002
+#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
+#  Project   : SALOME
+#  Module    : Installation Wizard
+#  Copyright : 2002-2008 CEA
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+check_version()
+{
+if [ -n "${QWTHOME}" ] ; then 
+    qwtinc=${QWTHOME}/include/qwt_global.h
+    if [ ! -f $qwtinc ] ; then
+       qwtinc=${QWTHOME}/include/qwt/qwt_global.h
+    fi
+    if [ -f $qwtinc ] ; then
+       ver=`grep -e "^#define[[:space:]]\+QWT_VERSION_STR" $qwtinc | sed -e 's/^#define[[:space:]]\+QWT_VERSION_STR[[:space:]]*"\(.*\)"/\1/'`
+       if [ "$ver" == "5.1.1" ]; then
+           return 0
+       fi
+    fi
+fi
+return 1
+}
+
+print_env_bin()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export QWTHOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export LD_LIBRARY_PATH=\${QWTHOME}/lib:\${LD_LIBRARY_PATH} 
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+print_env_src()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
+#$DELIM ${PRODUCT_TYPE}_src $DELIM
+# nothing to do
+##
+EOF
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+return $?
+}
+
+install_source()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+cd ${PRODUCT_SRC_DIR}
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+sed -e "s%\(INSTALLBASE[[:space:]]*\)=\([[:space:]]*\).*%\1=\2${PRODUCT_DIR}%g" \
+    -e "s%#\(CONFIG[[:space:]]*+=[[:space:]]*QwtSVGItem\)%\1%g" qwtconfig.pri > qwtconfig.pri.new
+mv qwtconfig.pri.new qwtconfig.pri
+
+sed -e "s%\(target\.path[[:space:]]*\)=\([[:space:]]*\).*%\1=\2\$\$INSTALLBASE/plugins/designer%g" \
+    designer/designer.pro > designer/designer.pro.new
+mv designer/designer.pro.new designer/designer.pro
+
+INSTALL_ROOT_PREV=$INSTALL_ROOT
+unset INSTALL_ROOT
+
+qmake
+
+GCC=`which gcc`
+cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
+used gcc=$GCC
+EOF
+
+check_job ${PRODUCT_DIR}/MAKE.LOG make
+
+check_job ${PRODUCT_DIR}/MAKE_INSTALL.LOG make install
+
+if [ "${INSTALL_ROOT_PREV}" != "" ] ; then
+    export INSTALL_ROOT=$INSTALL_ROOT_PREV
+fi
+
+cd ${PRODUCT_DIR};
+
+# remove sources and temporary files after building
+if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
+fi
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_binary()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+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}
+
+# to generate environment script for sources
+try_preinstalled
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INST_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+export PRODUCT_TYPE=$6;
+export INSTALL_PRODUCTS=$7;
+shift
+REMOVE_SRC_TMP=$8;
+test $# == 10 && shift && SINGLE_DIR=$9
+export PRODUCT="qwt-5.1.1"
+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 
diff --git a/config_files/qwt-5.2.0.sh b/config_files/qwt-5.2.0.sh
deleted file mode 100755 (executable)
index 13c07ab..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : qwt-5.2.0.sh
-#  Created   : Thu Dec 18 12:01:00 2002
-#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
-#  Project   : SALOME
-#  Module    : Installation Wizard
-#  Copyright : 2002-2008 CEA
-#
-#  This script is the part of the SALOME installation procedure.
-#
-####################################################################################
-
-check_version()
-{
-if [ -n "${QWTHOME}" ] ; then 
-    qwtinc=${QWTHOME}/include/qwt_global.h
-    if [ ! -f $qwtinc ] ; then
-       qwtinc=${QWTHOME}/include/qwt/qwt_global.h
-    fi
-    if [ -f $qwtinc ] ; then
-       ver=`grep -e "^#define[[:space:]]\+QWT_VERSION_STR" $qwtinc | sed -e 's/^#define[[:space:]]\+QWT_VERSION_STR[[:space:]]*"\(.*\)"/\1/'`
-       if [ "$ver" == "5.2.0" ]; then
-           return 0
-       fi
-    fi
-fi
-return 1
-}
-
-print_env_bin()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export QWTHOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export LD_LIBRARY_PATH=\${QWTHOME}/lib:\${LD_LIBRARY_PATH} 
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-print_env_src()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
-# nothing to do
-##
-EOF
-(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-return $?
-}
-
-install_source()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_source_and_build()
-{
-# install sources
-install_source
-
-# build sources
-cd ${PRODUCT_SRC_DIR}
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-
-sed -e "s%\(INSTALLBASE[[:space:]]*\)=\([[:space:]]*\).*%\1=\2${PRODUCT_DIR}%g" \
-    -e "s%#\(CONFIG[[:space:]]*+=[[:space:]]*QwtSVGItem\)%\1%g" qwtconfig.pri > qwtconfig.pri.new
-mv qwtconfig.pri.new qwtconfig.pri
-
-sed -e "s%\(target\.path[[:space:]]*\)=\([[:space:]]*\).*%\1=\2\$\$INSTALLBASE/plugins/designer%g" \
-    designer/designer.pro > designer/designer.pro.new
-mv designer/designer.pro.new designer/designer.pro
-
-INSTALL_ROOT_PREV=$INSTALL_ROOT
-unset INSTALL_ROOT
-
-qmake
-
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=$GCC
-EOF
-
-check_job ${PRODUCT_DIR}/MAKE.LOG make
-
-check_job ${PRODUCT_DIR}/MAKE_INSTALL.LOG make install
-
-if [ "${INSTALL_ROOT_PREV}" != "" ] ; then
-    export INSTALL_ROOT=$INSTALL_ROOT_PREV
-fi
-
-cd ${PRODUCT_DIR};
-
-# remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
-    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
-fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_binary()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-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}
-
-# to generate environment script for sources
-try_preinstalled
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INST_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-export PRODUCT_TYPE=$6;
-export INSTALL_PRODUCTS=$7;
-shift
-REMOVE_SRC_TMP=$8;
-test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="qwt-5.2.0"
-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 
diff --git a/config_files/sip-4.7.7.sh b/config_files/sip-4.7.7.sh
new file mode 100755 (executable)
index 0000000..5625aad
--- /dev/null
@@ -0,0 +1,168 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : sip-4.7.7.sh
+#  Created   : Thu Dec 18 12:01:00 2002
+#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
+#  Project   : SALOME
+#  Module    : Installation Wizard
+#  Copyright : 2002-2008 CEA
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+check_version()
+{
+if [ -n "${SIPDIR}" ]; then
+    ver=`${SIPDIR}/bin/sip -V | awk '{print $1}'`
+    maj_ver=`echo $ver | awk -F. '{if(NF>0) print $1; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'`
+    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
+       return 0
+    fi
+fi
+return 1
+}
+
+print_env_bin()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export SIPDIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PATH=\${SIPDIR}/bin:\${PATH}
+export PYTHONPATH=\${SIPDIR}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
+export LD_LIBRARY_PATH=\${SIPDIR}/lib/python\${PYTHON_VERSION}/site-packages:\${LD_LIBRARY_PATH}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+print_env_src()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
+#$DELIM ${PRODUCT_TYPE}_src $DELIM
+# nothing to do
+##
+EOF
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+return $?
+}
+
+install_source()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_source_and_build()
+{
+# install sources
+install_source
+
+# build sources
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+cd ${PRODUCT_SRC_DIR}
+
+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"
+fi
+
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
+    python configure.py $SIP_CONFIGURE_OPTIONS
+GCC=`which gcc`
+cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
+used gcc=$GCC
+EOF
+check_job ${PRODUCT_DIR}/MAKE.LOG make
+check_job ${PRODUCT_DIR}/INSTALL.LOG make install
+
+cd ${PRODUCT_DIR};
+
+# remove sources and temporary files after building
+if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
+    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
+fi
+
+# to generate environment scripts
+try_preinstalled
+}
+
+install_binary()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+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 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"
+fi
+
+# modify sipconfig.py file
+if [ -n "${PYTHONROOT}" ] && [ -n "${QTDIR}" ] ; then
+    cd ${PRODUCT_DIR}/lib/python${PYTHON_VERSION}/site-packages
+    python_version=`python -V 2>&1 | awk '{print $2}' | awk -F. '{printf("0x%02d%02d%02d",$1,$2,$3)}'`
+    qt_version=`grep -e "^#define[[:space:]]\+QT_VERSION[[:space:]]\+" ${QTDIR}/include/Qt/qglobal.h | sed -e 's%^#define[[:space:]\+QT_VERSION[[:space:]]\+\(.*\)$%\1%g'`
+    sed -e "s%\('default_bin_dir':[[:space:]]*\).*%\1'${PYTHONROOT}/bin',%g" \
+       -e "s%\('default_mod_dir':[[:space:]]*\).*%\1'${PYTHONROOT}/lib/python${PYTHON_VERSION}/site-packages',%g" \
+       -e "s%\('default_sip_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/sip',%g" \
+       -e "s%\('sip_bin':[[:space:]]*\).*%\1'${PRODUCT_DIR}/bin/sip',%g" \
+       -e "s%\('sip_inc_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/include/python${PYTHON_VERSION}',%g" \
+       -e "s%\('sip_mod_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/lib/python${PYTHON_VERSION}/site-packages',%g" \
+       -e "s%\('qt_dir':[[:space:]]*\).*%\1'${QTDIR}',%g" \
+       -e "s%\('qt_version':[[:space:]]*\).*%\1${qt_version},%g" \
+       -e "s%\('qt_inc_dir':[[:space:]]*\).*%\1'${QTDIR}/include',%g" \
+       -e "s%\('qt_lib_dir':[[:space:]]*\).*%\1'${QTDIR}/lib',%g" \
+       -e "s%\('INCDIR_QT':[[:space:]]*\).*%\1'${QTDIR}/include',%g" \
+       -e "s%\('LIBDIR_QT':[[:space:]]*\).*%\1'${QTDIR}/lib',%g" \
+       -e "s%\('MOC':[[:space:]]*\).*%\1'${QTDIR}/bin/moc',%g" \
+       -e "s%\('py_version':[[:space:]]*\).*%\1${python_version},%g" \
+       -e "s%\('sip_config_args':[[:space:]]*\).*%\1'${SIP_CONFIGURE_OPTIONS}',%g" \
+       -e "s%\('py_inc_dir':[[:space:]]*\).*%\1'${PYTHONROOT}/include/python${PYTHON_VERSION}',%g" \
+       -e "s%\('py_lib_dir':[[:space:]]*\).*%\1'${PYTHONROOT}/lib/python${PYTHON_VERSION}/config',%g" \
+       -e "s%\('py_conf_inc_dir':[[:space:]]*\).*%\1'${PYTHONROOT}/include/python${PYTHON_VERSION}',%g" sipconfig.py > sipconfig.py.1
+    mv -f sipconfig.py.1 sipconfig.py
+fi
+
+# to generate environment scripts
+try_preinstalled
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INST_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+export PRODUCT_TYPE=$6;
+export INSTALL_PRODUCTS=$7;
+shift
+REMOVE_SRC_TMP=$8;
+test $# == 10 && shift && SINGLE_DIR=$9
+export PRODUCT="sip-4.7.7"
+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 
diff --git a/config_files/sip-4.7.9.sh b/config_files/sip-4.7.9.sh
deleted file mode 100755 (executable)
index 61d978c..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-#!/bin/bash -noprofile
-
-####################################################################################
-#  File      : sip-4.7.9.sh
-#  Created   : Thu Dec 18 12:01:00 2002
-#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
-#  Project   : SALOME
-#  Module    : Installation Wizard
-#  Copyright : 2002-2008 CEA
-#
-#  This script is the part of the SALOME installation procedure.
-#
-####################################################################################
-
-check_version()
-{
-if [ -n "${SIPDIR}" ]; then
-    ver=`${SIPDIR}/bin/sip -V | awk '{print $1}'`
-    maj_ver=`echo $ver | awk -F. '{if(NF>0) print $1; else print 0}' | sed -e 's/^\([0-9]*\).*$/\1/'`
-    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
-       return 0
-    fi
-fi
-return 1
-}
-
-print_env_bin()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export SIPDIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PATH=\${SIPDIR}/bin:\${PATH}
-export PYTHONPATH=\${SIPDIR}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
-export LD_LIBRARY_PATH=\${SIPDIR}/lib/python\${PYTHON_VERSION}/site-packages:\${LD_LIBRARY_PATH}
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-print_env_src()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
-#$DELIM ${PRODUCT_TYPE}_src $DELIM
-# nothing to do
-##
-EOF
-(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-return $?
-}
-
-install_source()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
-source ${INSTALL_WORK}/$SHRC
-
-check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_source_and_build()
-{
-# install sources
-install_source
-
-# build sources
-test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-cd ${PRODUCT_SRC_DIR}
-
-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"
-fi
-
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
-    python configure.py $SIP_CONFIGURE_OPTIONS
-GCC=`which gcc`
-cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=$GCC
-EOF
-check_job ${PRODUCT_DIR}/MAKE.LOG make
-check_job ${PRODUCT_DIR}/INSTALL.LOG make install
-
-cd ${PRODUCT_DIR};
-
-# remove sources and temporary files after building
-if [ ${REMOVE_SRC_TMP} == "TRUE" ] ; then
-    test -d ${PRODUCT_SRC_DIR} && rm -fr ${PRODUCT_SRC_DIR}
-fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-install_binary()
-{
-make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
-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 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"
-fi
-
-# modify sipconfig.py file
-if [ -n "${PYTHONROOT}" ] && [ -n "${QTDIR}" ] ; then
-    cd ${PRODUCT_DIR}/lib/python${PYTHON_VERSION}/site-packages
-    python_version=`python -V 2>&1 | awk '{print $2}' | awk -F. '{printf("0x%02d%02d%02d",$1,$2,$3)}'`
-    qt_version=`grep -e "^#define[[:space:]]\+QT_VERSION[[:space:]]\+" ${QTDIR}/include/Qt/qglobal.h | sed -e 's%^#define[[:space:]\+QT_VERSION[[:space:]]\+\(.*\)$%\1%g'`
-    sed -e "s%\('default_bin_dir':[[:space:]]*\).*%\1'${PYTHONROOT}/bin',%g" \
-       -e "s%\('default_mod_dir':[[:space:]]*\).*%\1'${PYTHONROOT}/lib/python${PYTHON_VERSION}/site-packages',%g" \
-       -e "s%\('default_sip_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/sip',%g" \
-       -e "s%\('sip_bin':[[:space:]]*\).*%\1'${PRODUCT_DIR}/bin/sip',%g" \
-       -e "s%\('sip_inc_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/include/python${PYTHON_VERSION}',%g" \
-       -e "s%\('sip_mod_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/lib/python${PYTHON_VERSION}/site-packages',%g" \
-       -e "s%\('qt_dir':[[:space:]]*\).*%\1'${QTDIR}',%g" \
-       -e "s%\('qt_version':[[:space:]]*\).*%\1${qt_version},%g" \
-       -e "s%\('qt_inc_dir':[[:space:]]*\).*%\1'${QTDIR}/include',%g" \
-       -e "s%\('qt_lib_dir':[[:space:]]*\).*%\1'${QTDIR}/lib',%g" \
-       -e "s%\('INCDIR_QT':[[:space:]]*\).*%\1'${QTDIR}/include',%g" \
-       -e "s%\('LIBDIR_QT':[[:space:]]*\).*%\1'${QTDIR}/lib',%g" \
-       -e "s%\('MOC':[[:space:]]*\).*%\1'${QTDIR}/bin/moc',%g" \
-       -e "s%\('py_version':[[:space:]]*\).*%\1${python_version},%g" \
-       -e "s%\('sip_config_args':[[:space:]]*\).*%\1'${SIP_CONFIGURE_OPTIONS}',%g" \
-       -e "s%\('py_inc_dir':[[:space:]]*\).*%\1'${PYTHONROOT}/include/python${PYTHON_VERSION}',%g" \
-       -e "s%\('py_lib_dir':[[:space:]]*\).*%\1'${PYTHONROOT}/lib/python${PYTHON_VERSION}/config',%g" \
-       -e "s%\('py_conf_inc_dir':[[:space:]]*\).*%\1'${PYTHONROOT}/include/python${PYTHON_VERSION}',%g" sipconfig.py > sipconfig.py.1
-    mv -f sipconfig.py.1 sipconfig.py
-fi
-
-# to generate environment scripts
-try_preinstalled
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INST_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-export PRODUCT_TYPE=$6;
-export INSTALL_PRODUCTS=$7;
-shift
-REMOVE_SRC_TMP=$8;
-test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="sip-4.7.9"
-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 
index 34329463f8a8298d8d5c0966972fa3814ca5fb04..7d050419ce380e3079c3599711e11d59030240bb 100644 (file)
Binary files a/doc/batchmode.png and b/doc/batchmode.png differ
index 7c997287e2bdd528061ff9989e51735343b75a29..9bd4072813b96238b7914d1285ebe6e2a43c07ce 100755 (executable)
Binary files a/doc/choicepage.png and b/doc/choicepage.png differ
index fafc98936f5a84d94d7991340730ce7387bef649..7ba384ae56408bfe4c513259432a6ef9e86a8390 100644 (file)
Binary files a/doc/directorypage.png and b/doc/directorypage.png differ
index 8359d54c05a592161162802a226c919ed85c0c06..a88be166bf10b9f08eded3dc79dc67b10aa7d3a7 100644 (file)
Binary files a/doc/installtypepage.png and b/doc/installtypepage.png differ
index de29d067aaef323c99ef5fe40cc3f8d424e0eda1..0ab59ed662c716d646368e976540163b03ddd22b 100755 (executable)
Binary files a/doc/intropage.png and b/doc/intropage.png differ
index cfbf60c3cc07f15af4bba99ec082080bf1405a1d..d3cb2a3f30cc8b4f62e4e4dc471612df91ac4e21 100644 (file)
Binary files a/doc/platformpage.png and b/doc/platformpage.png differ
index 1033c0c731922766ee0c9217b5018c388b195808..1c1ca36208fc6025b35c71b9f3d5cee0a1e01d75 100644 (file)
Binary files a/doc/productpage1.png and b/doc/productpage1.png differ
index dc39f2ed44d762d1dde3f9ae2cc6b037f65df91b..86543ce5208ce14a05946c1bb2a749060e36e7a8 100644 (file)
Binary files a/doc/productpage2.png and b/doc/productpage2.png differ
index 7c2db8b20193fd73d6e7d6a182656fdce94d0da7..2ff3dcd35ada53803084250b99c4430c4b053ca8 100644 (file)
Binary files a/doc/productpage3.png and b/doc/productpage3.png differ
index 9f0de3675f3e8153c5fa83b2468bedec74bfd698..b48fada2ae7a2966a9b0c991b32d1d056a3ee949 100644 (file)
Binary files a/doc/productpage4.png and b/doc/productpage4.png differ
index 465ce5873dd99be5afa79e7c959513389b222af7..bf9c81eacc48f244158752aa1f0255ff1f50c256 100644 (file)
Binary files a/doc/progresspage1.png and b/doc/progresspage1.png differ
index 50cc18b6c854e03572b58f37722fc42d77f64c09..f63ebcf9c2de09103e1b4caa20adb84a4da5a40b 100644 (file)
Binary files a/doc/progresspage2.png and b/doc/progresspage2.png differ
index 9dfc60df42e0d75a3a2bdade3814b7bd767f93d4..b3cb7ca5dd348ea1312e4214cdba395dd5927e5a 100755 (executable)
@@ -36,7 +36,7 @@ Wizard Help</font></font></h3>
 </table>
 </center>
 <div align="right"><b><font color="#000099">updated for the version </font><font
 </table>
 </center>
 <div align="right"><b><font color="#000099">updated for the version </font><font
- color="#ff0000">5.1.1</font></b></div>
+ color="#ff0000">5.1.2</font></b></div>
 <hr>
 <ul>
   <li> <a href="#install_from_wizard">Installing products with the
 <hr>
 <ul>
   <li> <a href="#install_from_wizard">Installing products with the
@@ -150,8 +150,8 @@ is the version number of the Installation Wizard, not of SALOME platform). <br>
 </p>
 <p>The installation procedure supports different <span style="color: rgb(0, 0, 153);">Linux
 </span>platforms and installs various 3d-party installation prerequisite products, which
 </p>
 <p>The installation procedure supports different <span style="color: rgb(0, 0, 153);">Linux
 </span>platforms and installs various 3d-party installation prerequisite products, which
-are required by SALOME platform. As it was mentioned above, the basic
-target platform for SALOME 4.0.0 and later is <span style="color: rgb(0, 0, 153);">Linux Mandriva 2006</span>.<br>
+are required by SALOME platform. The basic target platforms for SALOME
+5.0.0 and newer are <b>Linux Mandriva 2008 32bit</b> and <b>Linux Debian 4.0 (Etch) 64bit</b>.<br>
 The usage of configuration XML files provides a flexible way to modify
 the list of products to be installed by the Installation Wizard without
 changing the source code of the application. Just create your own XML
 The usage of configuration XML files provides a flexible way to modify
 the list of products to be installed by the Installation Wizard without
 changing the source code of the application. Just create your own XML
@@ -180,7 +180,7 @@ page is shown in <a href="#IntroPage">Figure 1</a>.
 Skip this page by pressing <i>"Next"</i> button:
 </p>
 <center><a name="IntroPage"></a><br>
 Skip this page by pressing <i>"Next"</i> button:
 </p>
 <center><a name="IntroPage"></a><br>
-<img alt="Intro page" src="intropage.png" style="width: 593px; height: 495px;">
+<img alt="Intro page" src="intropage.png" style="width: 606px; height: 419px;">
 <p><b>Figure 1:</b> "Introduction" page</p>
 </center>
 <p>In the second page you are proposed to select the type of the
 <p><b>Figure 1:</b> "Introduction" page</p>
 </center>
 <p>In the second page you are proposed to select the type of the
@@ -221,19 +221,19 @@ installation type, then you can also check "Remove sources and
 temporary files after compilation" option.
 </p>
 <center><a name="Installation_type_page"></a><br>
 temporary files after compilation" option.
 </p>
 <center><a name="Installation_type_page"></a><br>
-<img alt="Installation type page" src="installtypepage.png" style="width: 593px; height: 495px;">
+<img alt="Installation type page" src="installtypepage.png" style="width: 606px; height: 419px;">
 <p><b>Figure 2:</b> "Type of installation" page
 </p>
 </center>
 <p>After the installation type has been selected you click <i>"Next"</i>
 button and the Installation Wizard tries to determine the Linux
 <p><b>Figure 2:</b> "Type of installation" page
 </p>
 </center>
 <p>After the installation type has been selected you click <i>"Next"</i>
 button and the Installation Wizard tries to determine the Linux
-platform to load the corresponding configuration file. If the user
+platform to load the corresponding configuration file. If the operating
 system is not defined or the current SALOME package does not support
 system is not defined or the current SALOME package does not support
-this one, the warning will appear ("<i>Install binaries</i>"
+this system, the warning message will appear ("<i>Install binaries</i>"
 and "<i>Install sources</i>" installation types only):
 </p>
 <center><a name="Platform_page"></a><br>
 and "<i>Install sources</i>" installation types only):
 </p>
 <center><a name="Platform_page"></a><br>
-<img alt="Platform page" src="platformpage.png" style="width: 593px; height: 468px;">
+<img alt="Platform page" src="platformpage.png" style="width: 606px; height: 419px;">
 <p><b>Figure 3:</b> "Installation platform" page
 </p>
 </center>
 <p><b>Figure 3:</b> "Installation platform" page
 </p>
 </center>
@@ -264,7 +264,7 @@ experience some troubles with the
 installation.
 </p>
 <center><a name="Directory_page"></a><br>
 installation.
 </p>
 <center><a name="Directory_page"></a><br>
-<img alt="Directory page" src="directorypage.png" style="width: 593px; height: 495px;">
+<img alt="Directory page" src="directorypage.png" style="width: 606px; height: 419px;">
 <p><b>Figure 4:</b> "Installation directory" page
 </p>
 </center>
 <p><b>Figure 4:</b> "Installation directory" page
 </p>
 </center>
@@ -276,7 +276,7 @@ products. To show it, just click "<i>Show prerequisites...</i>"
 button.
 </p>
 <center><a name="Products_page1"></a><br>
 button.
 </p>
 <center><a name="Products_page1"></a><br>
-<img alt="Products page (default mode)" src="productpage1.png" style="width: 593px; height: 495px;">
+<img alt="Products page (default mode)" src="productpage1.png" style="width: 606px; height: 419px;">
 <p><b>Figure 5:</b> Choice of the SALOME modules
 </p>
 </center>
 <p><b>Figure 5:</b> Choice of the SALOME modules
 </p>
 </center>
@@ -289,7 +289,7 @@ the selected type of installation.<br>
 To hide the prerequisites list - click "<i>Hide prerequisites</i>"
 button.</p>
 <center><a name="Products_page2"></a><br>
 To hide the prerequisites list - click "<i>Hide prerequisites</i>"
 button.</p>
 <center><a name="Products_page2"></a><br>
-<img alt="Products page (full mode)" src="productpage2.png" style="width: 593px; height: 495px;">
+<img alt="Products page (full mode)" src="productpage2.png" style="width: 606px; height: 419px;">
 <p><b>Figure 6:</b> Choice of the prerequisites
 </p>
 </center>
 <p><b>Figure 6:</b> Choice of the prerequisites
 </p>
 </center>
@@ -332,7 +332,7 @@ automatically unchecked. In other words, it is possible to add more
 prerequisites than necessary.
 <p></p>
 <center><a name="Products_page3"></a><br>
 prerequisites than necessary.
 <p></p>
 <center><a name="Products_page3"></a><br>
-<img alt="Products page (dependencies presentation)" src="productpage3.png" style="width: 593px; height: 495px;">
+<img alt="Products page (dependencies presentation)" src="productpage3.png" style="width: 606px; height: 419px;">
 <p><b>Figure 7:</b> Dependencies between modules and
 prerequisites
 </p>
 <p><b>Figure 7:</b> Dependencies between modules and
 prerequisites
 </p>
@@ -348,7 +348,7 @@ possibility to check them in this mode (see <a href="#Products_page4">figure</a>
 By default 'Installation with GUI' checkbox is switched on.
 </p>
 <center><a name="Products_page4"></a><br>
 By default 'Installation with GUI' checkbox is switched on.
 </p>
 <center><a name="Products_page4"></a><br>
-<img alt="Products page (Installation without GUI)" src="productpage4.png" style="width: 593px; height: 495px;">
+<img alt="Products page (Installation without GUI)" src="productpage4.png" style="width: 606px; height: 419px;">
 <p><b>Figure 8:</b> Installation without GUI mode
 </p>
 </center>
 <p><b>Figure 8:</b> Installation without GUI mode
 </p>
 </center>
@@ -409,7 +409,7 @@ test fails you will see the corresponding warning message box.
 Otherwise the wizard will proceed to the next page:
 </p>
 <center><a name="ChoicePage"></a><br>
 Otherwise the wizard will proceed to the next page:
 </p>
 <center><a name="ChoicePage"></a><br>
-<img alt="Choice page" src="choicepage.png" style="width: 593px; height: 495px;">
+<img alt="Choice page" src="choicepage.png" style="width: 606px; height: 419px;">
 <p><b>Figure 9:</b> "Check your choice" page
 </p>
 </center>
 <p><b>Figure 9:</b> "Check your choice" page
 </p>
 </center>
@@ -422,7 +422,7 @@ button to
 follow to the <a href="#ProgressPage1">progress page</a>.
 </p>
 <center><a name="ProgressPage1"></a><br>
 follow to the <a href="#ProgressPage1">progress page</a>.
 </p>
 <center><a name="ProgressPage1"></a><br>
-<img alt="Progress page (not started yet)" src="progresspage1.png" style="width: 593px; height: 495px;">
+<img alt="Progress page (not started yet)" src="progresspage1.png" style="width: 606px; height: 419px;">
 <p><b>Figure 10:</b> "Installation progress" page:
 not started yet
 </p>
 <p><b>Figure 10:</b> "Installation progress" page:
 not started yet
 </p>
@@ -452,7 +452,7 @@ implementation it is not possible to resume the stopped installation
 process; the installation will restart from the very beginning. <br>
 </p>
 <center><a name="ProgressPage2"></a><br>
 process; the installation will restart from the very beginning. <br>
 </p>
 <center><a name="ProgressPage2"></a><br>
-<img alt="Progress page (installation started)" src="progresspage2.png" style="width: 593px; height: 495px;">
+<img alt="Progress page (installation started)" src="progresspage2.png" style="width: 606px; height: 419px;">
 <p><b>Figure 11:</b> "Installation progress" page:
 installation in
 progress
 <p><b>Figure 11:</b> "Installation progress" page:
 installation in
 progress
@@ -483,7 +483,7 @@ message will appear in the status bar. You can return to the previous
 pages to start a new installation or click <i>"Next"</i>
 button to go to the readme page: </p>
 <center><a name="readmepage"></a><br>
 pages to start a new installation or click <i>"Next"</i>
 button to go to the readme page: </p>
 <center><a name="readmepage"></a><br>
-<img alt="Readme page" src="readmepage.png" style="width: 593px; height: 495px;">
+<img alt="Readme page" src="readmepage.png" style="width: 606px; height: 419px;">
 <p><b>Figure 12:</b> "Finish installation" page
 </p>
 </center>
 <p><b>Figure 12:</b> "Finish installation" page
 </p>
 </center>
@@ -520,7 +520,7 @@ that all SALOME modules have to be installed into the one directory
 <center><a name="BatchMode"></a><br>
 <br>
 <img alt="Batch mode" src="batchmode.png"
 <center><a name="BatchMode"></a><br>
 <br>
 <img alt="Batch mode" src="batchmode.png"
-style="width: 624px; height: 475px;">
+style="width: 638px; height: 425px;">
 <p><b>Figure 9:</b> Batch mode</p>
 </center>
 <h3 style="margin-left: 40px;"><a name="env_files"></a>Environment
 <p><b>Figure 9:</b> Batch mode</p>
 </center>
 <h3 style="margin-left: 40px;"><a name="env_files"></a>Environment
@@ -1235,4 +1235,4 @@ configuration file is set to the "true" value.
 </p>
 <hr><br>
 </font></body>
 </p>
 <hr><br>
 </font></body>
-</html>
\ No newline at end of file
+</html>
index 0ddd39affde0b73ab0f853c2c6ed8196b9753d90..464e9f38669f7a96d9677e6697bf8b7a9d4431e2 100644 (file)
Binary files a/doc/readmepage.png and b/doc/readmepage.png differ