From: vsr <vsr@opencascade.com>
Date: Wed, 27 Dec 2006 09:43:53 +0000 (+0000)
Subject: Implement features:
X-Git-Tag: V_3_2_4~12
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7fbf7df3f0689a2f80b32edd63f8f079dea4a1e6;p=tools%2Finstall.git

Implement features:
- install and build SALOME module sources
- install all products from sources
---

diff --git a/doc/batchmode.png b/doc/batchmode.png
index 348bf26..c439d7e 100644
Binary files a/doc/batchmode.png and b/doc/batchmode.png differ
diff --git a/doc/choicepage.png b/doc/choicepage.png
index fefd66e..e3afcc5 100755
Binary files a/doc/choicepage.png and b/doc/choicepage.png differ
diff --git a/doc/intropage.png b/doc/intropage.png
index 143d8d0..226793c 100755
Binary files a/doc/intropage.png and b/doc/intropage.png differ
diff --git a/doc/productpage.png b/doc/productpage.png
index 71fe213..6034df1 100755
Binary files a/doc/productpage.png and b/doc/productpage.png differ
diff --git a/doc/productpage1.png b/doc/productpage1.png
index 025a391..b666166 100644
Binary files a/doc/productpage1.png and b/doc/productpage1.png differ
diff --git a/doc/productpage2.png b/doc/productpage2.png
new file mode 100644
index 0000000..998d286
Binary files /dev/null and b/doc/productpage2.png differ
diff --git a/doc/progresspage.png b/doc/progresspage.png
index 88fc080..0779fcc 100755
Binary files a/doc/progresspage.png and b/doc/progresspage.png differ
diff --git a/doc/progresspage1.png b/doc/progresspage1.png
index c62b071..efaa4d1 100644
Binary files a/doc/progresspage1.png and b/doc/progresspage1.png differ
diff --git a/doc/readme.html b/doc/readme.html
index fc00ccd..acff30c 100755
--- a/doc/readme.html
+++ b/doc/readme.html
@@ -36,7 +36,7 @@ Wizard Help</font></font></h3>
 </table>
 </center>
 <div align="right"><b><font color="#000099">updated for the version </font><font
- color="#ff0000">3.2.0</font></b></div>
+ color="#ff0000">3.2.4</font></b></div>
 <hr>
 <ul>
   <li> <a href="#install_from_wizard">Installing products with the
@@ -73,7 +73,8 @@ window:<span style="font-weight: bold;"></span><span
 </b></p>
 <p>Without options this script will launch the SALOME Installation
 Wizard in the default mode (GUI).<br>
-The default mode can be overriden by using command line options. Each
+The default installation settings can be overriden by using of command
+line options. Each
 option has short and long notations:<br>
 </p>
 <p><b>-g / --gui</b><br>
@@ -85,7 +86,7 @@ mode (this is default mode).<br>
 <p><b>-b / --batch</b><br>
 </p>
 <div style="margin-left: 40px;">Runs the Installation Wizard in
-command-line mode. <br>
+the terminal mode. <br>
 </div>
 <p><b>-f FILE / --file=</b><span style="font-weight: bold;">FILE<br>
 </span></p>
@@ -121,21 +122,36 @@ the
 configuration XML file (usually<span style="font-weight: bold;">
 ${HOME}/salome_&lt;version&gt;</span>,
 see
-<a href="#xml_files">here</a> for more detail). <br>
+<a href="#xml_files">here</a> for more details). <br>
 </div>
 <p><b>-t DIR / --tmp=DIR </b></p>
-<div style="margin-left: 40px;">The directory, which is used for
-temporary files. If used, this option overrides the default temporary
+<div style="margin-left: 40px;">The directory, which should be used for
+temporary files. If given, this option overrides the default temporary
 directory,
 given in the
 configuration xml file (usually <span style="font-weight: bold;">/tmp</span><span
- style="font-weight: bold;"></span>, see <a
- href="readme.html#xml_files">here</a> for more detail).<br>
+ style="font-weight: bold;"></span>, see <a href="#xml_files">here</a>
+for more information).<br>
+</div>
+<p><b>-a / --all-from-sources</b></p>
+<span style="font-weight: bold;"></span><b> </b>
+<div style="margin-left: 40px;">
+Force all the products to be installed from sources (including all
+SALOME modules). If this option is used, all the default installation
+modes for all the products are ignored.<br>
+This option is helpful when the user wants to install SALOME on the
+platform whihc is not officially supported. In this case, the user can
+try to run the SALOME Installation Wizard with the <span
+ style="font-weight: bold;">-a</span> option in order to build all the
+products from sources.<br>
+<span style="font-weight: bold; color: rgb(255, 0, 0);">Note, that this
+is long-time operation which can take more than 24 hours depending on
+the computer.</span><br>
 </div>
 <p><b>-h / --help</b><br>
 </p>
-<div style="margin-left: 40px;">Prints help information about available
-options. <br>
+<div style="margin-left: 40px;">Prints help information on the
+Installation Wizard's usage. <br>
 </div>
 <p></p>
 <p>
@@ -167,8 +183,8 @@ and <a href="#new_products">Implementing installation scripts for the
 new products</a> sections for more information. </p>
 <h3 style="margin-left: 40px;"> <a name="gui_mode"></a>GUI mode<br>
 </h3>
-<p>The <font color="#ff0000">Installation Wizard</font>'s GUI wizard
-was developed
+<p>The <font color="#ff0000">Installation Wizard</font>'s GUI has been
+developed
 with
 using of the <span style="color: rgb(0, 0, 153);">Trolltech's </span><span
  style="font-weight: bold;"><span style="color: rgb(0, 0, 153);">Qt
@@ -181,7 +197,7 @@ lower part of the wizard window. <i>"Cancel"</i> button closes the
 wizard
 window&nbsp;and quits the installation procedure after user's
 confirmation. <i>"Help"</i> button opens an additional window to show
-the help information . </p>
+the help information. </p>
 <p>The first "<span style="font-style: italic;">Introduction"</span>
 page is shown at the <a href="#IntroPage">Figure 1</a>. Skip this page
 by pressing <i>"Next"</i>
@@ -189,32 +205,52 @@ button:
 </p>
 <center><a name="IntroPage"></a><br>
 <img alt="Intro page" src="intropage.png"
- style="width: 586px; height: 347px;">
+ style="width: 586px; height: 364px;">
 <p><b>Figure 1:</b> "Introduction" page</p>
 </center>
 <p>In the second page you are proposed to enter the target directory
 where the SALOME platform should be installed to. You can also press <i>"Browse..."</i>
 button and choose the destination folder using standard browse
 directory dialog box. <br>
-If the directory you want to install products does not exist you will
-be prompted to confirm directory creation. If you type wrong directory
-path, or if you have no permission for the directory you use, the
-corresponding message box will be shown.<br>
+If the directory you want to install products does not exist you are
+prompted to confirm directory creation. If you type wrong directory
+path, or if you do not have write permissions for the directory you
+use, the
+corresponding message box is shown.<br>
+</p>
+<p>You can also change the temporary directory (which is used to store
+temporary files required for the installation).<br>
+In the bottom part of the window the total disk space required for the
+installation and for the temporary files is displayed (see below for
+more details).<br>
 </p>
-<p>In GUI mode the Installation Wizard provides two different options
+<p>In the GUI mode the Installation Wizard provides two different
+options
 to install the SALOME platform: <span style="font-weight: bold;">basic</span>
 (which is default) and
 <span style="font-weight: bold;">advanced.</span> In the <span
  style="font-weight: bold;">basic</span> mode the
-user should enter only the target installation
-directory. All other installation options are taken from the XML
+user should enter the target installation
+directory and temporary folder. All other installation options are
+taken from the XML
 configuration file (see <a href="#Product_page1">Fig.2</a>):<br>
 </p>
 <center><a name="Product_page1"></a><br>
 <img alt="Intro page" src="productpage1.png"
- style="width: 586px; height: 347px;">
+ style="width: 586px; height: 364px;">
 <p><b>Figure 2:</b> "Installation settings"
-</p></center>
+</p>
+</center>
+<p>In addition, you have choice to use "Install all products from
+sources" check box. If this option is turned on, all the products will
+be installed from the sources (using their own build procedures). This
+check box correspondd to the <span style="font-weight: bold;">--all-from-sources</span>
+(<span style="font-weight: bold;">-a</span>) option of the <span
+ style="font-weight: bold;">runInstall</span> script (see <a
+ href="#install_from_wizard">here</a>). <span
+ style="font-weight: bold;">Note:</span> the installation of all
+products from sources is a long-time operation.<br>
+</p>
 <p>To switch to the <span style="font-weight: bold;">advanced</span>
 option, click <i>"More..."</i> button (see <a href="#ProductPage2">Fig.3</a>
 ).</p>
@@ -223,13 +259,14 @@ be installed. Each product can
 have several options of installation: you have a possibility to use
 native product (provided with Linux distribution and installed in the
 system folders), install already precompiled binaries, build product
-from the sources or not install it at all. Possible options and default
+from the sources or not install it at all. Avaiable options and default
 option are taken from the XML configuration file. You can mark the
 products you want to install by clicking the corresponding
 radiobuttons in the list view in the left part of the page. <br>
 Note, that
-some products can be installed only together with other products (or
-these prerequisite products should be already installed on your
+some products may require some other pre-requisite products to be
+installed (or
+these prerequisite products should be already available on your
 computer). The installation procedure
 has a special feature to automatically mark these products in the list
 view.
@@ -238,15 +275,15 @@ have
 <b><i>gcc, Python</i></b>,<b><i> Qt</i></b> and <b><i>Sip</i></b>
 installed.
 Therefore all these products will be also turned on when you check on <b><i>PyQt</i></b>.
-This feature can be switched off by clicking <i>"Auto set
-prerequisites products"</i> checkbox. Turn on this checkbox if you
+This feature can be switched off by clicking <i>"Automatic
+dependencies"</i> checkbox. Turn on this checkbox if you
 want all prerequisite products to be automatically checked when you
 select some product to be installed. Turn off this checkbox if you
 want to disable this feature.<br>
 </p>
 <center><a name="ProductPage2"></a><br>
 <img src="productpage.png" alt="Products page"
- style="width: 586px; height: 544px;">
+ style="width: 586px; height: 525px;">
 <p><b>Figure 3:</b> "Installation settings" page in the 'advanced' mode</p>
 </center>
 <p>If you want to use native products (like <span
@@ -261,7 +298,22 @@ state. <br>
 and <i>"SALOME binaries"</i>.
 These three-state checkboxes allow quick selecting/unselecting SALOME
 modules sources/binaries packages
-for the installation.</p>
+for the installation.<br>
+</p>
+<p>In addition, when some SALOME sources are selected, one more check
+box becomes available: <span style="font-style: italic;">"Build SALOME
+sources"</span>. If this option is turned on, the selected SALOME
+modules will be built and installed from sources.<br>
+<span style="font-weight: bold;">Note: if this check box is turned on,
+the corresponding SALOME module binaries package installation is
+disabled, because of conflicting of SALOME module sources an binaries
+packages </span>(see <a href="#ProductPage3">Fig. 4</a> below).
+</p>
+<center><a name="ProductPage3"></a><br>
+<img src="productpage2.png"
+ alt="Products page" style="width: 586px; height: 525px;">
+<p><b>Figure 4:</b> "Build SALOME sources" check box usage</p><br>
+</center>
 <p>The box at the right side of the page displays the information about
 currently highlighted product: name, version and short description,
 required
@@ -270,7 +322,7 @@ prerequisites (this information is
 provided in the XML file) and current user
 choice.
 </p>
-The <i>"Total disk space required:"</i> field displays how much
+The <i>"Disk space required:"</i> field displays how much
 disk space on the hard drive is required for installation of selected
 products. <br>
 <p><b>Note: </b>Please, take into account that displayed amount of
@@ -296,14 +348,11 @@ removed automaticaly when the installation finishes.<br>
 there is no
 enough disk space on your hard drive you will see the corresponding
 error message box. </p>
-<p><b>Note: </b>Unfortunately, the configure procedure has a very
-annoying bug under Linux platform. The directory should be obligatory
-entered without spaces. For example, the configure procedure for <b><i>gcc</i></b>
-won't
-work if you pass the following parameter: <i>--prefix="/New Folder 1"</i>.
-<b>Therefore you are strongly recommended not to use directory names
+<p><b>Note: </b><b>you are strongly recommended not to use directory
+names
 containing
-spaces.</b> </p>
+spaces. </b>Otherwise you can experience some troubles with the
+installation.<b> </b> </p>
 <p>To proceed further click <i>"Next"</i> button. At this moment
 program
 will make some tests to check installation settings: if there is enough
@@ -318,8 +367,8 @@ the wizard will proceed to the next page: </p>
 <center>
 <a name="ChoicePage"></a><br>
 <img src="choicepage.png" alt="Choice page"
- style="width: 586px; height: 544px;">
-<p><b>Figure 4:</b> "Check your choice" page</p>
+ style="width: 586px; height: 485px;">
+<p><b>Figure 5:</b> "Check your choice" page</p>
 </center>
 <p>This page summarizes the installation options you've made on the
 previous pages. You can check again your choice and change it if
@@ -328,8 +377,9 @@ When you are sure that everything is OK, press <i>"Next"</i> button to
 follow to the <a href="#ProgressPage">next page</a>. </p>
 <center><a name="ProgressPage"></a><br>
 <img alt="Progress page" src="progresspage1.png"
- style="width: 586px; height: 366px;"><br>
-<p><b>Figure 5:</b> "Installation progress" page</p></center>
+ style="width: 586px; height: 364px;"><br>
+<p><b>Figure 6:</b> "Installation progress" page</p>
+</center>
 <div style="text-align: left;">To start installation of the selected
 products click <i>"Start"</i>
 button. It launches the shell installation script and you will be able
@@ -351,9 +401,10 @@ process; it will be re-started from the very beginning. <br>
 </p>
 <center><a name="ProgressPage1"></a><br>
 <img alt="Progress page" src="progresspage.png"
- style="width: 586px; height: 366px;">
-<p><b>Figure 6:</b> "Installation progress" page: installation in
-progress</p></center>
+ style="width: 586px; height: 364px;">
+<p><b>Figure 7:</b> "Installation progress" page: installation in
+progress</p>
+</center>
 <p>The <i>"Installation Status"</i> frame window shows you the
 progress of installation. "<font color="#ff0000">Waiting</font>" status
 means that installation of this product has not been started
@@ -380,18 +431,20 @@ or click <i>"Next"</i> button to go the Readme page: </p>
 <center>
 <a name="readmepage"></a><br>
 <img alt="Read page" src="readmepage.png"
- style="width: 586px; height: 486px;">
-<p><b>Figure 7:</b> "Finish installation" page</p>
+ style="width: 586px; height: 484px;">
+<p><b>Figure 8:</b> "Finish installation" page</p>
 </center>
 <p>In this page you can read important information about the
 Instalation Wizard itself and some tips: how to run and test SALOME or
 how to build SALOME from the sources. This is the contents of the
 README file which you can find in the root directory of the
-Installation Wizard. <br> You can also launch SALOME Desktop from this
+Installation Wizard. <br>
+You can also launch SALOME Desktop from this
 page or read Release Notes file by clicking on the corresponding
 buttons in the lower part of the page (see <a href="#xml_files">here</a>
 and <a href="#finish_buttons">here</a> for more information about
-customizing these buttons).<br></p>
+customizing these buttons).<br>
+</p>
 <h3 style="margin-left: 40px;"> <a name="batch_mode"></a>Batch mode<br>
 </h3>
 To launch the Installation Wizard in the batch mode use <span
@@ -401,12 +454,19 @@ In this mode the GUI wizard is not shown but all the installation
 status is displayed directly in the console. In the batch mode user do
 not have a possibility to change installation settings which are given
 in the configuration file, except target and temporary directories
-which can be overridden by the corresponding command line options (see <a
- href="#install_from_wizard">here</a>).<br>
+which can be overridden by the corresponding command line options.<br>
+The only exception is <span style="font-weight: bold;">--all-from-sources</span>
+(<span style="font-weight: bold;">-a</span>) option which enables
+special installation mode in which all the products (including SALOME
+modules) are installed from sources, ignoring default mode defined in
+the XML configuration file (see <a href="#install_from_wizard">here</a>
+for details).
 <center><a name="BatchMode"></a><br>
+<br>
 <img alt="Batch mode" src="batchmode.png"
- style="width: 687px; height: 453px;">
-<p><b>Figure 8:</b> Batch mode</p></center>
+ style="width: 660px; height: 410px;">
+<p><b>Figure 9:</b> Batch mode</p>
+</center>
 <h3 style="margin-left: 40px;"><a name="env_files"></a>Environment files</h3>
 <p>During the process of installation the
 script creates some
@@ -414,27 +474,29 @@ environment files to simplify procedure of launching SALOME. These
 shell scripts set
 all necessary environment variables for all products you have
 installed.
-To learn how installation scripts collects the environment, see&nbsp;<a
- href="#pick_up_env"> here</a>. These files are: <b>salome.csh</b> + <b>salome.sh</b>
+To learn how installation scripts collects the environment, see <a
+ href="#pick_up_env">here</a>. These files are: <b>salome.csh</b> + <b>salome.sh</b>
 in the <span style="font-style: italic;"><span
  style="font-weight: bold;">KERNEL module</span></span><b><i> sources</i></b>
 and <span style="font-style: italic;"><span style="font-weight: bold;">KERNEL
 module</span></span><b><i> binaries</i></b> root directories and <b>env_products.csh</b>
 + <b>env_products.sh </b>and <span style="font-weight: bold;">env_build.csh
 </span>+ <span style="font-weight: bold;">env_build.sh</span> in the
-target directory.<br>
+target installation directory.<br>
 </p>
 <span style="font-weight: bold;">Note:</span> there is some difference
 betwen these files: <span style="font-weight: bold;">env_build.*</span>
 files are optimized to
 be used for the building of SALOME modules from sources (see <span
  style="font-weight: bold;">README </span>file provided with the
-installation procedure on th CD). The <span style="font-weight: bold;">env_products.*</span>
+installation procedure on the CD). The <span style="font-weight: bold;">env_products.*</span>
 (and<span style="font-weight: bold;"> salome.*</span>) files are
 optimized for
 the SALOME launching. The behavior is defined by the environment
 variable<span style="font-weight: bold;"> </span><b>ENV_FOR_LAUNCH</b>
-which is set to 0 in env_build.* files and to 1 in env_products.*
+which is set to <span style="font-weight: bold;">0</span> in
+env_build.* files and to <span style="font-weight: bold;">1</span> in
+env_products.*
 (salome.*) files.<br>
 <br>
 <hr>
@@ -455,7 +517,7 @@ python modules should be available via <span style="font-weight: bold;">PYTHONPA
 variable.<br>
 <span style="font-weight: bold;">Note:</span> the information given in
 this section refers to the prerequisite products for SALOME version
-3.2.0.<br>
+3.2.4.<br>
 <ul>
   <li>gcc 3.4.1<br>
   </li>
@@ -533,14 +595,14 @@ There is no way to check the version number of msg2qm tool. Just set <span
 variable if you have preinstalled
 version of msg2qm tool
 <ul>
-  <li>Open CASCADE 6.1.0</li>
+  <li>Open CASCADE 6.1.2a2</li>
 </ul>
 Version number is defined by <span style="font-weight: bold;">Standard_Version.hxx</span>
 file which is part of the Open CASCADE distribution. This file defines <span
  style="font-weight: bold;">OCC_VERSION_MAJOR,</span> <span
  style="font-weight: bold;">OCC_VERSION_MINOR</span> and <span
  style="font-weight: bold;">OCC_VERSION_MAINTENANCE</span> macros which
-should refer to version 6.1.0.<br>
+should refer to version 6.1.2.<br>
 Set <span style="font-weight: bold;">CASROOT</span> environment
 variable if you have preinstalled version of Open CASCADE.<br>
 <ul>
@@ -555,11 +617,11 @@ Set <span style="font-weight: bold;">QWTHOME</span> environment
 variable if you
 have preinstalled version of qwt.<br>
 <ul>
-  <li>hdf 5-1.6.3</li>
+  <li>hdf 5-1.6.4</li>
 </ul>
 Version number is defined by <span style="font-weight: bold;">libhdf5.settings</span>
 file which is part of the <span style="font-weight: bold;">hdf5</span>
-distribution. Version should be equal to 1.6.3.<br>
+distribution. Version should be equal to 1.6.4.<br>
 Set <span style="font-weight: bold;">HDF5HOME</span> environment
 variable if you
 have preinstalled version of hdf5.<br>
@@ -624,6 +686,9 @@ Set <span style="font-weight: bold;">NETGENROOT</span>
 environment
 variable if you have preinstalled version
 of netgen mesher.<br>
+<span style="font-weight: bold;">Note: </span>netgen 4.5 provided with
+the SALOME installation Wizard has been patched to improve its
+performance.<br>
 <ul>
   <li>Numeric 23.7</li>
 </ul>
@@ -655,18 +720,19 @@ the <span style="font-weight: bold;">PATH</span> environment variable.<br>
   <li>doxygen 1.4.6</li>
 </ul>
 Version number is checked by <span style="font-weight: bold;">doxygen
---version</span> command. <span style="font-weight: bold;">doxygen</span>executable
+--version</span> command. <span style="font-weight: bold;">doxygen</span>
+executable
 should be in the <span style="font-weight: bold;">PATH</span>
 environment variable. Version number should be equal to "1.4.6".<br>
 <ul>
   <li><span style="font-weight: bold; color: rgb(0, 0, 153);">SALOME </span>module
     <span style="font-weight: bold;"></span><span
  style="font-weight: bold; color: rgb(0, 0, 153);">sources</span>
-(3.2.0).</li>
+(3.2.4).</li>
 </ul>
-For each SALOME module sources package (KERNEL, GUI, GEOM, etc...) <span
- style="font-weight: bold;">bin</span> directory contains file <span
- style="font-weight: bold;">VERSION</span> which defines version
+For each SALOME module sources package (KERNEL, GUI, GEOM, etc...) root
+directory contains file configure.in (configure.ac) which defines
+version
 information.<br>
 Set <span style="font-weight: bold;">&lt;MODULE&gt;_SRC_DIR</span>
 environment variable for each SALOME <span style="font-weight: bold;">MODULE</span>
@@ -675,7 +741,7 @@ is KERNEL, GUI, GEOM, ...).<br>
 <ul>
   <li><span style="font-weight: bold; color: rgb(0, 0, 153);">SALOME </span>module
     <span style="font-weight: bold;"></span><span
- style="font-weight: bold; color: rgb(0, 0, 153);">binaries </span>(3.2.0)</li>
+ style="font-weight: bold; color: rgb(0, 0, 153);">binaries </span>(3.2.4)</li>
 </ul>
 For each SALOME module binaries package (KERNEL, GUI, GEOM, etc...) <span
  style="font-weight: bold;">bin/salome</span> directory contains file <span
@@ -695,7 +761,7 @@ properly set <span style="font-weight: bold;">PATH</span> and <span
 starting the Installation Wizard. Otherwise
 the installation script will fail to find preinstalled/native products.
 </p>
-<p><b>Note:</b> For some native products (e.g. gcc, Python) the rules
+<p><b>Note:</b> for some native products (e.g. gcc, Python) the rules
 of version
 checking are not so strict as described in the table. Only major and
 minor numbers of version
@@ -812,24 +878,24 @@ license=&lt;install_wizard_license_info&gt; ]</font> <br>
 &nbsp;&nbsp;&nbsp; ]</font> <br>
 <font color="#000000"><b>&nbsp;&nbsp;&nbsp; </b>[ </font><b><font
  color="#000099">&lt;button</font></b><font color="#000000">
-&nbsp;  label=&lt;button_label&gt;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</font> <br>
+&nbsp; label=&lt;button_label&gt;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</font> <br>
 <font color="#000000">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 &nbsp;&nbsp;&nbsp;&nbsp;
 [ tooltip=&lt;button_tooltip&gt; ]</font> <br>
 <font color="#000000">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 &nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;  script=&lt;button_script&gt;&nbsp;&nbsp;&nbsp;</font> <br>
+&nbsp; script=&lt;button_script&gt;&nbsp;&nbsp;&nbsp;</font> <br>
 <font color="#000000">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 [ disable=&lt;disable_flag&gt;&nbsp;&nbsp;&nbsp;]</font><b><font
  color="#000099"><br>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; /&gt; </font></b><font color="#000000"><br>
-&nbsp;&nbsp;&nbsp; ]</font> <br>
- <font color="#000000">
-&nbsp;&nbsp;&nbsp; [</font><b><font color="#000099"> &lt;button</font></b><font
- color="#000000"> ... </font><font color="#000099"><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; /<b>&gt;</b></font><br><font color="#000000">
 &nbsp;&nbsp;&nbsp; ]</font> <br>
+<font color="#000000">&nbsp;&nbsp;&nbsp; [</font><b><font
+ color="#000099"> &lt;button</font></b><font color="#000000"> ... </font><font
+ color="#000099"><br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; /<b>&gt;</b></font><br>
+<font color="#000000">&nbsp;&nbsp;&nbsp; ]</font> <br>
 <font color="#000000">&nbsp;&nbsp;&nbsp; [</font><b><font
  color="#000099"> &lt;product</font></b><font color="#000000">&nbsp;
 name=&lt;product_name&gt;</font> <br>
@@ -848,7 +914,7 @@ install=&lt;installation_mode&gt;</font> <br>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 supported=&lt;supported_installation_modes&gt;</font> <br>
 <font color="#000000">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;  [ disable=&lt;disable_flag&gt;
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [ disable=&lt;disable_flag&gt;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;]<br>
 &nbsp; &nbsp; &nbsp; &nbsp;&nbsp; &nbsp; &nbsp;&nbsp; [
 pickupenv=&lt;pickup_env_flag&gt;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ]</font><font
@@ -873,8 +939,8 @@ dependancies=&lt;list_of_prerequisites&gt;</font>&nbsp;<font
  color="#000000"> ... </font><font color="#000099"><br>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; /<b>&gt;</b></font><font color="#000000">
 <br>
-&nbsp;&nbsp;&nbsp; ]</font><br><font color="#000000">
-&nbsp;&nbsp;&nbsp; ...</font><br>
+&nbsp;&nbsp;&nbsp; ]</font><br>
+<font color="#000000">&nbsp;&nbsp;&nbsp; ...</font><br>
 <b><font color="#000099">
 &lt;/document&gt;</font></b> </p>
 </font>
@@ -1049,10 +1115,14 @@ Attributes:</font><br>
 <font color="#000000">If this optional flag has 'true'
 value, the corresponding button will not appear in the <i>"Finish
 installation"</i> page - the section of XML file is silently
-ignored.</font><br><br><b>Note:</b> If you add new products to be
+ignored.</font><br>
+<br>
+<b>Note:</b> If you add new products to be
 installed with Installation Wizard, you should also provide
 installation script for this product. See the next section for more
-details.<p><br></p>
+details.
+<p><br>
+</p>
 <hr>
 <h3><a name="new_products"></a>Implementing <font color="#ff0000">installation
 scripts</font> for the new products</h3>
@@ -1112,8 +1182,22 @@ directory (see also description of <b>print_env(</b>) function). </font><font
 implement
 this function i</font><font color="#000000">f you do not provide </font><font
  color="#000000">sources mode installation.</font>
+<br>
+<ul>
+  <li> <font color="#000000"><b>install_source_and_build()</b></font></li>
+</ul>
+<font color="#000000">This function is
+called when SALOME module is installed and the <span
+ style="font-weight: bold;">--all-from-sources</span> (<span
+ style="font-weight: bold;">-a</span>) option is used (<span
+ style="font-style: italic;">"Build SALOME sources"</span> check box in
+GUI mode). This function should be used to unpack SALOME sources
+package and then call build/install procedure for it.<br>
+For more details please refer to the <a href="#install_from_wizard">this</a>
+and <a href="#gui_mode">this</a> sections for more details.<br>
+</font>
 <ul>
-  <li> <font color="#000000"><b>install_binary()</b></font></li>
+  <li><font color="#000000"><b>install_binary()</b></font></li>
 </ul>
 <font color="#000000">This function is
 called when <i>'install binaries'</i> installation mode is selected by
@@ -1186,7 +1270,7 @@ of prerequisite products, separated by space;</font> <br>
 <font color="#000000"><b>&lt;product_name&gt; </b>- product name
 itself.</font> </p>
 <p><font color="#000000">Example:</font> <br>
-<i><font color="#000000">med-2.2.2.sh install_binary /tmp/work
+<i><font color="#000000">med-2.2.3.sh install_binary /tmp/work
 ./Products/BINARIES/Mandrake10.1 /usr/salome 'gcc Hdf' med</font></i> </p>
 <p><font color="#000000">Copy created script into the <i>&lt;Install_Wizard_root_directory&gt;/config_files</i>
 sub-directory where all installation scripts are stored. Installation
@@ -1203,7 +1287,9 @@ buttons to this page in order to perform some specific actions at the
 end of the installation (for example, show Release Notes file by using
 Open Office) you can put an additional section to the XML
 configuration file. This is the <b>&lt;button&gt;</b> section (see <a
-href="#xml_files">here</a> for more details).<p><br></p>
+ href="#xml_files">here</a> for more details).
+<p><br>
+</p>
 To implement the action which will be performed when the user click on
 the button, you need to create a script and put it to the
 <i>&lt;Install_Wizard_root_directory&gt;/config_files</i> directory.<br>
@@ -1225,7 +1311,8 @@ disabled.
 </ul>
 This procedure is invoked when the user clicks the button. This
 procedure should return <b>0</b> if the corresponding action is done
-successfully and <b>1</b> if any error occurs.<br><br>
+successfully and <b>1</b> if any error occurs.<br>
+<br>
 The calling signature of the script is the following:<br>
 <b><font color="#000000">&lt;product_script_name&gt;
 &lt;function_name&gt; &lt;target_directory&gt; &lt;temp_folder&gt;</font></b>
@@ -1233,19 +1320,24 @@ The calling signature of the script is the following:<br>
 </p>
 <p><font color="#000000"><b>&lt;product_script_name&gt;</b> -
 the script name itself (retrieved from the XML configuration xml
-file);</font> <br> <font color="#000000"><b>&lt;function_name&gt;</b>
-- the name of function;</font> <br><font color="#000000"><b>
-&lt;target_directory&gt;</b> - root target directory where product are
-installed to;</font> <br> <font color="#000000"><b>&lt;temp_folder&gt;
+file);</font> <br>
+<font color="#000000"><b>&lt;function_name&gt;</b>
+- the name of function;</font> <br>
+<font color="#000000"><b>&lt;target_directory&gt;</b> - root target
+directory where product are
+installed to;</font> <br>
+<font color="#000000"><b>&lt;temp_folder&gt;
 </b> - temporary files directory;</font> <br>
-<br><b>Note:</b> The standard Installation Wizard buttons "Launch
+<br>
+<b>Note:</b> The standard Installation Wizard buttons "Launch
 SALOME" and "Release Notes" are implemented with this
 feature. Refer to the scripts <b>start_salome.sh</b> and
 <b>release_notes.sh</b> for sample implementation.<br>
-<br><b>Note:</b> Any button (even standard) can be ignored by the
+<br>
+<b>Note:</b> Any button (even standard) can be ignored by the
 Installation Wizard if the attribute <b>&lt;disable&gt;</b> in the XML
 configuration file is set to the "true" value.
-<hr>
-<br>
+</p>
+<hr><br>
 </body>
 </html>
diff --git a/doc/readmepage.png b/doc/readmepage.png
index 6777963..b6aee29 100644
Binary files a/doc/readmepage.png and b/doc/readmepage.png differ