]> SALOME platform Git repositories - tools/install.git/commitdiff
Salome HOME
Merge from Mandrake_10_1 branch (version 2.2.4) after_merge_from_Mandrake_10_1
authorvsr <vsr@opencascade.com>
Thu, 30 Jun 2005 06:55:16 +0000 (06:55 +0000)
committervsr <vsr@opencascade.com>
Thu, 30 Jun 2005 06:55:16 +0000 (06:55 +0000)
77 files changed:
SALOME2_2_3_Change_Log.htm [deleted file]
SALOME2_2_3_Release_Notes.htm [deleted file]
SALOME2_2_4_Change_Log.htm [new file with mode: 0755]
SALOME2_2_4_Release_Notes.htm [new file with mode: 0755]
bin/SALOME_InstallWizard
config.xml
config_Mandrake10_1.xml [new file with mode: 0755]
config_RedHat8_0.xml
config_RedHat8_0_with_Mesa.xml
config_RedHat9.xml
config_files/BOOST-1.30.2.sh
config_files/BOOST-1.31.0.sh [new file with mode: 0755]
config_files/CAS-5.2.3.sh [new file with mode: 0755]
config_files/CAS-5.2.sh
config_files/COMPONENT_BIN.sh
config_files/COMPONENT_SRC.sh
config_files/GEOM_BIN.sh
config_files/GEOM_SRC.sh
config_files/GHS3DPLUGIN_BIN.sh
config_files/GHS3DPLUGIN_SRC.sh
config_files/HELLO_BIN.sh
config_files/HELLO_SRC.sh
config_files/HappyDoc-r2_1.sh
config_files/KERNEL_BIN.sh
config_files/KERNEL_SRC.sh
config_files/MED_BIN.sh
config_files/MED_SRC.sh
config_files/NETGENPLUGIN_BIN.sh
config_files/NETGENPLUGIN_SRC.sh
config_files/Numeric-22.0.sh
config_files/Numeric-23.7.sh [new file with mode: 0755]
config_files/PYCALCULATOR_BIN.sh
config_files/PYCALCULATOR_SRC.sh
config_files/PYHELLO_BIN.sh
config_files/PYHELLO_SRC.sh
config_files/PyQt-3.13.sh [new file with mode: 0755]
config_files/PyQt-3.3.2.sh
config_files/Python-2.2.1.sh
config_files/Python-2.3.4.sh [new file with mode: 0755]
config_files/SMESH_BIN.sh
config_files/SMESH_SRC.sh
config_files/SUPERV_BIN.sh
config_files/SUPERV_SRC.sh
config_files/SWIG-1.3.24.sh [new file with mode: 0755]
config_files/VISU_BIN.sh
config_files/VISU_SRC.sh
config_files/VTK-4.2.2.sh
config_files/VTK-4.2.6.sh [new file with mode: 0755]
config_files/common.sh
config_files/doxygen-1.3-rc2.sh
config_files/doxygen-1.3.7.sh [new file with mode: 0755]
config_files/gcc-3.4.sh [new file with mode: 0755]
config_files/graphviz-1.9.sh
config_files/graphviz-2.2.1.sh [new file with mode: 0755]
config_files/hdf5-1.6.3.sh [new file with mode: 0755]
config_files/med-2.2.2.sh
config_files/netgen-4.3.sh [new file with mode: 0755]
config_files/netgen-4.4.sh [new file with mode: 0755]
config_files/netgen4.3.sh [deleted file]
config_files/omniORB-4.0.5.sh [new file with mode: 0755]
config_files/qt-3.3.3.sh [new file with mode: 0755]
config_files/qt-x11-free-3.0.5.sh
config_files/qwt-4.2.0.sh [new file with mode: 0755]
config_files/sip-3.3.2.sh
config_files/sip-4.1.sh [new file with mode: 0755]
config_files/tcltk8.4.5.sh [new file with mode: 0755]
doc/choicepage.png
doc/productpage.png
doc/progresspage.png
doc/readme.html
doc/readmepage.png
runInstall
src/InstallWizard.cpp
src/InstallWizard.h
src/SALOME_HelpWindow.cxx
src/SALOME_InstallWizard.cxx
src/icons.h

diff --git a/SALOME2_2_3_Change_Log.htm b/SALOME2_2_3_Change_Log.htm
deleted file mode 100644 (file)
index dcd4aee..0000000
+++ /dev/null
@@ -1,411 +0,0 @@
-<html>
-       <head>
-               <title>SALOME 2 Change Log</title>
-               <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-               <link rel="Edit-Time-Data" href="SALOME2_ChangeLog_files/editdata.mso">
-                       <style>.Normal { FONT-SIZE: 12pt; FONT-FAMILY: "Times New Roman" }
-       </style>
-       </head>
-       <body bgcolor="#ffffff" lang="RU" link="blue" vlink="blue" onload="runOnLoad();" class="Normal">
-               <div id="headnav"></div>
-               <div id="layout_1">
-                       <ul type="square">
-                       </ul>
-                       <div id="headnav">
-                       </div>
-                       <table width="100%" border="0">
-                               <tr>
-                                       <td bgcolor="#cccccc" height="30">
-                                               <div id="headnav">
-                                               </div>
-                                               <div id="layout_1">
-                                                       <p class="MsoNormal"><b><span lang="EN" style="FONT-SIZE: 24pt; COLOR: rgb(0,0,102)">SALOME 
-            2 Change Log (</span></b><span lang="EN" style="FONT-SIZE: 24pt; COLOR: rgb(0,0,102)">29 
-            April 2005</span><b><span lang="EN" style="FONT-SIZE: 24pt; COLOR: rgb(0,0,102)">)</span></b></p>
-                                               </div>
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td bgcolor="#ffffff" height="355">
-                                               <div class="MsoNormal" align="center" style="TEXT-ALIGN: center"><span lang="EN" style="FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: Verdana">
-                                                               <hr size="1" width="100%" noshade color="black" align="center">
-                                                       </span></div>
-                                               <h3>
-                                                       <H3><SPAN lang="EN" style="FONT-SIZE: 11pt; FONT-FAMILY: Verdana">Version 
-      2.2.3 (maintenance release)</SPAN></H3>
-                                                       <H4><B><SPAN lang="EN" style="FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: Verdana">29-Apr-2005</SPAN></B><a name="2.2.2"></a></H4>
-                                               </h3>
-                                               <UL>
-                                                       <LI>
-                                                               <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame"> MED module is compilable with 
-      gcc 3.4 </SPAN></DIV>
-                                                       <LI>
-                                                               <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame">All standard modules were tested with omniOrb 4 and Python 
-        2.3</SPAN></DIV>
-                                                       <LI>
-                                                               <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame">Fixed 
-      bug <A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8264">PAL8264</A>&nbsp;(REGRESSION: Partition of a shape 
-        by a plane ) </SPAN></DIV>
-                                                       <LI>
-                                                               <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame">Fixed bug 
-        
-                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8343">PAL8343</A>&nbsp;<SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'">(Improvment 
-      for Sender and receiver mechanism) </SPAN>
-                                                                       </SPAN></DIV>
-                                                       <LI>
-                                                               <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame">Fixed bug 
-        
-                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8346">PAL8346</A>&nbsp;<SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'">(Radio button that unselect the installation of the 
-        salome modules sources)</SPAN>
-                                                                       </SPAN></DIV>
-                                                       <LI>
-                                                               <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame">Fixed bug 
-        
-                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8468">PAL8468</A>&nbsp;<SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'">(Start and End Length on two opposite edges)</SPAN>
-                                                                       </SPAN></DIV>
-                                                       <LI>
-                                                               <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame">Fixed bug 
-        
-                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8469">PAL8469</A>&nbsp;<SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'">(Updating the global mesh icon when local 
-        hypotheses are edited)</SPAN>
-                                                                       </SPAN></DIV>
-                                                       <LI>
-                                                               <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame">Fixed bug 
-        
-                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8536">PAL8536</A>&nbsp;<SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'">(Min and max value of 2D and 3D hypotheses)</SPAN>
-                                                                       </SPAN></DIV>
-                                                       <LI>
-                                                               <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame">Fixed bug 
-        
-                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8596">PAL8596</A>&nbsp;<SPAN class="grame">(Incorrect warping)
-                                                               </SPAN></DIV>
-                                                       <LI>
-                                                               <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame">Fixed bug 
-        
-                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8529">PAL8529</A>&nbsp;<SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'; mso-bidi-font-size: 10.0pt">(The 
-      creation of mesh group doesn't work correctly with GHS3D)</SPAN></DIV>
-                                                       <LI>
-                                                               <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame">Fixed bug 
-        
-                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8598">PAL8598</A><SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'"></SPAN>
-                                                                       </SPAN><SPAN class="grame">(Access to Camera Dump function through contextual 
-        menu of the view)
-                                                               </SPAN></DIV>
-                                                       <LI>
-                                                               <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame">Fixed bug 
-        
-                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8330">PAL8330</A><SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'"></SPAN>
-                                                                       </SPAN><SPAN class="grame">(Bad oriented volumes) 
-                                                               </SPAN></DIV>
-                                                       <LI>
-                                                               <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame">Fixed bug 
-        
-                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8378">PAL8378</A><SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'"></SPAN>
-                                                                       </SPAN><SPAN class="grame">(Bug in Partition Algorithm) 
-                                                               </SPAN></DIV>
-                                                       <LI>
-                                                               <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame">Fixed bug 
-        
-                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8379">PAL8379</A><SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'"></SPAN>
-                                                                       </SPAN><SPAN class="grame">(Filters for groups on geometry) 
-                                                               </SPAN></DIV>
-                                                       <LI>
-                                                               <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame">Fixed bug 
-        
-                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8539">PAL8539</A><SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'"></SPAN>
-                                                                       </SPAN><SPAN class="grame">(Bug in StdMeshers_Regular_1D.cxx for the SetScale 
-        option)
-                                                               </SPAN></DIV>
-                                                       <LI>
-                                                               <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame">Fixed bug 
-        
-                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8562">PAL8562</A><SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'"></SPAN>
-                                                                       </SPAN><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'; mso-bidi-font-size: 10.0pt">(The 
-      parameter for linker option rpath (rpath-link) is missed)</SPAN></DIV>
-                                                       <LI>
-                                                               <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame">Fixed bug 
-        
-                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8684">PAL8684</A><SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'"></SPAN>
-                                                                       </SPAN><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'; mso-bidi-font-size: 10.0pt">(A med file imported twice is not updated)</SPAN></DIV>
-                                                       <LI>
-                                                               <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame">Fixed bug 
-        
-                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8698">PAL8698</A><SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'"></SPAN>
-                                                                       </SPAN><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'; mso-bidi-font-size: 10.0pt">(Scalar Map of a field with more than 3 components)</SPAN></DIV>
-                                                       <LI>
-                                                               <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame">Fixed bug 
-        
-                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8683">PAL8683</A>&nbsp;<SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'; mso-bidi-font-size: 10.0pt">(Deformed 
-      shape of a field with more than 3 components)</SPAN></DIV>
-                                                       <LI>
-                                                               <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'">Fixed 
-      bug </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8588">ALSCDA8588</A>&nbsp;<SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'; mso-bidi-font-size: 10.0pt">(Not 
-      correct working of porflow driver after Sauv2Med improvements)</SPAN></DIV>
-                                                       <LI>
-                                                               Fixed bug<A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8699">ALSCDA8699</A>&nbsp;<SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'; mso-bidi-font-size: 10.0pt">(SAUVE 
-      file is written incorrectly) </SPAN></LI></UL>
-                                               <P>
-                                               <P><SPAN lang="EN" style="FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: Verdana"><FONT face="Arial, Helvetica, sans-serif" size="2">There 
-                                                                       is a <A href="SALOME2_2_3_Release_Notes.htm">separate announcement</A> available 
-                                                                       for this release.</FONT></SPAN>
-                                               </P>
-                                               <P>
-                                                       <HR align="center" width="100%" color="black" noShade SIZE="1">
-                                               </P>
-                                               <P></P>
-                                               <P></P>
-                                               <H3><SPAN lang="EN" style="FONT-SIZE: 11pt; FONT-FAMILY: Verdana">Version 
-      2.2.2 (maintenance release)</SPAN></H3>
-                                               <h4><b><span lang="EN" style="FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: Verdana">29-Mar-2005</span></b></h4>
-                                               <ul class="Normal">
-                                                       <li>
-                                                               <div id="content"><SPAN lang="EN-US" style="FONT-FAMILY: Verdana"><FONT face="Arial" size="2">This 
-                                                                                       version is compatible with gcc 3.3 and Python 2.3</FONT></SPAN></div>
-                                                       <LI>
-                                                               <DIV><SPAN lang="EN-US" style="FONT-FAMILY: Verdana"><FONT face="Arial" size="2">The SALOME 
-                                                                                       non-regression test base was corrected. Internal links were removed.</FONT></SPAN></DIV>
-                                                       <LI>
-                                                               <DIV><SPAN lang="EN-US" style="FONT-FAMILY: Verdana"><FONT face="Arial" size="2">Compatibility 
-                                                                                       with CCRT (OSF Alfa ) of KERNEL and MED modules</FONT></SPAN></DIV>
-                                                       <LI>
-                                                               <DIV><SPAN lang="EN-US" style="FONT-FAMILY: Verdana"><FONT face="Arial" size="2">Sauv2Med 
-                                                                                       (CASTEM - MED) converter with debugs is integrated now into the MED component</FONT></SPAN></DIV>
-                                                       <li>
-                                                               <div id="content" class="Normal">
-                                                                       <font size="2">
-                                                                               <span lang="EN-US" style='FONT-FAMILY:Verdana'>
-                                                                                       <FONT face="Arial">Fixed bug </FONT><a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8471">
-                                                                                               <FONT face="Arial">PAL8471</FONT></a><FONT face="Arial"> (New SMESH Python API)</FONT></span></font></div>
-                                                       <li>
-                                                               <div id="content" class="Normal">
-                                                                       <font size="2">
-                                                                               <span lang="EN-US" style='FONT-FAMILY:Verdana'>
-                                                                                       <FONT face="Arial">Fixed bug </FONT><a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8269">
-                                                                                               <FONT face="Arial">PAL8269</FONT></a><FONT face="Arial"> (One can't select a 
-                                                                                               pointer on geometry in mesh filters)</FONT></span></font></div>
-                                                       <li>
-                                                               <div id="content" class="Normal">
-                                                                       <font size="2">
-                                                                               <span lang="EN-US" style='FONT-FAMILY:Verdana'>
-                                                                                       <FONT face="Arial">Fixed bug </FONT><a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8232">
-                                                                                               <FONT face="Arial">PAL8232</FONT></a><FONT face="Arial"> (UseCase browser 
-                                                                                               breaks multi-selection and general Salome popup)</FONT></span></font></div>
-                                                       <li>
-                                                               <div id="content">
-                                                                       <font size="2">
-                                                                               <span lang="EN-US" style='FONT-FAMILY:Verdana'>
-                                                                                       <FONT face="Arial">Fixed bug </FONT><a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8376">
-                                                                                               <FONT face="Arial">PAL8376</FONT></a><FONT face="Arial"> (createAndDisplayGO 
-                                                                                               only works with a VTK view in Study1)</FONT></span></font></div>
-                                                       <li>
-                                                               <div id="content">
-                                                                       <font size="2">
-                                                                               <span lang="EN-US" style='FONT-FAMILY:Verdana'>
-                                                                                       <FONT face="Arial">Fixed bug </FONT><a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8395">
-                                                                                               <FONT face="Arial">PAL8395</FONT></a><FONT face="Arial"> (RemoveExtraEdges not 
-                                                                                               remove some degenerate edges)</FONT></span></font></div>
-                                                       <li>
-                                                               <div id="content">
-                                                                       <font size="2">
-                                                                               <span lang="EN-US" style='FONT-FAMILY:Verdana'>
-                                                                                       <FONT face="Arial">Fixed bug </FONT><a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8380">
-                                                                                               <FONT face="Arial">PAL8380</FONT></a><FONT face="Arial"> (Can't create a Group 
-                                                                                               of Nodes from a group on geometry)</FONT></span></font></div>
-                                                       <li>
-                                                               <div id="content">
-                                                                       <font size="2">
-                                                                               <span lang="EN-US" style='FONT-FAMILY:Verdana'>
-                                                                                       <FONT face="Arial">Fixed bug </FONT><a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8267">
-                                                                                               <FONT face="Arial">PAL8267</FONT></a><FONT face="Arial"> (Extrusion of a mesh 
-                                                                                               by the TUI)</FONT></span></font></div>
-                                                       <li>
-                                                               <div id="content">
-                                                                       <font size="2">
-                                                                               <span lang="EN-US" style='FONT-FAMILY:Verdana'>
-                                                                                       <FONT face="Arial">Fixed bug </FONT><a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8418">
-                                                                                               <FONT face="Arial">PAL8418</FONT></a><FONT face="Arial"> (Installation 
-                                                                                               procedure 2.2.1 CD - no symbolic link on CD)</FONT></span></font></div>
-                                                       <li>
-                                                               <div id="content">
-                                                                       <font size="2">
-                                                                               <span lang="EN-US" style='FONT-FAMILY:Verdana'>
-                                                                                       <FONT face="Arial">Fixed bug </FONT><a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8331">
-                                                                                               <FONT face="Arial">PAL8331</FONT></a><FONT face="Arial"> (</FONT></span><span lang="SV" style='COLOR:black'><FONT face="Arial">REGRESSION 
-                                                                                               import mesh in "MED 2.2" format)</FONT></span></font></div>
-                                                       <li>
-                                                               <div id="content">
-                                                                       <font size="2">
-                                                                               <span lang="EN-US" style='FONT-FAMILY:Verdana'>
-                                                                                       <FONT face="Arial">Fixed bug </FONT><a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8336">
-                                                                                               <FONT face="Arial">PAL8336</FONT></a><FONT face="Arial"> (Problems related to 
-                                                                                               use of MedClient)</FONT></span></font></div>
-                                                       <li>
-                                                               <div id="content">
-                                                                       <font size="2">
-                                                                               <span lang="EN-US" style='FONT-FAMILY:Verdana'>
-                                                                                       <FONT face="Arial">Fixed bug </FONT><a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8187">
-                                                                                               <FONT face="Arial">PAL8187</FONT></a><FONT face="Arial"> (Problem with 
-                                                                                               namespace MED_EN in file MEDMEM_Field.hxx)</FONT></span></font></div>
-                                                       <li>
-                                                               <div id="content">
-                                                                       <font size="2">
-                                                                               <span lang="EN-US" style='FONT-FAMILY:Verdana'>
-                                                                                       <FONT face="Arial">Fixed bug </FONT><a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8490">
-                                                                                               <FONT face="Arial">PAL8490</FONT></a><FONT face="Arial"> (Support omniORB 4.0 
-                                                                                               compilation for KERNEL)</FONT></span></font></div>
-                                                       <li>
-                                                               <div id="content">
-                                                                       <font size="2">
-                                                                               <span lang="EN-US" style='FONT-FAMILY:Verdana'>
-                                                                                       <FONT face="Arial">Fixed bug </FONT><a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8491">
-                                                                                               <FONT face="Arial">PAL8491</FONT></a><FONT face="Arial"> (Allways force an 
-                                                                                               absolute path with naming service when possible)</FONT></span></font></div>
-                                                       <li>
-                                                               <div id="content">
-                                                                       <div id="content">
-                                                                               <div id="content">
-                                                                                       <font size="2">
-                                                                                               <span lang="EN-US" style='FONT-FAMILY:Verdana'>
-                                                                                                       <FONT face="Arial">Fixed bug </FONT><a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8492">
-                                                                                                               <FONT face="Arial">PAL8492</FONT></a><FONT face="Arial"> (Suppress French 
-                                                                                                               accents in python comments : warnings)</FONT></span></font></div>
-                                                                       </div>
-                                                               </div>
-                                                       <li>
-                                                               <div id="content">
-                                                                       <font size="2">
-                                                                               <span lang="EN-US" style='FONT-FAMILY:Verdana'>
-                                                                                       <FONT face="Arial">Fixed bug </FONT><a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8493">
-                                                                                               <FONT face="Arial">PAL8493</FONT></a><FONT face="Arial"> (New versions of 
-                                                                                               PyQt,Qt,qwt,sip)</FONT></span></font></div>
-                                                       <li>
-                                                               <div id="content">
-                                                                       <font size="2">
-                                                                               <span lang="EN-US" style='FONT-FAMILY:Verdana'>
-                                                                                       <FONT face="Arial">Fixed bug </FONT><a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8194">
-                                                                                               <FONT face="Arial">PAL8494</FONT></a><FONT face="Arial"> (Include order to 
-                                                                                               avoid compilation problems with gcc3.3, Python2.3, qt...)</FONT></span></font></div>
-                                                       <li>
-                                                               <div id="content">
-                                                                       <font size="2">
-                                                                               <span lang="EN-US" style='FONT-FAMILY:Verdana'>
-                                                                                       <FONT face="Arial">Fixed bug </FONT><a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8495">
-                                                                                               <FONT face="Arial">PAL8495</FONT></a><FONT face="Arial"> (Control Python lock 
-                                                                                               on embedded interpreter initialization)</FONT></span></font></div>
-                                                       <li>
-                                                               <div id="content">
-                                                                       <div id="content">
-                                                                               <div id="content">
-                                                                                       <div id="content">
-                                                                                               <font size="2">
-                                                                                                       <span lang="EN-US" style='FONT-FAMILY:Verdana'>
-                                                                                                               <FONT face="Arial">Fixed bug </FONT><a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8496">
-                                                                                                                       <FONT face="Arial">PAL8496</FONT></a><FONT face="Arial"> (Correction of 
-                                                                                                                       incomplete module imports in Python)</FONT></span></font></div>
-                                                                               </div>
-                                                                       </div>
-                                                               </div>
-                                                       <li>
-                                                               <div id="content">
-                                                                       <font size="2">
-                                                                               <span lang="EN-US" style='FONT-FAMILY:Verdana'>
-                                                                                       <FONT face="Arial">Fixed bug </FONT><a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8497">
-                                                                                               <FONT face="Arial">PAL8497</FONT></a><FONT face="Arial"> (Activate commented 
-                                                                                               traces)</FONT></span></font><FONT face="Arial"> </FONT>
-                                                                       <div id="content">
-                                                                       </div>
-                                                               </div>
-                                                       </li>
-                                               </ul>
-                                               <P>
-                                                       <span lang="EN" style='FONT-SIZE:10pt;COLOR:black;FONT-FAMILY:Verdana'>
-                                                               <font face="Arial, Helvetica, sans-serif" size="2">There is a <a href="SALOME2_2_2_Release_Notes.htm">
-                                                                               separate announcement</a> available for this release.</font></span>
-                                               </P>
-                                               <P class="MsoNormal" style="TEXT-ALIGN: center" align="center"><span lang="EN" style="FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: Verdana">
-                                                               <hr size="1" width="100%" noshade color="black" align="center">
-                                                       </span>
-                                               <P></P>
-                                               <h3></h3>
-                                               <h3><a name="2.2.1"></a><span lang="EN" style="FONT-SIZE: 11pt; FONT-FAMILY: Verdana">Version 2.2.1 (maintenance release)</span></h3>
-                                               <p class="MsoNormal"><b><span lang="EN" style="FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: Verdana">01-Mar-2005</span></b><span lang="EN" style="FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: Verdana"></span></p>
-                                               <ul>
-                                                       <li class="MsoNormal" style="COLOR: black">
-                                                               <font face="Arial, Helvetica, sans-serif" size="2">
-                                                                       <span lang="EN">Fixed 
-            bug <a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=7158">PAL7158</a> 
-            (Multi rotation - translation was not possible with a shape obtained 
-            by explode). </span></font>
-                                                       <li>
-                                                               <font face="Arial, Helvetica, sans-serif" size="2">
-                                                                       <span lang="EN">Fixed 
-            bug <a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=7764">PAL7764</a> 
-            (Salome aborts when running 2 of the 3 graphs (same services but different 
-            links into graphs). </span></font>
-                                                       <li class="MsoNormal" style="COLOR: black">
-                                                               <font face="Arial, Helvetica, sans-serif" size="2">
-                                                                       <span lang="EN">Fixed 
-            bug <a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8065">PAL8065</a> 
-            (Abort on <span class="SpellE"><span class="spelle">Superv</span>
-                                                                               </span> 
-            with TestVisu20.xml). </span></font>
-                                                       <li class="MsoNormal" style="COLOR: black">
-                                                               <font face="Arial, Helvetica, sans-serif" size="2">
-                                                                       <span lang="EN">Fixed 
-            bug <a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8247">PAL8247</a> 
-            (Improvement of installation procedure to ensure RH9 compatibility). 
-            </span></font>
-                                                       <li class="MsoNormal" style="COLOR: black">
-                                                               <font face="Arial, Helvetica, sans-serif" size="2">
-                                                                       <span lang="EN">Fixed 
-            bug <a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8256">PAL8256</a> 
-            (Problem with installation procedure with *.la files for <span class="SpellE"><span class="spelle">hdf</span>
-                                                                               </span> and med). </span></font>
-                                                       <li class="MsoNormal" style="COLOR: black">
-                                                               <font face="Arial, Helvetica, sans-serif" size="2">
-                                                                       <span lang="EN">Fixed 
-            bug <a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8263">PAL8263</a> 
-            (Validity of the files exported by SMESH in MED2.2 format). </span></font>
-                                                       <li class="MsoNormal" style="COLOR: black">
-                                                               <font face="Arial, Helvetica, sans-serif" size="2">
-                                                                       <span lang="EN">Fixed 
-            bug <a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8297">PAL8297</a> 
-            (REGRESSION: Reading several time stamps on a field of a med2.1 file). 
-            </span></font>
-                                                       <li>
-                                                               <font face="Arial, Helvetica, sans-serif" size="2">
-                                                                       <span lang="EN">Fixed 
-            bug <a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8309">PAL8309</a> 
-            (Problem with creation point and zoom in GEOM).</span></font>
-                                                       <li>
-                                                               <font face="Arial, Helvetica, sans-serif" size="2">
-                                                                       <span lang="EN">Fixed 
-            bug <a href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8310">PAL8310</a> 
-            (Problem when delete a group on mesh and export to med)</span></font>
-                                                       <li>
-                                                               <font face="Arial, Helvetica, sans-serif" size="2">The documenation is checked and 
-                                                                       updated</font></li>
-                                               </ul>
-                                               <P>
-                                                       <span lang="EN" style="FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: Verdana">
-                                                               <font face="Arial, Helvetica, sans-serif" size="2">There is a <a href="SALOME2_2_1_Release_Notes.htm">
-                                                                               separate announcement</a> available for this release</font></span></P>
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td bgcolor="#ffffff" height="2">
-                                               <div class="MsoNormal" align="center" style="TEXT-ALIGN: center"><span lang="EN" style="FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: Verdana"></span></div>
-                                               <span lang="EN" style="FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: Verdana"></span>
-                                               <hr size="1" width="100%" noshade color="black" align="center">
-                                               <a name="2.2.0"></a>This document is maintained as a difference with SALOME 
-                                               2.2.0 (Major release of 21-Feb-2005)
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td bgcolor="#999999" height="30">Copyright &copy; 2001-2005 All rights reserved.</td>
-                               </tr>
-                       </table>
-               </div>
-               <div id="content"></div>
-       </body>
-</html>
diff --git a/SALOME2_2_3_Release_Notes.htm b/SALOME2_2_3_Release_Notes.htm
deleted file mode 100644 (file)
index 5c9460b..0000000
+++ /dev/null
@@ -1,236 +0,0 @@
-<html>
-       <head>
-               <title>SALOME 2.2.2 Release Announcement (29 March 2005)</title>
-               <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-               <style>@font-face { font-family: Verdana; }
-       @page Section1 {size: 595.3pt 841.9pt; mso-header-: 0; }
-       P.MsoNormal { FONT-SIZE: 12pt; FONT-FAMILY: "Times New Roman"; mso-style-parent: ""; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman" }
-       LI.MsoNormal { FONT-SIZE: 12pt; FONT-FAMILY: "Times New Roman"; mso-style-parent: ""; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman" }
-       DIV.MsoNormal { FONT-SIZE: 12pt; FONT-FAMILY: "Times New Roman"; mso-style-parent: ""; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman" }
-       H2 { FONT-WEIGHT: bold; FONT-SIZE: 18pt; FONT-FAMILY: "Times New Roman"; mso-: widow-orphan; mso-outline-level: 2 }
-       A:link { COLOR: blue; TEXT-DECORATION: underline; text-underline: single }
-       SPAN.MsoHyperlink { COLOR: blue; TEXT-DECORATION: underline; text-underline: single }
-       A:visited { COLOR: blue; TEXT-DECORATION: underline; text-underline: single }
-       SPAN.MsoHyperlinkFollowed { COLOR: blue; TEXT-DECORATION: underline; text-underline: single }
-       P { FONT-SIZE: 12pt; FONT-FAMILY: "Times New Roman"; mso-fareast-font-family: "Times New Roman"; mso-: widow-orphan }
-       PRE { FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: "Courier New"; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"; mso-style-link: "HTML Preformatted Char"; tab-stops: 45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt }
-       SPAN.HTMLPreformattedChar { COLOR: black; FONT-FAMILY: "Courier New"; mso-ansi-language: RU; mso-style-link: "HTML Preformatted"; mso-style-name: "HTML Preformatted Char"; mso-style-locked: yes; mso-ascii-font-family: "Courier New"; mso-hansi-font-family: "Courier New"; mso-bidi-font-family: "Courier New"; mso-fareast-language: RU; mso-bidi-language: AR-SA }
-       P.Item { FONT-SIZE: 10pt; TEXT-INDENT: -18pt; FONT-FAMILY: Arial; TEXT-ALIGN: justify; mso-ansi-language: EN-US; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"; tab-stops: list 36.0pt; mso-style-name: Item; mso-bidi-font-family: "Times New Roman"; mso-list: l0 level1 lfo2 }
-       LI.Item { FONT-SIZE: 10pt; TEXT-INDENT: -18pt; FONT-FAMILY: Arial; TEXT-ALIGN: justify; mso-ansi-language: EN-US; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"; tab-stops: list 36.0pt; mso-style-name: Item; mso-bidi-font-family: "Times New Roman"; mso-list: l0 level1 lfo2 }
-       DIV.Item { FONT-SIZE: 10pt; TEXT-INDENT: -18pt; FONT-FAMILY: Arial; TEXT-ALIGN: justify; mso-ansi-language: EN-US; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"; tab-stops: list 36.0pt; mso-style-name: Item; mso-bidi-font-family: "Times New Roman"; mso-list: l0 level1 lfo2 }
-       SPAN.grame { mso-style-name: grame }
-       SPAN.SpellE { mso-style-name: ""; mso-spl-e: yes }
-       DIV.Section1 { page: Section1 }
-       OL { }
-       </style>
-       </head>
-       <body bgcolor="#ffffff" lang="RU" link="blue" vlink="blue" style='tab-interval:35.4pt'
-               onload="runOnLoad();" alink="#0000ee">
-               <div id="content">
-                       <table class="MsoNormalTable" border="0" cellspacing="3" cellpadding="0" width="100%" style='WIDTH:100%;mso-cellspacing:1.5pt;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
-                               <TBODY>
-                                       <tr style='HEIGHT:18pt;mso-yfti-irow:0;mso-yfti-firstrow:yes'>
-                                               <td height="24" bgColor="#cccccc">
-                                                       <p class="MsoNormal"><b><span lang="EN" style='FONT-SIZE:24pt;COLOR:#000066;mso-ansi-language:EN'>SALOME 2.2.3 Release Announcement (29</span></b><span lang="EN" style='FONT-SIZE:24pt;COLOR:#000066;mso-ansi-language:EN'> April 2005</span><b><span lang="EN" style='FONT-SIZE:24pt;COLOR:#000066;mso-ansi-language:EN'>)</span></b></p>
-                                               </td>
-                                       </tr>
-                                       <tr style='HEIGHT:18pt;mso-yfti-irow:1'>
-                                               <td height="24">
-                                                       <h2><span lang="EN-US" style='mso-ansi-language:EN-US'>Common information</span></h2>
-                                                       <p><span lang="EN" style='COLOR:black;mso-ansi-language:EN'>The version 
-          <b>2.2.3 </b>is a minor SALOME maintenance release that contains bug 
-          fixes and minor improvements.</span><span lang="EN-US" style='mso-ansi-language:EN-US'></span></p>
-                                                       <p><span lang="EN-US" style='mso-ansi-language:EN-US'>The SALOME 2.2.3 version 
-          is targeting the <span class="SpellE">Redhat</span> 8.0 platform as a reference. Please see the README 
-          file (on the installation CD) for SALOME installation and execution.</span></p>
-                                                       <p><span lang="EN" style='COLOR:black;mso-ansi-language:EN'>For the full 
-          list of modifications since SALOME 2.2.0, see the change log file.</span><span lang="EN-US" style='mso-ansi-language:EN-US'></span></p>
-                                                       <h2><span lang="EN" style='mso-ansi-language:EN'>Improvements</span><span lang="EN-US" style='mso-ansi-language:EN-US'></span></h2>
-                                                       <p><span class="grame"><span lang="EN" style='COLOR:black;mso-ansi-language:EN'>SALOME 
-          &nbsp;2.2.3</span>
-                                                               </span><span lang="EN" style='COLOR:black;mso-ansi-language:EN'> has the following &nbsp;major improvements and enhancements:</span><span lang="EN-US" style='mso-ansi-language:EN-US'></span></p>
-                                                       <P class="Item" style="TEXT-ALIGN: left" align="left">
-                                                               <UL>
-                                                                       <LI>
-                                                                               MED module is compilable with gcc 3.4</LI>
-                                                                       <LI>
-                                                                               All standard modules were tested with omniOrb 4 and Python 2.3</SPAN> </SPAN></LI></UL>
-                                                       <P></P>
-                                                       <h2><span lang="EN" style='mso-ansi-language:EN'>BUG fixes</span><span lang="EN-US" style='mso-ansi-language:EN-US'></span></h2>
-                                                       <p><span class="grame"><span lang="EN" style='COLOR:black;mso-ansi-language:EN'>SALOME 
-          &nbsp;2.2.3 contains the following fixes</span>
-                                                               </span><span lang="EN" style='COLOR:black;mso-ansi-language:EN'>:</span>
-                                                               <SPAN lang="EN" style="COLOR: black; mso-ansi-language: EN"></p>
-                                                       <BLOCKQUOTE dir="ltr" style="MARGIN-RIGHT: 0px">
-                                                               <P class="Item" style="TEXT-ALIGN: left" align="left">
-                                                                       <UL>
-                                                                               <LI>
-                                                                                       <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame"><FONT face="Times New Roman" size="3">Fixed 
-                                                                                                               bug </FONT><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8264">
-                                                                                                               <FONT face="Times New Roman" size="3">PAL8264</FONT></A><FONT face="Times New Roman" size="3">
-                                                                                                               (REGRESSION: Partition of a shape by a plane ) </FONT>
-                                                                                               </SPAN></DIV>
-                                                                               <LI>
-                                                                                       <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame"><FONT face="Times New Roman" size="3">Fixed 
-                                                                                                               bug </FONT>
-                                                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8343"><FONT face="Times New Roman" size="3">PAL8343</FONT></A>&nbsp;<SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'">(Improvment 
-          for Sender and receiver mechanism) </SPAN>
-                                                                                               </SPAN></DIV>
-                                                                               <LI>
-                                                                                       <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame"><FONT face="Times New Roman" size="3">Fixed 
-                                                                                                               bug </FONT>
-                                                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8346"><FONT face="Times New Roman" size="3">PAL8346</FONT></A>&nbsp;<SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'">(Radio 
-          button that unselect the installation of the salome modules 
-          sources)</SPAN>
-                                                                                                       <FONT face="Times New Roman" size="3"></FONT>
-                                                                                               </SPAN></DIV>
-                                                                               <LI>
-                                                                                       <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame"><FONT face="Times New Roman" size="3">Fixed 
-                                                                                                               bug </FONT>
-                                                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8468"><FONT face="Times New Roman" size="3">PAL8468</FONT></A>&nbsp;<SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'">(Start 
-          and End Length on two opposite edges)</SPAN>
-                                                                                                       <FONT face="Times New Roman" size="3"></FONT>
-                                                                                               </SPAN></DIV>
-                                                                               <LI>
-                                                                                       <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame"><FONT face="Times New Roman" size="3">Fixed 
-                                                                                                               bug </FONT>
-                                                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8469"><FONT face="Times New Roman" size="3">PAL8469</FONT></A>&nbsp;<SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'">(Updating 
-          the global mesh icon when local hypotheses are edited)</SPAN>
-                                                                                                       <FONT face="Times New Roman" size="3"></FONT>
-                                                                                               </SPAN></DIV>
-                                                                               <LI>
-                                                                                       <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame"><FONT face="Times New Roman" size="3">Fixed 
-                                                                                                               bug </FONT>
-                                                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8536"><FONT face="Times New Roman" size="3">PAL8536</FONT></A>&nbsp;<SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'">(Min 
-          and max value of 2D and 3D hypotheses)</SPAN>
-                                                                                                       <FONT face="Times New Roman" size="3"></FONT>
-                                                                                               </SPAN></DIV>
-                                                                               <LI>
-                                                                                       <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame"><FONT face="Times New Roman" size="3">Fixed 
-                                                                                                               bug </FONT>
-                                                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8596"><FONT face="Times New Roman" size="3">PAL8596</FONT></A>&nbsp;<SPAN class="grame"><FONT face="Times New Roman" size="3">(Incorrect 
-                                                                                                               warping) </FONT>
-                                                                                               </SPAN></DIV>
-                                                                               <LI>
-                                                                                       <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame"><FONT face="Times New Roman" size="3">Fixed 
-                                                                                                               bug </FONT>
-                                                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8529"><FONT face="Times New Roman" size="3">PAL8529</FONT></A>&nbsp;<SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'; mso-bidi-font-size: 10.0pt">(The 
-          creation of mesh group doesn't work correctly with GHS3D)</SPAN></DIV>
-                                                                               <LI>
-                                                                                       <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame"><FONT face="Times New Roman" size="3">Fixed 
-                                                                                                               bug </FONT>
-                                                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8598"><FONT face="Times New Roman" size="3">PAL8598</FONT></A><SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'"></SPAN>
-                                                                                                       <FONT face="Times New Roman" size="3"></FONT>
-                                                                                               </SPAN><SPAN class="grame"><FONT face="Times New Roman" size="3">(Access to Camera Dump 
-                                                                                                               function through contextual menu of the view) </FONT>
-                                                                                               </SPAN></DIV>
-                                                                               <LI>
-                                                                                       <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame"><FONT face="Times New Roman" size="3">Fixed 
-                                                                                                               bug </FONT>
-                                                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8330"><FONT face="Times New Roman" size="3">PAL8330</FONT></A><SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'"></SPAN>
-                                                                                                       <FONT face="Times New Roman" size="3"></FONT>
-                                                                                               </SPAN><SPAN class="grame"><FONT face="Times New Roman" size="3">(Bad oriented volumes) </FONT>
-                                                                                               </SPAN></DIV>
-                                                                               <LI>
-                                                                                       <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame"><FONT face="Times New Roman" size="3">Fixed 
-                                                                                                               bug </FONT>
-                                                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8378"><FONT face="Times New Roman" size="3">PAL8378</FONT></A><SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'"></SPAN>
-                                                                                                       <FONT face="Times New Roman" size="3"></FONT>
-                                                                                               </SPAN><SPAN class="grame"><FONT face="Times New Roman" size="3">(Bug in Partition 
-                                                                                                               Algorithm) </FONT>
-                                                                                               </SPAN></DIV>
-                                                                               <LI>
-                                                                                       <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame"><FONT face="Times New Roman" size="3">Fixed 
-                                                                                                               bug </FONT>
-                                                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8379"><FONT face="Times New Roman" size="3">PAL8379</FONT></A><SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'"></SPAN>
-                                                                                                       <FONT face="Times New Roman" size="3"></FONT>
-                                                                                               </SPAN><SPAN class="grame"><FONT face="Times New Roman" size="3">(Filters for groups on 
-                                                                                                               geometry) </FONT>
-                                                                                               </SPAN></DIV>
-                                                                               <LI>
-                                                                                       <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame"><FONT face="Times New Roman" size="3">Fixed 
-                                                                                                               bug </FONT>
-                                                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8539"><FONT face="Times New Roman" size="3">PAL8539</FONT></A><SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'"></SPAN>
-                                                                                                       <FONT face="Times New Roman" size="3"></FONT>
-                                                                                               </SPAN><SPAN class="grame"><FONT face="Times New Roman" size="3">(Bug in 
-                                                                                                               StdMeshers_Regular_1D.cxx for the SetScale option) </FONT>
-                                                                                               </SPAN></DIV>
-                                                                               <LI>
-                                                                                       <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame"><FONT face="Times New Roman" size="3">Fixed 
-                                                                                                               bug </FONT>
-                                                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8562"><FONT face="Times New Roman" size="3">PAL8562</FONT></A><SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'"></SPAN>
-                                                                                                       <FONT face="Times New Roman" size="3"></FONT>
-                                                                                               </SPAN><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'; mso-bidi-font-size: 10.0pt">(The 
-          parameter for linker option rpath (rpath-link) is missed)</SPAN></DIV>
-                                                                               <LI>
-                                                                                       <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame"><FONT face="Times New Roman" size="3">Fixed 
-                                                                                                               bug </FONT>
-                                                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8684"><FONT face="Times New Roman" size="3">PAL8684</FONT></A><SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'"></SPAN>
-                                                                                                       <FONT face="Times New Roman" size="3"></FONT>
-                                                                                               </SPAN><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'; mso-bidi-font-size: 10.0pt">(A 
-          med file imported twice is not updated)</SPAN></DIV>
-                                                                               <LI>
-                                                                                       <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame"><FONT face="Times New Roman" size="3">Fixed 
-                                                                                                               bug </FONT>
-                                                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8698"><FONT face="Times New Roman" size="3">PAL8698</FONT></A><SPAN class="grame"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'"></SPAN>
-                                                                                                       <FONT face="Times New Roman" size="3"></FONT>
-                                                                                               </SPAN><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'; mso-bidi-font-size: 10.0pt">(Scalar 
-          Map of a field with more than 3 components)</SPAN></DIV>
-                                                                               <LI>
-                                                                                       <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN class="grame"><FONT face="Times New Roman" size="3">Fixed 
-                                                                                                               bug </FONT>
-                                                                                               </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8683"><FONT face="Times New Roman" size="3">PAL8683</FONT></A>&nbsp;<SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'; mso-bidi-font-size: 10.0pt">(Deformed 
-          shape of a field with more than 3 components)</SPAN></DIV>
-                                                                               <LI>
-                                                                                       <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'">Fixed 
-          bug </SPAN><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8588"><FONT face="Times New Roman" size="3">ALSCDA8588</FONT></A>&nbsp;<SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'; mso-bidi-font-size: 10.0pt">(Not 
-          correct working of porflow driver after Sauv2Med 
-          improvements)</SPAN></DIV>
-                                                                               <LI>
-                                                                                       <DIV class="Item" style="TEXT-ALIGN: left" align="left"><SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'; mso-bidi-font-size: 10.0pt"></SPAN><FONT face="Times New Roman" size="3">Fixed 
-                                                                                                       bug </FONT><A href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8699">
-                                                                                                       <FONT face="Times New Roman" size="3">ALSCDA8699</FONT></A>&nbsp;<SPAN lang="EN-US" style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'; mso-bidi-font-size: 10.0pt">(SAUVE 
-          file is written incorrectly) </SPAN></DIV>
-                                                                               </LI>
-                                                                       </UL>
-                                                               <P></P>
-                                                       </BLOCKQUOTE></SPAN>
-                                                       <h2><span lang="EN" style='mso-ansi-language:EN'>Known limitations</span><span lang="EN-US" style='mso-ansi-language:EN-US'></span></h2>
-                                                       <p><span class="grame"><span lang="EN-US" style='mso-ansi-language:EN-US'>SALOME 
-          2.2.3 has the following known limitations:</span>
-                                                               </span><span lang="EN-US" style='mso-ansi-language:EN-US'></span></p>
-                                                       <UL type="disc">
-                                                               <li class="MsoNormal" style='mso-mso-mso-list:l2 level1 lfo8'>
-                                                                       <span class="grame">
-                                                                               <span lang="EN-US" style='mso-ansi-language:EN-US'>Sometime SALOME does not start 
-            from first time (bug PAL8142). The fix will be in next maintenance 
-            release.</span>
-                                                                       </span>
-                                                               <LI class="MsoNormal" style="mso-mso-mso-list: l2 level1 lfo8">
-                                                                       <SPAN class="grame">
-                                                                               <SPAN lang="EN-US" style="mso-ansi-language: EN-US">
-                                                                                       <SPAN lang="EN-US" style="FONT-SIZE: 12pt; FONT-FAMILY: 'Times New Roman'; mso-ansi-language: EN-US; mso-fareast-font-family: 'Times New Roman'; mso-fareast-language: FR; mso-bidi-language: AR-SA">Installation 
-        from source codes is not assured on RedHat 9.0 systems. Third party 
-        products compilation (like Python) was not overally tested and can fail 
-        due to differnces in some RPM packages between Redhat 8.0 and 9.0 
-        versions.</SPAN>
-                                                                               </SPAN>
-                                                                       </SPAN></LI></UL>
-                                                       <h2><span lang="EN" style='mso-ansi-language:EN'>Maintenance contact</span><span lang="EN-US" style='mso-ansi-language:EN-US'></span></h2>
-                                                       <p><span lang="EN-US" style='mso-ansi-language:EN-US'>In order to report 
-          a bug or propose an improvement, please use your account in the bug 
-          tracker (</span><a href="http://ocsprojects.opencascade.com/bugtracker"><span lang="EN-US" style='mso-ansi-language:EN-US'>http://ocsprojects.opencascade.com/bugtracker</span></a><span lang="EN-US" style='mso-ansi-language:EN-US'>). Please report bugs and improvements 
-          mentioning exactly your SALOME release. <br>
-          Please address all other questions (including bug tracker account requests) 
-          to </span><a href="mailto:salome-maintenance@opencascade.com"><span lang="EN-US" style='mso-ansi-language:EN-US'>salome-maintenance@opencascade.com</span></a><span lang="EN-US" style='mso-ansi-language:EN-US'>.</span></p>
-                                               </td>
-                                       </tr>
-                                       <tr style='HEIGHT:18pt;mso-yfti-irow:2;mso-yfti-lastrow:yes'>
-                                               <td height="24" bgColor="#cccccc">
-                                                       <p class="MsoNormal">Copyright &copy; 2001-2005 All rights reserved.</p>
-                                               </td>
-                                       </tr>
-                               </TBODY></table>
-               </div>
-       </body>
-</html>
diff --git a/SALOME2_2_4_Change_Log.htm b/SALOME2_2_4_Change_Log.htm
new file mode 100755 (executable)
index 0000000..191f645
--- /dev/null
@@ -0,0 +1,517 @@
+<HTML><HEAD><TITLE>SALOME 2 Change Log</TITLE><LINK href="SALOME2_ChangeLog_files/editdata.mso" rel=Edit-Time-Data>
+<STYLE>.Normal { FONT-SIZE: 12pt; FONT-FAMILY: "Times New Roman" }
+       </STYLE>
+
+<META content="SALOME 2 Change Log" name=title>
+<META http-equiv=content-type content="text/html; charset=us-ascii">
+<META content="Trellian WebPage" name=generator></HEAD>
+<BODY>
+<DIV id=headnav></DIV>
+<DIV id=layout_1>
+<UL type=square></UL>
+<DIV id=headnav></DIV>
+<TABLE width="100%" border=0>
+  <TBODY>
+  <TR>
+    <TD bgColor=#cccccc height=30>
+      <DIV id=headnav></DIV>
+      <DIV id=layout_1>
+      <P class=MsoNormal><B><SPAN lang=EN 
+      style="FONT-SIZE: 24pt; COLOR: rgb(0,0,102)">SALOME 2 Change Log 
+      (</SPAN></B><SPAN lang=EN style="FONT-SIZE: 24pt; COLOR: rgb(0,0,102)">21 
+      June 2005</SPAN><B><SPAN lang=EN 
+      style="FONT-SIZE: 24pt; COLOR: rgb(0,0,102)">)</SPAN></B></P></DIV></TD></TR>
+  <TR>
+    <TD bgColor=#ffffff height=355>
+      <DIV class=MsoNormal style="TEXT-ALIGN: center" align=center><SPAN lang=EN 
+      style="FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: Verdana"><SPAN lang=EN 
+      style="FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: Verdana">
+      <DIV class=MsoNormal style="TEXT-ALIGN: center" align=left>
+      <HR align=center width="100%" color=black noShade SIZE=1>
+      </DIV></SPAN>
+      <H3 align=left><SPAN lang=EN 
+      style="FONT-SIZE: 11pt; FONT-FAMILY: Verdana">Version 2.2.4 (maintenance 
+      release)</SPAN></H3>
+      <H4 align=left><B><SPAN lang=EN 
+      style="FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: Verdana">21-June-2005</SPAN></B><A 
+      name=2.2.2></A></H4>
+      <UL>
+        <LI>
+        <DIV align=left><FONT face="Times New Roman" size=3>Mandrake 10.1 
+        compatiblity</FONT></DIV>
+        <LI>
+        <DIV align=left><FONT face="Times New Roman" size=3>New functionality is 
+        added to the MED component</FONT></DIV>
+        <LI>
+        <DIV align=left><FONT face="Times New Roman" size=3>New TUI examples 
+        were added to the VISU module for 2D tables manipulations</FONT></DIV>
+        <LI>
+        <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt" align=left><FONT 
+        face="Times New Roman" size=3>Fixed bug PAL7444 - display mesh takes a 
+        lot of more memory in 2.1.0 than in 2.0.0. </FONT></P>
+        <LI>
+        <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt" align=left><FONT 
+        face="Times New Roman" size=3>Fixed bug PAL8912 - "Stream Graph 
+        Parameters" disappeared from the pop-up when the graph has Calcium nodes 
+        </FONT></P>
+        <LI>
+        <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt" align=left><FONT 
+        face="Times New Roman" size=3>Fixed bug PAL8917 - Attributes 
+        ExternalFileDef and fileType are not saved with study. </FONT></P>
+        <LI>
+        <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt" align=left><FONT 
+        face="Times New Roman" size=3>Fixed bug PAL8922 - False component name 
+        generatef by Catalog Generator </FONT></P>
+        <LI>
+        <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt" align=left><FONT 
+        face="Times New Roman" size=3>Fixed bug PAL9090 - Localisation of the 
+        "jroy_2810_SALOME_pidict" file. </FONT></P>
+        <LI>
+        <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt" align=left><FONT 
+        face="Times New Roman" size=3>Fixed bug PAL9133 - initialization of 
+        string inPort with an empty string is not possible </FONT></P>
+        <LI>
+        <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt" align=left><FONT 
+        face="Times New Roman" size=3>Fixed bug PAL9151 - REGRESSION: partition 
+        ends badly or doesn't end </FONT></P>
+        <LI>
+        <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt" align=left><FONT 
+        face="Times New Roman" size=3>Fixed bug PAL9163 - Triangles and Prisms 
+        are not well generated when making a revolution and an extrusion (bug 
+        PAL8869) </FONT></P>
+        <LI>
+        <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt" align=left><FONT 
+        face="Times New Roman" size=3>Fixed bug PAL9165 - Warning in the log 
+        message </FONT></P>
+        <LI>
+        <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt" align=left><FONT 
+        face="Times New Roman" size=3>Fixed bug PAL9167 - Parametric point 
+        construction doesn't add the edge selected in the study </FONT></P>
+        <LI>
+        <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt" align=left><FONT 
+        face="Times New Roman" size=3>Fixed bug PAL8221 - POST-PRO: Pal/Salome 
+        crashes if edit presentation in opened study </FONT></P>
+        <LI>
+        <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt" align=left><FONT 
+        face="Times New Roman" size=3>Fixed bug PAL8727 - Saving a study with a 
+        SUPERV item makes the IHM to freeze </FONT></P>
+        <LI>
+        <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt" align=left><FONT 
+        face="Times New Roman" size=3>Fixed bug PAL8787 - Can't mesh a sphere 
+        with NETGEN</FONT></P>
+        <LI>
+        <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt" align=left><FONT 
+        face="Times New Roman" size=3>Fixed bug PAL8346 - radio button that 
+        unselect the installation of the salome modules sources</FONT></P>
+        <LI>
+        <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt" align=left><FONT 
+        face="Times New Roman" size=3>Fixed bug PAL8914 - Delete of a Node 
+        linked to an EndLoopNode ==&gt; Not executable</FONT></P>
+        <LI>
+        <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt" align=left><FONT 
+        face="Times New Roman" size=3>Fixed bug PAL9042 - HangUp in 
+        FactoryServer</FONT></P>
+        <LI>
+        <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt" align=left><FONT 
+        face="Times New Roman" size=3>Fixed bug PAL9164 - Values 
+        limitation</FONT></P>
+        <LI>
+        <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt" align=left><FONT 
+        face="Times New Roman" size=3>Fixed bug PAL9166 - Geometry is not 
+        complete</FONT></P></LI></UL>
+      <P align=left>
+      <P align=left><SPAN lang=EN 
+      style="FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: Verdana"><FONT 
+      face="Arial, Helvetica, sans-serif" size=2>There is a <A href="SALOME2_2_4_Release_Notes.htm">separate announcement</A> 
+      available for this release.</FONT></SPAN> </P>
+      <HR align=center width="100%" color=black noShade SIZE=1>
+      </SPAN></DIV>
+      <H3>
+      <H3><SPAN lang=EN style="FONT-SIZE: 11pt; FONT-FAMILY: Verdana">Version 
+      2.2.3 (maintenance release)</SPAN></H3>
+      <H4><B><SPAN lang=EN 
+      style="FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: Verdana">29-Apr-2005</SPAN></B><A 
+      name=2.2.2></A></H4></H3>
+      <UL>
+        <LI>
+        <DIV class=Item style="TEXT-ALIGN: left" align=left><SPAN 
+        class=grame>MED module is compilable with gcc 3.4 </SPAN></DIV>
+        <LI>
+        <DIV class=Item style="TEXT-ALIGN: left" align=left><SPAN 
+        class=grame>All standard modules were tested with omniOrb 4 and Python 
+        2.3</SPAN></DIV>
+        <LI>
+        <DIV class=Item style="TEXT-ALIGN: left" align=left><SPAN 
+        class=grame>Fixed bug <A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8264">PAL8264</A>&nbsp;(REGRESSION: 
+        Partition of a shape by a plane ) </SPAN></DIV>
+        <LI>
+        <DIV class=Item style="TEXT-ALIGN: left" align=left><SPAN 
+        class=grame>Fixed bug </SPAN><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8343">PAL8343</A>&nbsp;<SPAN 
+        class=grame><SPAN lang=EN-US 
+        style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'">(Improvment 
+        for Sender and receiver mechanism) </SPAN></SPAN></DIV>
+        <LI>
+        <DIV class=Item style="TEXT-ALIGN: left" align=left><SPAN 
+        class=grame>Fixed bug </SPAN><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8346">PAL8346</A>&nbsp;<SPAN 
+        class=grame><SPAN lang=EN-US 
+        style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'">(Radio 
+        button that unselect the installation of the salome modules 
+        sources)</SPAN> </SPAN></DIV>
+        <LI>
+        <DIV class=Item style="TEXT-ALIGN: left" align=left><SPAN 
+        class=grame>Fixed bug </SPAN><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8468">PAL8468</A>&nbsp;<SPAN 
+        class=grame><SPAN lang=EN-US 
+        style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'">(Start 
+        and End Length on two opposite edges)</SPAN> </SPAN></DIV>
+        <LI>
+        <DIV class=Item style="TEXT-ALIGN: left" align=left><SPAN 
+        class=grame>Fixed bug </SPAN><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8469">PAL8469</A>&nbsp;<SPAN 
+        class=grame><SPAN lang=EN-US 
+        style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'">(Updating 
+        the global mesh icon when local hypotheses are edited)</SPAN> 
+        </SPAN></DIV>
+        <LI>
+        <DIV class=Item style="TEXT-ALIGN: left" align=left><SPAN 
+        class=grame>Fixed bug </SPAN><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8536">PAL8536</A>&nbsp;<SPAN 
+        class=grame><SPAN lang=EN-US 
+        style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'">(Min 
+        and max value of 2D and 3D hypotheses)</SPAN> </SPAN></DIV>
+        <LI>
+        <DIV class=Item style="TEXT-ALIGN: left" align=left><SPAN 
+        class=grame>Fixed bug </SPAN><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8596">PAL8596</A>&nbsp;<SPAN 
+        class=grame>(Incorrect warping) </SPAN></DIV>
+        <LI>
+        <DIV class=Item style="TEXT-ALIGN: left" align=left><SPAN 
+        class=grame>Fixed bug </SPAN><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8529">PAL8529</A>&nbsp;<SPAN 
+        lang=EN-US 
+        style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'; mso-bidi-font-size: 10.0pt">(The 
+        creation of mesh group doesn't work correctly with GHS3D)</SPAN></DIV>
+        <LI>
+        <DIV class=Item style="TEXT-ALIGN: left" align=left><SPAN 
+        class=grame>Fixed bug </SPAN><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8598">PAL8598</A><SPAN 
+        class=grame><SPAN lang=EN-US 
+        style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'"></SPAN> 
+        </SPAN><SPAN class=grame>(Access to Camera Dump function through 
+        contextual menu of the view) </SPAN></DIV>
+        <LI>
+        <DIV class=Item style="TEXT-ALIGN: left" align=left><SPAN 
+        class=grame>Fixed bug </SPAN><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8330">PAL8330</A><SPAN 
+        class=grame><SPAN lang=EN-US 
+        style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'"></SPAN> 
+        </SPAN><SPAN class=grame>(Bad oriented volumes) </SPAN></DIV>
+        <LI>
+        <DIV class=Item style="TEXT-ALIGN: left" align=left><SPAN 
+        class=grame>Fixed bug </SPAN><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8378">PAL8378</A><SPAN 
+        class=grame><SPAN lang=EN-US 
+        style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'"></SPAN> 
+        </SPAN><SPAN class=grame>(Bug in Partition Algorithm) </SPAN></DIV>
+        <LI>
+        <DIV class=Item style="TEXT-ALIGN: left" align=left><SPAN 
+        class=grame>Fixed bug </SPAN><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8379">PAL8379</A><SPAN 
+        class=grame><SPAN lang=EN-US 
+        style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'"></SPAN> 
+        </SPAN><SPAN class=grame>(Filters for groups on geometry) </SPAN></DIV>
+        <LI>
+        <DIV class=Item style="TEXT-ALIGN: left" align=left><SPAN 
+        class=grame>Fixed bug </SPAN><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8539">PAL8539</A><SPAN 
+        class=grame><SPAN lang=EN-US 
+        style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'"></SPAN> 
+        </SPAN><SPAN class=grame>(Bug in StdMeshers_Regular_1D.cxx for the 
+        SetScale option) </SPAN></DIV>
+        <LI>
+        <DIV class=Item style="TEXT-ALIGN: left" align=left><SPAN 
+        class=grame>Fixed bug </SPAN><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8562">PAL8562</A><SPAN 
+        class=grame><SPAN lang=EN-US 
+        style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'"></SPAN> 
+        </SPAN><SPAN lang=EN-US 
+        style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'; mso-bidi-font-size: 10.0pt">(The 
+        parameter for linker option rpath (rpath-link) is missed)</SPAN></DIV>
+        <LI>
+        <DIV class=Item style="TEXT-ALIGN: left" align=left><SPAN 
+        class=grame>Fixed bug </SPAN><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8684">PAL8684</A><SPAN 
+        class=grame><SPAN lang=EN-US 
+        style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'"></SPAN> 
+        </SPAN><SPAN lang=EN-US 
+        style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'; mso-bidi-font-size: 10.0pt">(A 
+        med file imported twice is not updated)</SPAN></DIV>
+        <LI>
+        <DIV class=Item style="TEXT-ALIGN: left" align=left><SPAN 
+        class=grame>Fixed bug </SPAN><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8698">PAL8698</A><SPAN 
+        class=grame><SPAN lang=EN-US 
+        style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'"></SPAN> 
+        </SPAN><SPAN lang=EN-US 
+        style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'; mso-bidi-font-size: 10.0pt">(Scalar 
+        Map of a field with more than 3 components)</SPAN></DIV>
+        <LI>
+        <DIV class=Item style="TEXT-ALIGN: left" align=left><SPAN 
+        class=grame>Fixed bug </SPAN><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8683">PAL8683</A>&nbsp;<SPAN 
+        lang=EN-US 
+        style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'; mso-bidi-font-size: 10.0pt">(Deformed 
+        shape of a field with more than 3 components)</SPAN></DIV>
+        <LI>
+        <DIV class=Item style="TEXT-ALIGN: left" align=left><SPAN lang=EN-US 
+        style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'">Fixed 
+        bug </SPAN><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8588">ALSCDA8588</A>&nbsp;<SPAN 
+        lang=EN-US 
+        style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'; mso-bidi-font-size: 10.0pt">(Not 
+        correct working of porflow driver after Sauv2Med 
+        improvements)</SPAN></DIV>
+        <LI>Fixed bug<A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8699">ALSCDA8699</A>&nbsp;<SPAN 
+        lang=EN-US 
+        style="FONT-SIZE: 12pt; COLOR: black; FONT-FAMILY: 'Times New Roman'; mso-bidi-font-size: 10.0pt">(SAUVE 
+        file is written incorrectly) </SPAN></LI></UL>
+      <P>
+      <P><SPAN lang=EN 
+      style="FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: Verdana"><FONT 
+      face="Arial, Helvetica, sans-serif" size=2>There is a <A href="SALOME2_2_3_Release_Notes.htm">separate announcement</A> 
+      available for this release.</FONT></SPAN> </P>
+      <P>
+      <HR align=center width="100%" color=black noShade SIZE=1>
+
+      <P></P>
+      <P></P>
+      <P></P>
+      <H3><SPAN lang=EN style="FONT-SIZE: 11pt; FONT-FAMILY: Verdana">Version 
+      2.2.2 (maintenance release)</SPAN></H3>
+      <H4><B><SPAN lang=EN 
+      style="FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: Verdana">29-Mar-2005</SPAN></B></H4>
+      <UL class=Normal>
+        <LI>
+        <DIV id=content><SPAN lang=EN-US style="FONT-FAMILY: Verdana"><FONT 
+        face=Arial size=2>This version is compatible with gcc 3.3 and Python 
+        2.3</FONT></SPAN></DIV>
+        <LI>
+        <DIV><SPAN lang=EN-US style="FONT-FAMILY: Verdana"><FONT face=Arial 
+        size=2>The SALOME non-regression test base was corrected. Internal links 
+        were removed.</FONT></SPAN></DIV>
+        <LI>
+        <DIV><SPAN lang=EN-US style="FONT-FAMILY: Verdana"><FONT face=Arial 
+        size=2>Compatibility with CCRT (OSF Alfa ) of KERNEL and MED 
+        modules</FONT></SPAN></DIV>
+        <LI>
+        <DIV><SPAN lang=EN-US style="FONT-FAMILY: Verdana"><FONT face=Arial 
+        size=2>Sauv2Med (CASTEM - MED) converter with debugs is integrated now 
+        into the MED component</FONT></SPAN></DIV>
+        <LI>
+        <DIV class=Normal id=content><FONT size=2><SPAN lang=EN-US 
+        style="FONT-FAMILY: Verdana"><FONT face=Arial>Fixed bug </FONT><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8471"><FONT 
+        face=Arial>PAL8471</FONT></A><FONT face=Arial> (New SMESH Python 
+        API)</FONT></SPAN></FONT></DIV>
+        <LI>
+        <DIV class=Normal id=content><FONT size=2><SPAN lang=EN-US 
+        style="FONT-FAMILY: Verdana"><FONT face=Arial>Fixed bug </FONT><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8269"><FONT 
+        face=Arial>PAL8269</FONT></A><FONT face=Arial> (One can't select a 
+        pointer on geometry in mesh filters)</FONT></SPAN></FONT></DIV>
+        <LI>
+        <DIV class=Normal id=content><FONT size=2><SPAN lang=EN-US 
+        style="FONT-FAMILY: Verdana"><FONT face=Arial>Fixed bug </FONT><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8232"><FONT 
+        face=Arial>PAL8232</FONT></A><FONT face=Arial> (UseCase browser breaks 
+        multi-selection and general Salome popup)</FONT></SPAN></FONT></DIV>
+        <LI>
+        <DIV id=content><FONT size=2><SPAN lang=EN-US 
+        style="FONT-FAMILY: Verdana"><FONT face=Arial>Fixed bug </FONT><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8376"><FONT 
+        face=Arial>PAL8376</FONT></A><FONT face=Arial> (createAndDisplayGO only 
+        works with a VTK view in Study1)</FONT></SPAN></FONT></DIV>
+        <LI>
+        <DIV id=content><FONT size=2><SPAN lang=EN-US 
+        style="FONT-FAMILY: Verdana"><FONT face=Arial>Fixed bug </FONT><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8395"><FONT 
+        face=Arial>PAL8395</FONT></A><FONT face=Arial> (RemoveExtraEdges not 
+        remove some degenerate edges)</FONT></SPAN></FONT></DIV>
+        <LI>
+        <DIV id=content><FONT size=2><SPAN lang=EN-US 
+        style="FONT-FAMILY: Verdana"><FONT face=Arial>Fixed bug </FONT><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8380"><FONT 
+        face=Arial>PAL8380</FONT></A><FONT face=Arial> (Can't create a Group of 
+        Nodes from a group on geometry)</FONT></SPAN></FONT></DIV>
+        <LI>
+        <DIV id=content><FONT size=2><SPAN lang=EN-US 
+        style="FONT-FAMILY: Verdana"><FONT face=Arial>Fixed bug </FONT><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8267"><FONT 
+        face=Arial>PAL8267</FONT></A><FONT face=Arial> (Extrusion of a mesh by 
+        the TUI)</FONT></SPAN></FONT></DIV>
+        <LI>
+        <DIV id=content><FONT size=2><SPAN lang=EN-US 
+        style="FONT-FAMILY: Verdana"><FONT face=Arial>Fixed bug </FONT><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8418"><FONT 
+        face=Arial>PAL8418</FONT></A><FONT face=Arial> (Installation procedure 
+        2.2.1 CD - no symbolic link on CD)</FONT></SPAN></FONT></DIV>
+        <LI>
+        <DIV id=content><FONT size=2><SPAN lang=EN-US 
+        style="FONT-FAMILY: Verdana"><FONT face=Arial>Fixed bug </FONT><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8331"><FONT 
+        face=Arial>PAL8331</FONT></A><FONT face=Arial> (</FONT></SPAN><SPAN 
+        lang=SV style="COLOR: black"><FONT face=Arial>REGRESSION import mesh in 
+        "MED 2.2" format)</FONT></SPAN></FONT></DIV>
+        <LI>
+        <DIV id=content><FONT size=2><SPAN lang=EN-US 
+        style="FONT-FAMILY: Verdana"><FONT face=Arial>Fixed bug </FONT><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8336"><FONT 
+        face=Arial>PAL8336</FONT></A><FONT face=Arial> (Problems related to use 
+        of MedClient)</FONT></SPAN></FONT></DIV>
+        <LI>
+        <DIV id=content><FONT size=2><SPAN lang=EN-US 
+        style="FONT-FAMILY: Verdana"><FONT face=Arial>Fixed bug </FONT><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8187"><FONT 
+        face=Arial>PAL8187</FONT></A><FONT face=Arial> (Problem with namespace 
+        MED_EN in file MEDMEM_Field.hxx)</FONT></SPAN></FONT></DIV>
+        <LI>
+        <DIV id=content><FONT size=2><SPAN lang=EN-US 
+        style="FONT-FAMILY: Verdana"><FONT face=Arial>Fixed bug </FONT><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8490"><FONT 
+        face=Arial>PAL8490</FONT></A><FONT face=Arial> (Support omniORB 4.0 
+        compilation for KERNEL)</FONT></SPAN></FONT></DIV>
+        <LI>
+        <DIV id=content><FONT size=2><SPAN lang=EN-US 
+        style="FONT-FAMILY: Verdana"><FONT face=Arial>Fixed bug </FONT><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8491"><FONT 
+        face=Arial>PAL8491</FONT></A><FONT face=Arial> (Allways force an 
+        absolute path with naming service when 
+        possible)</FONT></SPAN></FONT></DIV>
+        <LI>
+        <DIV id=content>
+        <DIV id=content>
+        <DIV id=content><FONT size=2><SPAN lang=EN-US 
+        style="FONT-FAMILY: Verdana"><FONT face=Arial>Fixed bug </FONT><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8492"><FONT 
+        face=Arial>PAL8492</FONT></A><FONT face=Arial> (Suppress French accents 
+        in python comments : warnings)</FONT></SPAN></FONT></DIV></DIV></DIV>
+        <LI>
+        <DIV id=content><FONT size=2><SPAN lang=EN-US 
+        style="FONT-FAMILY: Verdana"><FONT face=Arial>Fixed bug </FONT><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8493"><FONT 
+        face=Arial>PAL8493</FONT></A><FONT face=Arial> (New versions of 
+        PyQt,Qt,qwt,sip)</FONT></SPAN></FONT></DIV>
+        <LI>
+        <DIV id=content><FONT size=2><SPAN lang=EN-US 
+        style="FONT-FAMILY: Verdana"><FONT face=Arial>Fixed bug </FONT><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8194"><FONT 
+        face=Arial>PAL8494</FONT></A><FONT face=Arial> (Include order to avoid 
+        compilation problems with gcc3.3, Python2.3, 
+        qt...)</FONT></SPAN></FONT></DIV>
+        <LI>
+        <DIV id=content><FONT size=2><SPAN lang=EN-US 
+        style="FONT-FAMILY: Verdana"><FONT face=Arial>Fixed bug </FONT><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8495"><FONT 
+        face=Arial>PAL8495</FONT></A><FONT face=Arial> (Control Python lock on 
+        embedded interpreter initialization)</FONT></SPAN></FONT></DIV>
+        <LI>
+        <DIV id=content>
+        <DIV id=content>
+        <DIV id=content>
+        <DIV id=content><FONT size=2><SPAN lang=EN-US 
+        style="FONT-FAMILY: Verdana"><FONT face=Arial>Fixed bug </FONT><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8496"><FONT 
+        face=Arial>PAL8496</FONT></A><FONT face=Arial> (Correction of incomplete 
+        module imports in Python)</FONT></SPAN></FONT></DIV></DIV></DIV></DIV>
+        <LI>
+        <DIV id=content><FONT size=2><SPAN lang=EN-US 
+        style="FONT-FAMILY: Verdana"><FONT face=Arial>Fixed bug </FONT><A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8497"><FONT 
+        face=Arial>PAL8497</FONT></A><FONT face=Arial> (Activate commented 
+        traces)</FONT></SPAN></FONT><FONT face=Arial> </FONT>
+        <DIV id=content></DIV></DIV></LI></UL>
+      <P><SPAN lang=EN 
+      style="FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: Verdana"><FONT 
+      face="Arial, Helvetica, sans-serif" size=2>There is a <A href="SALOME2_2_2_Release_Notes.htm">separate announcement</A> 
+      available for this release.</FONT></SPAN> </P>
+      <P class=MsoNormal style="TEXT-ALIGN: center" align=center><SPAN lang=EN 
+      style="FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: Verdana">
+      <HR align=center width="100%" color=black noShade SIZE=1>
+      </SPAN>
+      <P></P>
+      <H3></H3>
+      <H3><A name=2.2.1></A><SPAN lang=EN 
+      style="FONT-SIZE: 11pt; FONT-FAMILY: Verdana">Version 2.2.1 (maintenance 
+      release)</SPAN></H3>
+      <P class=MsoNormal><B><SPAN lang=EN 
+      style="FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: Verdana">01-Mar-2005</SPAN></B><SPAN 
+      lang=EN 
+      style="FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: Verdana"></SPAN></P>
+      <UL>
+        <LI class=MsoNormal style="COLOR: black"><FONT 
+        face="Arial, Helvetica, sans-serif" size=2><SPAN lang=EN>Fixed bug <A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=7158">PAL7158</A> 
+        (Multi rotation - translation was not possible with a shape obtained by 
+        explode). </SPAN></FONT>
+        <LI><FONT face="Arial, Helvetica, sans-serif" size=2><SPAN lang=EN>Fixed 
+        bug <A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=7764">PAL7764</A> 
+        (Salome aborts when running 2 of the 3 graphs (same services but 
+        different links into graphs). </SPAN></FONT>
+        <LI class=MsoNormal style="COLOR: black"><FONT 
+        face="Arial, Helvetica, sans-serif" size=2><SPAN lang=EN>Fixed bug <A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8065">PAL8065</A> 
+        (Abort on <SPAN class=SpellE><SPAN class=spelle>Superv</SPAN> 
+        </SPAN>with TestVisu20.xml). </SPAN></FONT>
+        <LI class=MsoNormal style="COLOR: black"><FONT 
+        face="Arial, Helvetica, sans-serif" size=2><SPAN lang=EN>Fixed bug <A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8247">PAL8247</A> 
+        (Improvement of installation procedure to ensure RH9 compatibility). 
+        </SPAN></FONT>
+        <LI class=MsoNormal style="COLOR: black"><FONT 
+        face="Arial, Helvetica, sans-serif" size=2><SPAN lang=EN>Fixed bug <A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8256">PAL8256</A> 
+        (Problem with installation procedure with *.la files for <SPAN 
+        class=SpellE><SPAN class=spelle>hdf</SPAN> </SPAN>and med). 
+        </SPAN></FONT>
+        <LI class=MsoNormal style="COLOR: black"><FONT 
+        face="Arial, Helvetica, sans-serif" size=2><SPAN lang=EN>Fixed bug <A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8263">PAL8263</A> 
+        (Validity of the files exported by SMESH in MED2.2 format). 
+        </SPAN></FONT>
+        <LI class=MsoNormal style="COLOR: black"><FONT 
+        face="Arial, Helvetica, sans-serif" size=2><SPAN lang=EN>Fixed bug <A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8297">PAL8297</A> 
+        (REGRESSION: Reading several time stamps on a field of a med2.1 file). 
+        </SPAN></FONT>
+        <LI><FONT face="Arial, Helvetica, sans-serif" size=2><SPAN lang=EN>Fixed 
+        bug <A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8309">PAL8309</A> 
+        (Problem with creation point and zoom in GEOM).</SPAN></FONT> 
+        <LI><FONT face="Arial, Helvetica, sans-serif" size=2><SPAN lang=EN>Fixed 
+        bug <A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=8310">PAL8310</A> 
+        (Problem when delete a group on mesh and export to med)</SPAN></FONT> 
+        <LI><FONT face="Arial, Helvetica, sans-serif" size=2>The documenation is 
+        checked and updated</FONT> </LI></UL>
+      <P><SPAN lang=EN 
+      style="FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: Verdana"><FONT 
+      face="Arial, Helvetica, sans-serif" size=2>There is a <A href="SALOME2_2_1_Release_Notes.htm">separate announcement</A> 
+      available for this release</FONT></SPAN></P></TD></TR>
+  <TR>
+    <TD bgColor=#ffffff height=2>
+      <DIV class=MsoNormal style="TEXT-ALIGN: center" align=center><SPAN lang=EN 
+      style="FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: Verdana"></SPAN></DIV><SPAN 
+      lang=EN 
+style="FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: Verdana"></SPAN>
+      <HR align=center width="100%" color=black noShade SIZE=1>
+      <A name=2.2.0></A>This document is maintained as a difference with SALOME 
+      2.2.0 (Major release of 21-Feb-2005) </TD></TR>
+  <TR>
+    <TD bgColor=#999999 height=30>Copyright (c) 2001-2005 All rights 
+    reserved.</TD></TR></TBODY></TABLE></DIV>
+<DIV id=content></DIV></BODY></HTML>
diff --git a/SALOME2_2_4_Release_Notes.htm b/SALOME2_2_4_Release_Notes.htm
new file mode 100755 (executable)
index 0000000..16670c3
--- /dev/null
@@ -0,0 +1,203 @@
+<HTML><HEAD><TITLE>SALOME 2.2.4 Release Announcement (21 June 2005)</TITLE>
+<STYLE>@font-face { font-family: Verdana; }
+       @page Section1 {size: 595.3pt 841.9pt; mso-header-: 0; }
+       P.MsoNormal { FONT-SIZE: 12pt; FONT-FAMILY: "Times New Roman"; mso-style-parent: ""; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman" }
+       LI.MsoNormal { FONT-SIZE: 12pt; FONT-FAMILY: "Times New Roman"; mso-style-parent: ""; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman" }
+       DIV.MsoNormal { FONT-SIZE: 12pt; FONT-FAMILY: "Times New Roman"; mso-style-parent: ""; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman" }
+       H2 { FONT-WEIGHT: bold; FONT-SIZE: 18pt; FONT-FAMILY: "Times New Roman"; mso-: widow-orphan; mso-outline-level: 2 }
+       A:link { COLOR: blue; TEXT-DECORATION: underline; text-underline: single }
+       SPAN.MsoHyperlink { COLOR: blue; TEXT-DECORATION: underline; text-underline: single }
+       A:visited { COLOR: blue; TEXT-DECORATION: underline; text-underline: single }
+       SPAN.MsoHyperlinkFollowed { COLOR: blue; TEXT-DECORATION: underline; text-underline: single }
+       P { FONT-SIZE: 12pt; FONT-FAMILY: "Times New Roman"; mso-fareast-font-family: "Times New Roman"; mso-: widow-orphan }
+       PRE { FONT-SIZE: 10pt; COLOR: black; FONT-FAMILY: "Courier New"; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"; mso-style-link: "HTML Preformatted Char"; tab-stops: 45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt }
+       SPAN.HTMLPreformattedChar { COLOR: black; FONT-FAMILY: "Courier New"; mso-ansi-language: RU; mso-style-link: "HTML Preformatted"; mso-style-name: "HTML Preformatted Char"; mso-style-locked: yes; mso-ascii-font-family: "Courier New"; mso-hansi-font-family: "Courier New"; mso-bidi-font-family: "Courier New"; mso-fareast-language: RU; mso-bidi-language: AR-SA }
+       P.Item { FONT-SIZE: 10pt; TEXT-INDENT: -18pt; FONT-FAMILY: Arial; TEXT-ALIGN: justify; mso-ansi-language: EN-US; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"; tab-stops: list 36.0pt; mso-style-name: Item; mso-bidi-font-family: "Times New Roman"; mso-list: l0 level1 lfo2 }
+       LI.Item { FONT-SIZE: 10pt; TEXT-INDENT: -18pt; FONT-FAMILY: Arial; TEXT-ALIGN: justify; mso-ansi-language: EN-US; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"; tab-stops: list 36.0pt; mso-style-name: Item; mso-bidi-font-family: "Times New Roman"; mso-list: l0 level1 lfo2 }
+       DIV.Item { FONT-SIZE: 10pt; TEXT-INDENT: -18pt; FONT-FAMILY: Arial; TEXT-ALIGN: justify; mso-ansi-language: EN-US; mso-pagination: widow-orphan; mso-fareast-font-family: "Times New Roman"; tab-stops: list 36.0pt; mso-style-name: Item; mso-bidi-font-family: "Times New Roman"; mso-list: l0 level1 lfo2 }
+       SPAN.grame { mso-style-name: grame }
+       SPAN.SpellE { mso-style-name: ""; mso-spl-e: yes }
+       DIV.Section1 { page: Section1 }
+       OL { }
+       </STYLE>
+
+<META content="SALOME 2.2.4 Release Announcement (21 June 2005)" name=title>
+<META http-equiv=content-type content="text/html; charset=us-ascii">
+<META content="Trellian WebPage" name=generator></HEAD>
+<BODY>
+<DIV id=content>
+<TABLE class=MsoNormalTable 
+style="WIDTH: 100%; mso-cellspacing: 1.5pt; mso-padding-alt: 0cm 5.4pt 0cm 5.4pt" 
+cellSpacing=3 cellPadding=0 width="100%" border=0>
+  <TBODY>
+  <TR style="HEIGHT: 18pt; mso-yfti-irow: 0; mso-yfti-firstrow: yes">
+    <TD bgColor=#cccccc height=24>
+      <P class=MsoNormal><B><SPAN lang=EN 
+      style="FONT-SIZE: 24pt; COLOR: #000066; mso-ansi-language: EN">SALOME 
+      2.2.4 Release Announcement (</SPAN></B><SPAN lang=EN 
+      style="FONT-SIZE: 24pt; COLOR: #000066; mso-ansi-language: EN">21 June 
+      2005</SPAN><B><SPAN lang=EN 
+      style="FONT-SIZE: 24pt; COLOR: #000066; mso-ansi-language: EN">)</SPAN></B></P></TD></TR>
+  <TR style="HEIGHT: 18pt; mso-yfti-irow: 1">
+    <TD height=24>
+      <H2>Common information</H2>
+      <P>The version <B>2.2.4 </B>is a minor SALOME maintenance release that 
+      contains bug fixes and minor improvements.</P>
+      <P>The SALOME 2.2.4 version is targeting the Redhat 8.0 platform as a 
+      reference. Please see the README file (on the installation CD) for SALOME 
+      installation and execution.</P>
+      <P>For the full list of modifications since SALOME 2.2.0, see the change 
+      log file.</P>
+      <H2>Improvements</H2>
+      <P>SALOME &nbsp;2.2.4 has the following &nbsp;major improvements and 
+      enhancements:</P>
+      <UL>
+        <LI><STRONG>Mandrake 10.1 compatibility</STRONG> - Now you can compile 
+        and run SALOME on Mandrake 10.1 version. The following list of 
+        pre-requisites is used for Mandrake 10.1 (no changes for Redhat): 
+        <UL>
+          <LI><EM>gcc 3.4.1 - native for Mandrake 10.1</EM> 
+          <LI><EM>tcl/tk 8.4.5 - native for Mandrake 10.1</EM> 
+          <LI><EM>Python 2.3.4 - native for Mandrake 10.1</EM> 
+          <LI><EM>Qt 3.3.3 - native for Mandrake 10.1</EM> 
+          <LI><EM>Doxygen 1.3.7 - native for Mandrake 10.1</EM> 
+          <LI><EM>Boost 1.31.0 - installed from the CD</EM> 
+          <LI><EM>sip 4.1 - installed from the CD</EM> 
+          <LI><EM>PyQt 3.13 - installed from the CD (officially does not support 
+          Qt 3.3.3 but nevertheless it can be used) </EM>
+          <LI><EM>Swig 1.3.24 - installed from the CD</EM> 
+          <LI><EM>OpenCASCADE 5.2.3a - installed from the CD (please read the 
+          limitations below)</EM> 
+          <LI><EM>Qwt 4.2.0/0.2.4 - installed from the CD</EM> 
+          <LI><EM>OmniORB 4.0.5, OmniORBPy 2.5, OmniNotify 2.1 - installed from 
+          the CD</EM> 
+          <LI><EM>Hdf5 1.6.3 - installed from the CD</EM> 
+          <LI><EM>Med 2.2.2 - installed from the CD</EM> 
+          <LI><EM>Vtk 4.2.6 - installed from the CD</EM> 
+          <LI><EM>Numeric 23.7 - installed from the CD</EM> 
+          <LI><EM>HappyDoc 2.1 - installed from the CD</EM> 
+          <LI><EM>Graphviz 2.2.1 - installed from the CD</EM> 
+          <LI><EM>NETGEN 4.3 - installed from the CD with a 
+        patch</EM></LI></UL></LI></UL>
+      <UL>
+        <LI><STRONG>New funciotnality is added to the MED module</STRONG> 
+        <UL>
+          <LI>Searching of a cell that contains a point in a MESH (using dTree 
+          to speedup multi search of cell in a MESH). 
+          (MESH::getElementContainigPoint). First use of INTERPOLATION package 
+          in MEDMEM 
+          <LI>Possibility to build a FIELD by simply giving a SUPPORT and an 
+          analytic C++ function. (FIELD&lt;T&gt;::fillFromAnalytic) 
+          <LI>Building of SUPPORT on NODE or D-1 element, that is the boundary 
+          of a MESH. (MESH::getBoundaryElements) 
+          <LI>Building of the complement of a SUPPORT relative to the MESH the 
+          SUPPORT is lying on. (SUPPORT:getComplement) 
+          <LI>Substraction of two SUPPORTs. (SUPPORT::substract) 
+          <LI>Merge of FIELDs. (static MESH::mergeFields) 
+          <LI>Extraction of the FIELD lying on a SUPPORT S1 by giving an another 
+          FIELD lying on a wider SUPPORT S2. (FIELD&lt;T&gt;::extract) 
+          <LI>Test if one SUPPORT is included into another one 
+          (SUPPORT::belongsTo)</LI></UL></LI></UL>
+      <UL>
+        <LI><STRONG>New TUI examples were added to the VISU module for 2D tables 
+        manipulations</STRONG></LI></UL>
+      <H2>BUG fixes</H2>
+      <P>SALOME &nbsp;2.2.4 contains the following fixes: </P>
+      <BLOCKQUOTE dir=ltr style="MARGIN-RIGHT: 0px">
+        <UL>
+          <LI>
+          <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt">Fixed bug PAL7444 - 
+          display mesh takes a lot of more memory in 2.1.0 than in 2.0.0. </P>
+          <LI>
+          <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt">Fixed bug PAL8912 - 
+          "Stream Graph Parameters" disappeared from the pop-up when the graph 
+          has Calcium nodes </P>
+          <LI>
+          <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt">Fixed bug PAL8917 - 
+          Attributes ExternalFileDef and fileType are not saved with study. </P>
+          <LI>
+          <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt">Fixed bug PAL8922 - 
+          False component name generatef by Catalog Generator </P>
+          <LI>
+          <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt">Fixed bug PAL9090 - 
+          Localisation of the "jroy_2810_SALOME_pidict" file. </P>
+          <LI>
+          <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt">Fixed bug PAL9133 - 
+          initialization of string inPort with an empty string is not possible 
+          </P>
+          <LI>
+          <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt">Fixed bug PAL9151 - 
+          REGRESSION: partition ends badly or doesn't end </P>
+          <LI>
+          <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt">Fixed bug PAL9163 - 
+          Triangles and Prisms are not well generated when making a revolution 
+          and an extrusion (bug PAL8869) </P>
+          <LI>
+          <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt">Fixed bug PAL9165 - 
+          Warning in the log message </P>
+          <LI>
+          <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt">Fixed bug PAL9167 - 
+          Parametric point construction doesn't add the edge selected in the 
+          study </P>
+          <LI>
+          <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt">Fixed bug PAL8221 - 
+          POST-PRO: Pal/Salome crashes if edit presentation in opened study </P>
+          <LI>
+          <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt">Fixed bug PAL8727 - 
+          Saving a study with a SUPERV item makes the IHM to freeze </P>
+          <LI>
+          <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt">Fixed bug PAL8787 - 
+          Can't mesh a sphere with NETGEN</P>
+          <LI>
+          <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt">Fixed bug PAL8346 - 
+          radio button that unselect the installation of the salome modules 
+          sources</P>
+          <LI>
+          <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt">Fixed bug PAL8914 - 
+          Delete of a Node linked to an EndLoopNode ==&gt; Not executable</P>
+          <LI>
+          <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt">Fixed bug PAL9042 - 
+          HangUp in FactoryServer</P>
+          <LI>
+          <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt">Fixed bug PAL9164 - 
+          Values limitation</P>
+          <LI>
+          <P class=MsoNormal style="MARGIN: 0cm 0cm 0pt">Fixed bug PAL9166 - 
+          Geometry is not complete</P></LI></UL></BLOCKQUOTE>
+      <H2>Known limitations</H2>
+      <P>SALOME 2.2.4 has the following known limitations: </P>
+      <UL type=disc>
+        <LI class=MsoNormal style="mso-mso-mso-list: l2 level1 lfo8">Open 
+        Cascade Technology 5.2.3a that is delivered on the CD for Mandrake 10.1 
+        is in binary form only. This version is a special patch prepared in 
+        order to port SALOME to Mandrake 10.1 and gcc 3.4. This is not yet a 
+        certified Open Cascade Technbology version and may have eventual 
+        regressions in various functionalities. Thus there may be slight 
+        difference in behaviour among Redhat 8.0 and Mandrake 10.1 installations 
+        of SALOME. Please contact maintenance in case if you have any problems 
+        with it
+        <LI class=MsoNormal style="mso-mso-mso-list: l2 level1 lfo8">Sometime 
+        SALOME does not start from first time (bug PAL8142). The fix will be in 
+        next maintenance release. 
+        <LI class=MsoNormal 
+        style="mso-mso-mso-list: l2 level1 lfo8">Installation from source codes 
+        is not assured on RedHat 9.0 systems. Third party products compilation 
+        (like Python) was not overally tested and can fail due to differnces in 
+        some RPM packages between Redhat 8.0 and 9.0 versions. 
+        <LI class=MsoNormal style="mso-mso-mso-list: l2 level1 lfo8">The 
+        Sauv2Med converter has regressions due to recent changes in the MED 
+        module. See <A 
+        href="http://ocsprojects.opencascade.com/bugtracker/show_bug.cgi?id=7558">PAL7558 
+        </A>for details. These regressions will be addressed in the future 
+        maintenance releases.</LI></UL>
+      <H2>Maintenance contact</H2>
+      <P>In order to report a bug or propose an improvement, please use your 
+      account in the bug tracker (<A 
+      href="http://ocsprojects.opencascade.com/bugtracker">http://ocsprojects.opencascade.com/bugtracker</A>). 
+      Please report bugs and improvements mentioning exactly your SALOME 
+      release. <BR>Please address all other questions (including bug tracker 
+      account requests) to <A href="mailto:salome-maintenance@opencascade.com">salome-maintenance@opencascade.com</A>.</P></TD></TR>
+  <TR style="HEIGHT: 18pt; mso-yfti-irow: 2; mso-yfti-lastrow: yes">
+    <TD bgColor=#cccccc height=24>
+      <P class=MsoNormal>Copyright (?) 2001-2005 All rights 
+  reserved.</P></TD></TR></TBODY></TABLE></DIV></BODY></HTML>
index c1fa8b396f809dab3744889bac40f13065337df5..9a8fcccc893350e8e4aafe25423c9f9ea3ce8478 100755 (executable)
Binary files a/bin/SALOME_InstallWizard and b/bin/SALOME_InstallWizard differ
index df480bb2938e828d2f7be2e4b23d21a741c59f03..1a6c3f39dd7bf7844a446ea1863af9846358346d 100644 (file)
@@ -1,5 +1,5 @@
 <document>
-  <config version="2.2.3"
+  <config version="2.2.4"
          caption="SALOME v%1"
           copyright="&lt;h5>Copyright (C) 2003-2005 OPEN CASCADE,&lt;br>EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D,&lt;br>LEG, PRINCIPIA R&amp;D, BUREAU VERITAS&lt;/h5>"
           license="&lt;h5>GNU LGPL&lt;/h5>"
           dependancies="gcc"
           installdiskspace="2936"
           temporarydiskspace="8252"
-          script="netgen4.3.sh"/>
+          script="netgen-4.3.sh"/>
   <product name="OmniORB"
            version="3.0.5" 
            description="Open source Object Request Broker (ORB) library that implements the 2.3 specification of the Common Object Request Broker Architecture (CORBA)"
           temporarydiskspace="61528"
           script="graphviz-1.9.sh"/>
   <product name="KERNEL-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform KERNEL module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,boost,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Qwt,Hdf,Med,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,HappyDoc"
-          installdiskspace="28814"
+          installdiskspace="29072"
           temporarydiskspace="0"
            pickupenv="true"
           script="KERNEL_SRC.sh"/>
   <product name="KERNEL-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform KERNEL module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,boost,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Qwt,Hdf,Med,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,HappyDoc"
-          installdiskspace="58465"
+          installdiskspace="59179"
           temporarydiskspace="0"
            pickupenv="true"
           script="KERNEL_BIN.sh"/>
   <product name="GEOM-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform GEOM modules sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
-          installdiskspace="10619"
+          installdiskspace="10725"
           temporarydiskspace="0"
           script="GEOM_SRC.sh"/>
   <product name="GEOM-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform GEOM module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
-          installdiskspace="31703"
+          installdiskspace="31861"
           temporarydiskspace="0"
           script="GEOM_BIN.sh"/>
   <product name="MED-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform MED module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
-          installdiskspace="17744"
+          installdiskspace="17889"
           temporarydiskspace="0"
           script="MED_SRC.sh"/>
   <product name="MED-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform MED module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
-          installdiskspace="38484"
+          installdiskspace="41590"
           temporarydiskspace="0"
           script="MED_BIN.sh"/>
   <product name="SMESH-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform SMESH module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,boost,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src,GEOM-Src,MED-Src"
-          installdiskspace="10907"
+          installdiskspace="11912"
           temporarydiskspace="0"
           script="SMESH_SRC.sh"/>
   <product name="SMESH-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform SMEHS module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,boost,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin,GEOM-Bin,MED-Bin"
-          installdiskspace="36662"
+          installdiskspace="38622"
           temporarydiskspace="0"
           script="SMESH_BIN.sh"/>
   <product name="VISU-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform VISU module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Qwt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src,MED-Src"
-          installdiskspace="6558"
+          installdiskspace="7049"
           temporarydiskspace="0"
           script="VISU_SRC.sh"/>
   <product name="VISU-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform VISU module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Qwt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin,MED-Bin"
-          installdiskspace="20372"
+          installdiskspace="21392"
           temporarydiskspace="0"
           script="VISU_BIN.sh"/>
   <product name="SUPERV-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform SUPERV module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
-          installdiskspace="7476"
+          installdiskspace="7977"
           temporarydiskspace="0"
           script="SUPERV_SRC.sh"/>
   <product name="SUPERV-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform SUPERV module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
-          installdiskspace="53744"
+          installdiskspace="54207"
           temporarydiskspace="0"
           script="SUPERV_BIN.sh"/>
   <product name="COMPONENT-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform COMPONENT module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
-          installdiskspace="323"
+          installdiskspace="320"
           temporarydiskspace="0"
           script="COMPONENT_SRC.sh"/>
   <product name="COMPONENT-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform COMPONENT module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
-          installdiskspace="14000"
+          installdiskspace="14419"
           temporarydiskspace="0"
           script="COMPONENT_BIN.sh"/>
   <product name="PYCALCULATOR-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform PYCALCULATOR module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
-          installdiskspace="147"
+          installdiskspace="149"
           temporarydiskspace="0"
           script="PYCALCULATOR_SRC.sh"/>
   <product name="PYCALCULATOR-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform PYCALCULATOR module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
-          installdiskspace="27"
+          installdiskspace="30"
           temporarydiskspace="0"
           script="PYCALCULATOR_BIN.sh"/>
   <product name="NETGENplugin-Src" 
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform NETGEN meshing algorithm plugin sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,netgen,KERNEL-Src,SMESH-Src"
-          installdiskspace="91"
+          installdiskspace="73"
           temporarydiskspace="0"
           script="NETGENPLUGIN_SRC.sh"/>
   <product name="NETGENplugin-Bin" 
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform NETGEN meshing algorithm plugin"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,netgen,KERNEL-Bin,SMESH-Bin"
-          installdiskspace="2467"
+          installdiskspace="2460"
           temporarydiskspace="0"
           script="NETGENPLUGIN_BIN.sh"/>
   <product name="GHS3Dplugin-Src" 
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform GHS3D meshing algorithm plugin sources. For use this plugin you should add the path to ghs3d to your PATH environment variable."
            install="install sources"
           temporarydiskspace="0"
           script="GHS3DPLUGIN_SRC.sh"/>
   <product name="GHS3Dplugin-Bin" 
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform GHS3D meshing algorithm plugin. For use this plugin you should add the path to ghs3d to your PATH environment variable."
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,KERNEL-Bin,SMESH-Bin"
-          installdiskspace="142"
+          installdiskspace="156"
           temporarydiskspace="0"
           script="GHS3DPLUGIN_BIN.sh"/>
   <product name="Hello-Src" 
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="Example SALOME C++ module (sources): Hello."
            install="install sources"
           temporarydiskspace="0"
           script="HELLO_SRC.sh"/>
   <product name="Hello-Bin" 
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Example SALOME C++ module (binaries): Hello."
            install="install binaries"
           temporarydiskspace="0"
           script="HELLO_BIN.sh"/>
   <product name="PyHello-Src" 
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="Example SALOME Python module (sources): Hello."
            install="install sources"
           temporarydiskspace="0"
           script="PYHELLO_SRC.sh"/>
   <product name="PyHello-Bin" 
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Example SALOME Python module (binaries): Hello."
            install="install binaries"
diff --git a/config_Mandrake10_1.xml b/config_Mandrake10_1.xml
new file mode 100755 (executable)
index 0000000..c789a27
--- /dev/null
@@ -0,0 +1,475 @@
+<document>
+  <config version="2.2.4"
+         caption="SALOME v%1"
+          copyright="&lt;h5>Copyright (C) 2003-2005 OPEN CASCADE,&lt;br>EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D,&lt;br>LEG, PRINCIPIA R&amp;D, BUREAU VERITAS&lt;/h5>"
+          license="&lt;h5>GNU LGPL&lt;/h5>"
+         os="Mandrake10.1"/>
+  <path targetdir="/tmp/salome"
+        tempdir="/tmp"/>
+  <product name="gcc" 
+           version="3.4.1" 
+           description="GNU Compiler Collection"
+           install="use native"
+          supported="use native"
+          disable="false"
+          dependancies=""
+          installdiskspace="0"
+          temporarydiskspace="0"
+          script="gcc-3.4.sh"/>
+  <product name="tcltk" 
+           version="8.4.5" 
+           description="Tcl/Tk library"
+           install="use native"
+          supported="use native"
+          disable="false"
+          dependancies="gcc"
+          installdiskspace="0"
+          temporarydiskspace="0"
+          script="tcltk8.4.5.sh"/>
+  <product name="Python" 
+           version="2.3.4" 
+           description="Python language interpreter"
+           install="use native"
+          supported="use native"
+          disable="false"
+          dependancies="gcc"
+          installdiskspace="0"
+          temporarydiskspace="0"
+          script="Python-2.3.4.sh"/>
+  <product name="Qt" 
+           version="3.3.3" 
+           description="Multiplatform C++ GUI application framework"
+           install="use native"
+          supported="use native,install binaries"
+          disable="false"
+          dependancies="gcc"
+          installdiskspace="46681"
+          temporarydiskspace="0"
+          script="qt-3.3.3.sh"/>
+  <product name="Sip"
+           version="4.1" 
+           description="C++ to Python bindings generation tool"
+           install="install binaries"
+          supported="install sources,install binaries"
+          disable="false"
+          dependancies="gcc,Python,Qt"
+          installdiskspace="352"
+          temporarydiskspace="2168"
+          script="sip-4.1.sh"/>
+  <product name="PyQt"
+           version="3.13" 
+           description="Python bindings for Qt library"
+           install="install binaries"
+          supported="install sources,install binaries"
+          disable="false"
+          dependancies="gcc,Python,Qt,Sip"
+          installdiskspace="15669"
+          temporarydiskspace="60356"
+          script="PyQt-3.13.sh"/>
+  <product name="boost"
+           version="1.31.0" 
+           description="Free peer-reviewed portable STL extension"
+           install="install sources"
+          supported="install sources"
+          disable="false"
+          dependancies="gcc"
+          installdiskspace="41770"
+          temporarydiskspace="0"
+          script="BOOST-1.31.0.sh"/>
+  <product name="Swig" 
+           version="1.3.24" 
+           description="Simplified Wrapper and Interface Generator"
+           install="install sources"
+          supported="install sources"
+          disable="false"
+          dependancies="gcc,Python,tcltk"
+          installdiskspace="3026"
+          temporarydiskspace="25500"
+          script="SWIG-1.3.24.sh"/>
+  <product name="OpenCascade" 
+           version="5.2.3" 
+           description="Open CASCADE version 5.2.3 patched for Mandrake 10.1"
+           install="install binaries"
+          supported="install binaries"
+          disable="false"
+          dependancies=""
+          installdiskspace="216457"
+          temporarydiskspace="0"
+          script="CAS-5.2.3.sh"/>
+  <product name="OpenCascade-patch" 
+           version="0.0" 
+           description="Patch for Open CASCADE version 5.2"
+           install="install sources"
+          supported="install sources"
+          disable="true"
+          dependancies=""
+          installdiskspace="69"
+          temporarydiskspace="0"
+          script="CAS-5.2-patch.sh"/>
+  <product name="Qwt" 
+           version="4.2.0" 
+           description="2-D plotting extension for Qt library"
+           install="install binaries"
+          supported="install sources,install binaries"
+          disable="false"
+          dependancies="gcc,Qt"
+          installdiskspace="995"
+          temporarydiskspace="11948"
+          script="qwt-4.2.0.sh"/>
+  <product name="OmniORB"
+           version="4.0.5" 
+           description="Open source Object Request Broker (ORB) library that implements the 2.3 specification of the Common Object Request Broker Architecture (CORBA)"
+           install="install binaries"
+          supported="install sources,install binaries"
+          disable="false"
+          dependancies="gcc,Python"
+          installdiskspace="31899"
+          temporarydiskspace="71032"
+          script="omniORB-4.0.5.sh"/>
+  <product name="Hdf" 
+           version="5-1.6.3" 
+           description="Hierarchical Data Format library"
+           install="install binaries"
+          supported="install sources,install binaries"
+          disable="false"
+          dependancies="gcc"
+          installdiskspace="4229"
+          temporarydiskspace="47460"
+          script="hdf5-1.6.3.sh"/>
+  <product name="Med"
+           version="2.2.2" 
+           description="MED format interface library"
+           install="install binaries"
+          supported="install sources,install binaries"
+          disable="false"
+          dependancies="gcc,Hdf"
+          installdiskspace="7470"
+          temporarydiskspace="19052"
+          script="med-2.2.2.sh"/>
+  <product name="Vtk"
+           version="4.2.6" 
+           description="Image processing, 3D graphics and visualization software system"
+           install="install binaries"
+          supported="install sources,install binaries"
+          disable="false"
+          dependancies="gcc,tcltk,Python"
+          installdiskspace="37001"
+          temporarydiskspace="172034"
+          script="VTK-4.2.6.sh"/>
+  <product name="Numeric"
+           version="23.7" 
+           description="Numerical extension to Python"
+           install="install binaries"
+          supported="install sources,install binaries"
+          disable="false"
+          dependancies="gcc,Python"
+          installdiskspace="1177"
+          temporarydiskspace="5304"
+          script="Numeric-23.7.sh"/>
+  <product name="HappyDoc"
+           version="2.1" 
+           description="Python source code documentation extracting tool"
+           install="install binaries"
+          supported="install sources,install binaries"
+          disable="false"
+          dependancies="Python"
+          installdiskspace="1517"
+          temporarydiskspace="5020"
+          script="HappyDoc-r2_1.sh"/>
+  <product name="Doxygen"
+           version="1.3.7" 
+           description="Documentation system for C++, C, Java, IDL, etc."
+           install="use native"
+          supported="use native,install binaries"
+          disable="false"
+          dependancies="gcc,Qt"
+          installdiskspace="0"
+          temporarydiskspace="0"
+          script="doxygen-1.3.7.sh"/>
+  <product name="Graphviz"
+           version="2.2.1" 
+           description="Graph Drawing Programs set"
+           install="install binaries"
+          supported="install sources,install binaries"
+          disable="false"
+          dependancies="gcc,tcltk"
+          installdiskspace="8551"
+          temporarydiskspace="44340"
+          script="graphviz-2.2.1.sh"/>
+  <product name="netgen" 
+           version="4.3" 
+           description="Quadrangle meshing algorithmic tool"
+           install="install binaries"
+          supported="install sources,install binaries"
+          disable="false"
+          dependancies="gcc"
+          installdiskspace="2966"
+          temporarydiskspace="8216"
+          script="netgen-4.3.sh"/>
+  <product name="KERNEL-Src"
+           version="2.2.4" 
+           context="salome sources" 
+           description="SALOME platform KERNEL module sources"
+           install="install sources"
+          supported="install sources"
+          disable="false"
+          dependancies="gcc,boost,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Qwt,Hdf,Med,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,HappyDoc"
+          installdiskspace="29072"
+          temporarydiskspace="0"
+           pickupenv="true"
+          script="KERNEL_SRC.sh"/>
+  <product name="KERNEL-Bin"
+           version="2.2.4" 
+           context="salome binaries" 
+           description="Precompiled SALOME platform KERNEL module"
+           install="install binaries"
+          supported="install binaries"
+          disable="false"
+          dependancies="gcc,boost,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Qwt,Hdf,Med,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,HappyDoc"
+          installdiskspace="58157"
+          temporarydiskspace="0"
+           pickupenv="true"
+          script="KERNEL_BIN.sh"/>
+  <product name="GEOM-Src"
+           version="2.2.4" 
+           context="salome sources" 
+           description="SALOME platform GEOM modules sources"
+           install="install sources"
+          supported="install sources"
+          disable="false"
+          dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
+          installdiskspace="10725"
+          temporarydiskspace="0"
+          script="GEOM_SRC.sh"/>
+  <product name="GEOM-Bin"
+           version="2.2.4" 
+           context="salome binaries" 
+           description="Precompiled SALOME platform GEOM module"
+           install="install binaries"
+          supported="install binaries"
+          disable="false"
+          dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
+          installdiskspace="37416"
+          temporarydiskspace="0"
+          script="GEOM_BIN.sh"/>
+  <product name="MED-Src"
+           version="2.2.4" 
+           context="salome sources" 
+           description="SALOME platform MED module sources"
+           install="install sources"
+          supported="install sources"
+          disable="false"
+          dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
+          installdiskspace="17889"
+          temporarydiskspace="0"
+          script="MED_SRC.sh"/>
+  <product name="MED-Bin"
+           version="2.2.4" 
+           context="salome binaries" 
+           description="Precompiled SALOME platform MED module"
+           install="install binaries"
+          supported="install binaries"
+          disable="false"
+          dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
+          installdiskspace="46726"
+          temporarydiskspace="0"
+          script="MED_BIN.sh"/>
+  <product name="SMESH-Src"
+           version="2.2.4" 
+           context="salome sources" 
+           description="SALOME platform SMESH module sources"
+           install="install sources"
+          supported="install sources"
+          disable="false"
+          dependancies="gcc,boost,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src,GEOM-Src,MED-Src"
+          installdiskspace="11912"
+          temporarydiskspace="0"
+          script="SMESH_SRC.sh"/>
+  <product name="SMESH-Bin"
+           version="2.2.4" 
+           context="salome binaries" 
+           description="Precompiled SALOME platform SMEHS module"
+           install="install binaries"
+          supported="install binaries"
+          disable="false"
+          dependancies="gcc,boost,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin,GEOM-Bin,MED-Bin"
+          installdiskspace="44297"
+          temporarydiskspace="0"
+          script="SMESH_BIN.sh"/>
+  <product name="VISU-Src"
+           version="2.2.4" 
+           context="salome sources" 
+           description="SALOME platform VISU module sources"
+           install="install sources"
+          supported="install sources"
+          disable="false"
+          dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Qwt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src,MED-Src"
+          installdiskspace="7049"
+          temporarydiskspace="0"
+          script="VISU_SRC.sh"/>
+  <product name="VISU-Bin"
+           version="2.2.4" 
+           context="salome binaries" 
+           description="Precompiled SALOME platform VISU module"
+           install="install binaries"
+          supported="install binaries"
+          disable="false"
+          dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Qwt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin,MED-Bin"
+          installdiskspace="23134"
+          temporarydiskspace="0"
+          script="VISU_BIN.sh"/>
+  <product name="SUPERV-Src"
+           version="2.2.4" 
+           context="salome sources" 
+           description="SALOME platform SUPERV module sources"
+           install="install sources"
+          supported="install sources"
+          disable="false"
+          dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
+          installdiskspace="7977"
+          temporarydiskspace="0"
+          script="SUPERV_SRC.sh"/>
+  <product name="SUPERV-Bin"
+           version="2.2.4" 
+           context="salome binaries" 
+           description="Precompiled SALOME platform SUPERV module"
+           install="install binaries"
+          supported="install binaries"
+          disable="false"
+          dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
+          installdiskspace="41583"
+          temporarydiskspace="0"
+          script="SUPERV_BIN.sh"/>
+  <product name="COMPONENT-Src"
+           version="2.2.4" 
+           context="salome sources" 
+           description="SALOME platform COMPONENT module sources"
+           install="install sources"
+          supported="install sources"
+          disable="false"
+          dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
+          installdiskspace="320"
+          temporarydiskspace="0"
+          script="COMPONENT_SRC.sh"/>
+  <product name="COMPONENT-Bin"
+           version="2.2.4" 
+           context="salome binaries" 
+           description="Precompiled SALOME platform COMPONENT module"
+           install="install binaries"
+          supported="install binaries"
+          disable="false"
+          dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
+          installdiskspace="10888"
+          temporarydiskspace="0"
+          script="COMPONENT_BIN.sh"/>
+  <product name="PYCALCULATOR-Src"
+           version="2.2.4" 
+           context="salome sources" 
+           description="SALOME platform PYCALCULATOR module sources"
+           install="install sources"
+          supported="install sources"
+          disable="false"
+          dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
+          installdiskspace="149"
+          temporarydiskspace="0"
+          script="PYCALCULATOR_SRC.sh"/>
+  <product name="PYCALCULATOR-Bin"
+           version="2.2.4" 
+           context="salome binaries" 
+           description="Precompiled SALOME platform PYCALCULATOR module"
+           install="install binaries"
+          supported="install binaries"
+          disable="false"
+          dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
+          installdiskspace="29"
+          temporarydiskspace="0"
+          script="PYCALCULATOR_BIN.sh"/>
+  <product name="NETGENplugin-Src" 
+           version="2.2.4" 
+           context="salome sources" 
+           description="SALOME platform NETGEN meshing algorithm plugin sources"
+           install="install sources"
+          supported="install sources"
+          disable="false"
+          dependancies="gcc,netgen,KERNEL-Src,SMESH-Src"
+          installdiskspace="73"
+          temporarydiskspace="0"
+          script="NETGENPLUGIN_SRC.sh"/>
+  <product name="NETGENplugin-Bin" 
+           version="2.2.4" 
+           context="salome binaries" 
+           description="Precompiled SALOME platform NETGEN meshing algorithm plugin"
+           install="install binaries"
+          supported="install binaries"
+          disable="false"
+          dependancies="gcc,netgen,KERNEL-Bin,SMESH-Bin"
+          installdiskspace="2611"
+          temporarydiskspace="0"
+          script="NETGENPLUGIN_BIN.sh"/>
+  <product name="GHS3Dplugin-Src" 
+           version="2.2.4" 
+           context="salome sources" 
+           description="SALOME platform GHS3D meshing algorithm plugin sources. For use this plugin you should add the path to ghs3d to your PATH environment variable."
+           install="install sources"
+          supported="install sources"
+          disable="false"
+          dependancies="gcc,KERNEL-Src,SMESH-Src"
+          installdiskspace="55"
+          temporarydiskspace="0"
+          script="GHS3DPLUGIN_SRC.sh"/>
+  <product name="GHS3Dplugin-Bin" 
+           version="2.2.4" 
+           context="salome binaries" 
+           description="Precompiled SALOME platform GHS3D meshing algorithm plugin. For use this plugin you should add the path to ghs3d to your PATH environment variable."
+           install="install binaries"
+          supported="install binaries"
+          disable="false"
+          dependancies="gcc,KERNEL-Bin,SMESH-Bin"
+          installdiskspace="174"
+          temporarydiskspace="0"
+          script="GHS3DPLUGIN_BIN.sh"/>
+  <product name="Hello-Src" 
+           version="2.2.4" 
+           context="salome sources" 
+           description="Example SALOME C++ module (sources): Hello."
+           install="install sources"
+          supported="install sources"
+          disable="false"
+          dependancies="gcc,KERNEL-Src"
+          installdiskspace="118"
+          temporarydiskspace="0"
+          script="HELLO_SRC.sh"/>
+  <product name="Hello-Bin" 
+           version="2.2.4" 
+           context="salome binaries" 
+           description="Example SALOME C++ module (binaries): Hello."
+           install="install binaries"
+          supported="install binaries"
+          disable="false"
+          dependancies="gcc,KERNEL-Src"
+          installdiskspace="2291"
+          temporarydiskspace="0"
+          script="HELLO_BIN.sh"/>
+  <product name="PyHello-Src" 
+           version="2.2.4" 
+           context="salome sources" 
+           description="Example SALOME Python module (sources): Hello."
+           install="install sources"
+          supported="install sources"
+          disable="false"
+          dependancies="gcc,KERNEL-Src"
+          installdiskspace="182"
+          temporarydiskspace="0"
+          script="PYHELLO_SRC.sh"/>
+  <product name="PyHello-Bin" 
+           version="2.2.4" 
+           context="salome binaries" 
+           description="Example SALOME Python module (binaries): Hello."
+           install="install binaries"
+          supported="install binaries"
+          disable="false"
+          dependancies="gcc,KERNEL-Src"
+          installdiskspace="31"
+          temporarydiskspace="0"
+          script="PYHELLO_BIN.sh"/>
+</document>
index df480bb2938e828d2f7be2e4b23d21a741c59f03..1a6c3f39dd7bf7844a446ea1863af9846358346d 100644 (file)
@@ -1,5 +1,5 @@
 <document>
-  <config version="2.2.3"
+  <config version="2.2.4"
          caption="SALOME v%1"
           copyright="&lt;h5>Copyright (C) 2003-2005 OPEN CASCADE,&lt;br>EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D,&lt;br>LEG, PRINCIPIA R&amp;D, BUREAU VERITAS&lt;/h5>"
           license="&lt;h5>GNU LGPL&lt;/h5>"
           dependancies="gcc"
           installdiskspace="2936"
           temporarydiskspace="8252"
-          script="netgen4.3.sh"/>
+          script="netgen-4.3.sh"/>
   <product name="OmniORB"
            version="3.0.5" 
            description="Open source Object Request Broker (ORB) library that implements the 2.3 specification of the Common Object Request Broker Architecture (CORBA)"
           temporarydiskspace="61528"
           script="graphviz-1.9.sh"/>
   <product name="KERNEL-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform KERNEL module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,boost,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Qwt,Hdf,Med,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,HappyDoc"
-          installdiskspace="28814"
+          installdiskspace="29072"
           temporarydiskspace="0"
            pickupenv="true"
           script="KERNEL_SRC.sh"/>
   <product name="KERNEL-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform KERNEL module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,boost,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Qwt,Hdf,Med,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,HappyDoc"
-          installdiskspace="58465"
+          installdiskspace="59179"
           temporarydiskspace="0"
            pickupenv="true"
           script="KERNEL_BIN.sh"/>
   <product name="GEOM-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform GEOM modules sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
-          installdiskspace="10619"
+          installdiskspace="10725"
           temporarydiskspace="0"
           script="GEOM_SRC.sh"/>
   <product name="GEOM-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform GEOM module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
-          installdiskspace="31703"
+          installdiskspace="31861"
           temporarydiskspace="0"
           script="GEOM_BIN.sh"/>
   <product name="MED-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform MED module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
-          installdiskspace="17744"
+          installdiskspace="17889"
           temporarydiskspace="0"
           script="MED_SRC.sh"/>
   <product name="MED-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform MED module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
-          installdiskspace="38484"
+          installdiskspace="41590"
           temporarydiskspace="0"
           script="MED_BIN.sh"/>
   <product name="SMESH-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform SMESH module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,boost,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src,GEOM-Src,MED-Src"
-          installdiskspace="10907"
+          installdiskspace="11912"
           temporarydiskspace="0"
           script="SMESH_SRC.sh"/>
   <product name="SMESH-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform SMEHS module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,boost,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin,GEOM-Bin,MED-Bin"
-          installdiskspace="36662"
+          installdiskspace="38622"
           temporarydiskspace="0"
           script="SMESH_BIN.sh"/>
   <product name="VISU-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform VISU module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Qwt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src,MED-Src"
-          installdiskspace="6558"
+          installdiskspace="7049"
           temporarydiskspace="0"
           script="VISU_SRC.sh"/>
   <product name="VISU-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform VISU module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Qwt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin,MED-Bin"
-          installdiskspace="20372"
+          installdiskspace="21392"
           temporarydiskspace="0"
           script="VISU_BIN.sh"/>
   <product name="SUPERV-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform SUPERV module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
-          installdiskspace="7476"
+          installdiskspace="7977"
           temporarydiskspace="0"
           script="SUPERV_SRC.sh"/>
   <product name="SUPERV-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform SUPERV module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
-          installdiskspace="53744"
+          installdiskspace="54207"
           temporarydiskspace="0"
           script="SUPERV_BIN.sh"/>
   <product name="COMPONENT-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform COMPONENT module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
-          installdiskspace="323"
+          installdiskspace="320"
           temporarydiskspace="0"
           script="COMPONENT_SRC.sh"/>
   <product name="COMPONENT-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform COMPONENT module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
-          installdiskspace="14000"
+          installdiskspace="14419"
           temporarydiskspace="0"
           script="COMPONENT_BIN.sh"/>
   <product name="PYCALCULATOR-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform PYCALCULATOR module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
-          installdiskspace="147"
+          installdiskspace="149"
           temporarydiskspace="0"
           script="PYCALCULATOR_SRC.sh"/>
   <product name="PYCALCULATOR-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform PYCALCULATOR module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
-          installdiskspace="27"
+          installdiskspace="30"
           temporarydiskspace="0"
           script="PYCALCULATOR_BIN.sh"/>
   <product name="NETGENplugin-Src" 
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform NETGEN meshing algorithm plugin sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,netgen,KERNEL-Src,SMESH-Src"
-          installdiskspace="91"
+          installdiskspace="73"
           temporarydiskspace="0"
           script="NETGENPLUGIN_SRC.sh"/>
   <product name="NETGENplugin-Bin" 
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform NETGEN meshing algorithm plugin"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,netgen,KERNEL-Bin,SMESH-Bin"
-          installdiskspace="2467"
+          installdiskspace="2460"
           temporarydiskspace="0"
           script="NETGENPLUGIN_BIN.sh"/>
   <product name="GHS3Dplugin-Src" 
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform GHS3D meshing algorithm plugin sources. For use this plugin you should add the path to ghs3d to your PATH environment variable."
            install="install sources"
           temporarydiskspace="0"
           script="GHS3DPLUGIN_SRC.sh"/>
   <product name="GHS3Dplugin-Bin" 
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform GHS3D meshing algorithm plugin. For use this plugin you should add the path to ghs3d to your PATH environment variable."
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,KERNEL-Bin,SMESH-Bin"
-          installdiskspace="142"
+          installdiskspace="156"
           temporarydiskspace="0"
           script="GHS3DPLUGIN_BIN.sh"/>
   <product name="Hello-Src" 
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="Example SALOME C++ module (sources): Hello."
            install="install sources"
           temporarydiskspace="0"
           script="HELLO_SRC.sh"/>
   <product name="Hello-Bin" 
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Example SALOME C++ module (binaries): Hello."
            install="install binaries"
           temporarydiskspace="0"
           script="HELLO_BIN.sh"/>
   <product name="PyHello-Src" 
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="Example SALOME Python module (sources): Hello."
            install="install sources"
           temporarydiskspace="0"
           script="PYHELLO_SRC.sh"/>
   <product name="PyHello-Bin" 
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Example SALOME Python module (binaries): Hello."
            install="install binaries"
index 665064b13f45ba52f92dd3e1bed371c93f821850..1e58652dbfae23505c5505c8b1b7b7aa8c766deb 100644 (file)
@@ -1,5 +1,5 @@
 <document>
-  <config version="2.2.3"
+  <config version="2.2.4"
          caption="SALOME v%1"
           copyright="&lt;h5>Copyright (C) 2003-2005 OPEN CASCADE,&lt;br>EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D,&lt;br>LEG, PRINCIPIA R&amp;D, BUREAU VERITAS&lt;/h5>"
           license="&lt;h5>GNU LGPL&lt;/h5>"
           dependancies="gcc"
           installdiskspace="2936"
           temporarydiskspace="8252"
-          script="netgen4.3.sh"/>
+          script="netgen-4.3.sh"/>
   <product name="OmniORB"
            version="3.0.5" 
            description="Open source Object Request Broker (ORB) library that implements the 2.3 specification of the Common Object Request Broker Architecture (CORBA)"
           temporarydiskspace="61528"
           script="graphviz-1.9.sh"/>
   <product name="KERNEL-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform KERNEL module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,boost,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Qwt,Hdf,Med,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,HappyDoc"
-          installdiskspace="28814"
+          installdiskspace="29072"
           temporarydiskspace="0"
            pickupenv="true"
           script="KERNEL_SRC.sh"/>
   <product name="KERNEL-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform KERNEL module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,boost,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Qwt,Hdf,Med,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,HappyDoc"
-          installdiskspace="58465"
+          installdiskspace="59179"
           temporarydiskspace="0"
            pickupenv="true"
           script="KERNEL_BIN.sh"/>
   <product name="GEOM-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform GEOM modules sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
-          installdiskspace="10619"
+          installdiskspace="10725"
           temporarydiskspace="0"
           script="GEOM_SRC.sh"/>
   <product name="GEOM-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform GEOM module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
-          installdiskspace="31703"
+          installdiskspace="31861"
           temporarydiskspace="0"
           script="GEOM_BIN.sh"/>
   <product name="MED-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform MED module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
-          installdiskspace="17744"
+          installdiskspace="17889"
           temporarydiskspace="0"
           script="MED_SRC.sh"/>
   <product name="MED-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform MED module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
-          installdiskspace="38484"
+          installdiskspace="41590"
           temporarydiskspace="0"
           script="MED_BIN.sh"/>
   <product name="SMESH-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform SMESH module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,boost,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src,GEOM-Src,MED-Src"
-          installdiskspace="10907"
+          installdiskspace="11912"
           temporarydiskspace="0"
           script="SMESH_SRC.sh"/>
   <product name="SMESH-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform SMEHS module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,boost,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin,GEOM-Bin,MED-Bin"
-          installdiskspace="36662"
+          installdiskspace="38622"
           temporarydiskspace="0"
           script="SMESH_BIN.sh"/>
   <product name="VISU-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform VISU module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Qwt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src,MED-Src"
-          installdiskspace="6558"
+          installdiskspace="7049"
           temporarydiskspace="0"
           script="VISU_SRC.sh"/>
   <product name="VISU-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform VISU module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Qwt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin,MED-Bin"
-          installdiskspace="20372"
+          installdiskspace="21392"
           temporarydiskspace="0"
           script="VISU_BIN.sh"/>
   <product name="SUPERV-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform SUPERV module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
-          installdiskspace="7476"
+          installdiskspace="7977"
           temporarydiskspace="0"
           script="SUPERV_SRC.sh"/>
   <product name="SUPERV-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform SUPERV module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
-          installdiskspace="53744"
+          installdiskspace="54207"
           temporarydiskspace="0"
           script="SUPERV_BIN.sh"/>
   <product name="COMPONENT-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform COMPONENT module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
-          installdiskspace="323"
+          installdiskspace="320"
           temporarydiskspace="0"
           script="COMPONENT_SRC.sh"/>
   <product name="COMPONENT-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform COMPONENT module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
-          installdiskspace="14000"
+          installdiskspace="14419"
           temporarydiskspace="0"
           script="COMPONENT_BIN.sh"/>
   <product name="PYCALCULATOR-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform PYCALCULATOR module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
-          installdiskspace="147"
+          installdiskspace="149"
           temporarydiskspace="0"
           script="PYCALCULATOR_SRC.sh"/>
   <product name="PYCALCULATOR-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform PYCALCULATOR module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
-          installdiskspace="27"
+          installdiskspace="30"
           temporarydiskspace="0"
           script="PYCALCULATOR_BIN.sh"/>
   <product name="NETGENplugin-Src" 
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform NETGEN meshing algorithm plugin sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,netgen,KERNEL-Src,SMESH-Src"
-          installdiskspace="91"
+          installdiskspace="73"
           temporarydiskspace="0"
           script="NETGENPLUGIN_SRC.sh"/>
   <product name="NETGENplugin-Bin" 
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform NETGEN meshing algorithm plugin"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,netgen,KERNEL-Bin,SMESH-Bin"
-          installdiskspace="2467"
+          installdiskspace="2460"
           temporarydiskspace="0"
           script="NETGENPLUGIN_BIN.sh"/>
   <product name="GHS3Dplugin-Src" 
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform GHS3D meshing algorithm plugin sources. For use this plugin you should add the path to ghs3d to your PATH environment variable."
            install="install sources"
           temporarydiskspace="0"
           script="GHS3DPLUGIN_SRC.sh"/>
   <product name="GHS3Dplugin-Bin" 
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform GHS3D meshing algorithm plugin. For use this plugin you should add the path to ghs3d to your PATH environment variable."
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,KERNEL-Bin,SMESH-Bin"
-          installdiskspace="142"
+          installdiskspace="156"
           temporarydiskspace="0"
           script="GHS3DPLUGIN_BIN.sh"/>
   <product name="Hello-Src" 
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="Example SALOME C++ module (sources): Hello."
            install="install sources"
           temporarydiskspace="0"
           script="HELLO_SRC.sh"/>
   <product name="Hello-Bin" 
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Example SALOME C++ module (binaries): Hello."
            install="install binaries"
           temporarydiskspace="0"
           script="HELLO_BIN.sh"/>
   <product name="PyHello-Src" 
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="Example SALOME Python module (sources): Hello."
            install="install sources"
           temporarydiskspace="0"
           script="PYHELLO_SRC.sh"/>
   <product name="PyHello-Bin" 
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Example SALOME Python module (binaries): Hello."
            install="install binaries"
index 3a2d377c284166ebb1147cd0e8438346a9eab604..71346b83acb43fcaeae2db11fe99abb7aa746194 100755 (executable)
@@ -1,5 +1,5 @@
 <document>
-  <config version="2.2.3"
+  <config version="2.2.4"
          caption="SALOME v%1"
           copyright="&lt;h5>Copyright (C) 2003-2005 OPEN CASCADE,&lt;br>EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D,&lt;br>LEG, PRINCIPIA R&amp;D, BUREAU VERITAS&lt;/h5>"
           license="&lt;h5>GNU LGPL&lt;/h5>"
           dependancies="gcc"
           installdiskspace="2936"
           temporarydiskspace="8252"
-          script="netgen4.3.sh"/>
+          script="netgen-4.3.sh"/>
   <product name="OmniORB"
            version="3.0.5" 
            description="Open source Object Request Broker (ORB) library that implements the 2.3 specification of the Common Object Request Broker Architecture (CORBA)"
           temporarydiskspace="61528"
           script="graphviz-1.9.sh"/>
   <product name="KERNEL-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform KERNEL module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,boost,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Qwt,Hdf,Med,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,HappyDoc"
-          installdiskspace="28814"
+          installdiskspace="29072"
           temporarydiskspace="0"
            pickupenv="true"
           script="KERNEL_SRC.sh"/>
   <product name="KERNEL-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform KERNEL module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,boost,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Qwt,Hdf,Med,Vtk,OmniORB,Sip,PyQt,Doxygen,Graphviz,HappyDoc"
-          installdiskspace="58465"
+          installdiskspace="59179"
           temporarydiskspace="0"
            pickupenv="true"
           script="KERNEL_BIN.sh"/>
   <product name="GEOM-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform GEOM modules sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
-          installdiskspace="10619"
+          installdiskspace="10725"
           temporarydiskspace="0"
           script="GEOM_SRC.sh"/>
   <product name="GEOM-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform GEOM module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
-          installdiskspace="31703"
+          installdiskspace="31861"
           temporarydiskspace="0"
           script="GEOM_BIN.sh"/>
   <product name="MED-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform MED module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
-          installdiskspace="17744"
+          installdiskspace="17889"
           temporarydiskspace="0"
           script="MED_SRC.sh"/>
   <product name="MED-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform MED module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
-          installdiskspace="38484"
+          installdiskspace="41590"
           temporarydiskspace="0"
           script="MED_BIN.sh"/>
   <product name="SMESH-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform SMESH module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,boost,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src,GEOM-Src,MED-Src"
-          installdiskspace="10907"
+          installdiskspace="11912"
           temporarydiskspace="0"
           script="SMESH_SRC.sh"/>
   <product name="SMESH-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform SMEHS module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,boost,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin,GEOM-Bin,MED-Bin"
-          installdiskspace="36662"
+          installdiskspace="38622"
           temporarydiskspace="0"
           script="SMESH_BIN.sh"/>
   <product name="VISU-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform VISU module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Qwt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src,MED-Src"
-          installdiskspace="6558"
+          installdiskspace="7049"
           temporarydiskspace="0"
           script="VISU_SRC.sh"/>
   <product name="VISU-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform VISU module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Qwt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin,MED-Bin"
-          installdiskspace="20372"
+          installdiskspace="21392"
           temporarydiskspace="0"
           script="VISU_BIN.sh"/>
   <product name="SUPERV-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform SUPERV module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
-          installdiskspace="7476"
+          installdiskspace="7977"
           temporarydiskspace="0"
           script="SUPERV_SRC.sh"/>
   <product name="SUPERV-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform SUPERV module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
-          installdiskspace="53744"
+          installdiskspace="54207"
           temporarydiskspace="0"
           script="SUPERV_BIN.sh"/>
   <product name="COMPONENT-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform COMPONENT module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
-          installdiskspace="323"
+          installdiskspace="320"
           temporarydiskspace="0"
           script="COMPONENT_SRC.sh"/>
   <product name="COMPONENT-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform COMPONENT module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
-          installdiskspace="14000"
+          installdiskspace="14419"
           temporarydiskspace="0"
           script="COMPONENT_BIN.sh"/>
   <product name="PYCALCULATOR-Src"
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform PYCALCULATOR module sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Src"
-          installdiskspace="147"
+          installdiskspace="149"
           temporarydiskspace="0"
           script="PYCALCULATOR_SRC.sh"/>
   <product name="PYCALCULATOR-Bin"
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform PYCALCULATOR module"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,tcltk,OpenCascade,Python,Numeric,Swig,Qt,Hdf,Med,Vtk,OmniORB,Doxygen,Graphviz,HappyDoc,KERNEL-Bin"
-          installdiskspace="27"
+          installdiskspace="30"
           temporarydiskspace="0"
           script="PYCALCULATOR_BIN.sh"/>
   <product name="NETGENplugin-Src" 
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform NETGEN meshing algorithm plugin sources"
            install="install sources"
           supported="install sources"
           disable="false"
           dependancies="gcc,netgen,KERNEL-Src,SMESH-Src"
-          installdiskspace="91"
+          installdiskspace="73"
           temporarydiskspace="0"
           script="NETGENPLUGIN_SRC.sh"/>
   <product name="NETGENplugin-Bin" 
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform NETGEN meshing algorithm plugin"
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,netgen,KERNEL-Bin,SMESH-Bin"
-          installdiskspace="2467"
+          installdiskspace="2460"
           temporarydiskspace="0"
           script="NETGENPLUGIN_BIN.sh"/>
   <product name="GHS3Dplugin-Src" 
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="SALOME platform GHS3D meshing algorithm plugin sources. For use this plugin you should add the path to ghs3d to your PATH environment variable."
            install="install sources"
           temporarydiskspace="0"
           script="GHS3DPLUGIN_SRC.sh"/>
   <product name="GHS3Dplugin-Bin" 
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Precompiled SALOME platform GHS3D meshing algorithm plugin. For use this plugin you should add the path to ghs3d to your PATH environment variable."
            install="install binaries"
           supported="install binaries"
           disable="false"
           dependancies="gcc,KERNEL-Bin,SMESH-Bin"
-          installdiskspace="142"
+          installdiskspace="156"
           temporarydiskspace="0"
           script="GHS3DPLUGIN_BIN.sh"/>
   <product name="Hello-Src" 
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="Example SALOME C++ module (sources): Hello."
            install="install sources"
           temporarydiskspace="0"
           script="HELLO_SRC.sh"/>
   <product name="Hello-Bin" 
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Example SALOME C++ module (binaries): Hello."
            install="install binaries"
           temporarydiskspace="0"
           script="HELLO_BIN.sh"/>
   <product name="PyHello-Src" 
-           version="2.2.3
+           version="2.2.4
            context="salome sources" 
            description="Example SALOME Python module (sources): Hello."
            install="install sources"
           temporarydiskspace="0"
           script="PYHELLO_SRC.sh"/>
   <product name="PyHello-Bin" 
-           version="2.2.3
+           version="2.2.4
            context="salome binaries" 
            description="Example SALOME Python module (binaries): Hello."
            install="install binaries"
index 75007c557ebafd783a7f168909021343b0a402ba..169f69906a4d4a833c1027a4ff1b4a02a41329d7 100755 (executable)
@@ -21,7 +21,7 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 
 # looks for the native product and collects it's environment (used by make_env())
 try_native(){
-echo "It is impossible to use native BOOST now. Sorry."
+echo "It is impossible to use native BOOST."
 return 1
 }
 
diff --git a/config_files/BOOST-1.31.0.sh b/config_files/BOOST-1.31.0.sh
new file mode 100755 (executable)
index 0000000..5ac6a19
--- /dev/null
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+check_version(){
+if [ -n "${BOOSTDIR}" ]; then
+    ver=`egrep 'BOOST_VERSION [0-9]+' ${BOOSTDIR}/boost/version.hpp | sed 's/.*BOOST_VERSION \([0-9]\+\)/\1/g'`
+    if [ "$ver" = "103100" ]; then
+       return 0
+    fi
+fi
+return 1;
+}
+
+print_env()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM 
+export BOOSTDIR=\${INSTALL_ROOT}/${PRODUCT}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+echo "It is impossible to use native BOOST 1.31.0."
+return 1
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+return $?
+}
+
+install_source()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/boost-1.31.0.tar.gz -C ${INSTALL_ROOT}
+rm -fr ${PRODUCT_WORK}
+print_env
+}
+
+install_binary()
+{
+echo "It impossible to install BOOST 1.31.0 from binaries, try to install it from sources."
+return 1
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INSTALL_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="boost" ; fi
+export PRODUCT="boost-1.31.0"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+$PROCEDURE
diff --git a/config_files/CAS-5.2.3.sh b/config_files/CAS-5.2.3.sh
new file mode 100755 (executable)
index 0000000..ccca989
--- /dev/null
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+check_version()
+{
+if [ -z "$CASROOT" ]; then
+    return 1
+fi
+check_lib_version ${CASROOT}/inc/Standard_Version.hxx
+if [ "$?" -ne "0" ] ; then
+    return 1
+fi
+ver_major=`grep "!define OCC_VERSION_MAJOR" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'`
+ver_minor=`grep "!define OCC_VERSION_MINOR" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'`
+ver="$ver_major.$ver_minor"
+if [ "$ver" != "5.2" ] ; then
+    return 1
+fi
+# above check if only for major and minor version numbers
+# we need also the check for the release version number
+# unfortunately there is no appropriate method to define the release version number,
+# so we use a little trick here:
+check_lib_version libStdPlugin.so ${CASROOT}/lin/lib
+if [ "$?" -eq "0" ] ; then
+    return 0
+fi
+return 1
+}
+
+print_env()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export CASROOT=\${INSTALL_ROOT}/${PRODUCT}
+export LD_LIBRARY_PATH=\${CASROOT}/lin/lib:\${CASROOT}/`uname`/lib:\${LD_LIBRARY_PATH}
+# Variable for Foundation Classes : 
+export CSF_UnitsLexicon=\${CASROOT}/src/UnitsAPI/Lexi_Expr.dat 
+export CSF_UnitsDefinition=\${CASROOT}/src/UnitsAPI/Units.dat 
+# Variable for DataExchange : 
+export CSF_SHMessageStd=\${CASROOT}/src/SHMessage
+export CSF_XSMessage=\${CASROOT}/src/XSMessage 
+# Variable for Font : 
+export CSF_MDTVFontDirectory=\${CASROOT}/src/FontMFT 
+export CSF_MDTVTexturesDirectory=\${CASROOT}/src/Textures 
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+check_version
+if [ $? -eq 0 ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export CASROOT=${CASROOT}
+export LD_LIBRARY_PATH=\${CASROOT}/lin/lib:\${CASROOT}/`uname`/lib:\${LD_LIBRARY_PATH}
+# Variable for Foundation Classes : 
+export CSF_UnitsLexicon=\${CASROOT}/src/UnitsAPI/Lexi_Expr.dat 
+export CSF_UnitsDefinition=\${CASROOT}/src/UnitsAPI/Units.dat 
+# Variable for DataExchange : 
+export CSF_SHMessageStd=\${CASROOT}/src/SHMessage
+export CSF_XSMessage=\${CASROOT}/src/XSMessage 
+# Variable for Font : 
+export CSF_MDTVFontDirectory=\${CASROOT}/src/FontMFT 
+export CSF_MDTVTexturesDirectory=\${CASROOT}/src/Textures 
+##
+EOF
+    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+    return 0
+fi
+return 1;
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+return $?
+}
+
+install_source()
+{
+echo "You can only install precompiled CAS-5.2.3"
+return 1
+}
+
+install_binary()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/CAS-5.2.3.tar.gz -C ${INSTALL_ROOT}
+
+print_env
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INSTALL_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="cas" ; fi
+export PRODUCT="CAS-5.2.3"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+$PROCEDURE 
index 5e3a6333adf843c84c8b6fe81523bf14ce2b2cce..819bff14d94b3f4db8622234b205a9c98de2271f 100755 (executable)
@@ -2,12 +2,17 @@
 
 check_version()
 {
-#check existence of Open CASCADE 5.2
-#unfortunately we can't say nothing exactly about Open CASCADE 5.2
-#and we only check CASROOT env.variable
-if [ -n "$CASROOT" ]; then
-    #echo "You have installed version of Open CASCADE in a $CASROOT"
-    #echo "Please check version number (You need 5.2)"
+if [ -z "$CASROOT" ]; then
+    return 1
+fi
+check_lib_version ${CASROOT}/inc/Standard_Version.hxx
+if [ "$?" -ne "0" ] ; then
+    return 1
+fi
+ver_major=`grep "!define OCC_VERSION_MAJOR" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'`
+ver_minor=`grep "!define OCC_VERSION_MINOR" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'`
+ver="$ver_major.$ver_minor"
+if [ "$ver" == "5.2" ] ; then
     return 0
 fi
 return 1
@@ -18,7 +23,7 @@ print_env()
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export CASROOT=\${INSTALL_ROOT}/${PRODUCT}
-export LD_LIBRARY_PATH=\${CASROOT}/Linux/lib:\${CASROOT}/lin/lib:\${CASROOT}/`uname`/lib:\${LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH=\${CASROOT}/lin/lib:\${CASROOT}/`uname`/lib:\${LD_LIBRARY_PATH}
 # Variable for Foundation Classes : 
 export CSF_UnitsLexicon=\${CASROOT}/src/UnitsAPI/Lexi_Expr.dat 
 export CSF_UnitsDefinition=\${CASROOT}/src/UnitsAPI/Units.dat 
@@ -41,7 +46,7 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export CASROOT=${CASROOT}
-export LD_LIBRARY_PATH=\${CASROOT}/Linux/lib:\${CASROOT}/lin/lib:\${CASROOT}/`uname`/lib:\${LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH=\${CASROOT}/lin/lib:\${CASROOT}/`uname`/lib:\${LD_LIBRARY_PATH}
 # Variable for Foundation Classes : 
 export CSF_UnitsLexicon=\${CASROOT}/src/UnitsAPI/Lexi_Expr.dat 
 export CSF_UnitsDefinition=\${CASROOT}/src/UnitsAPI/Units.dat 
index 6e8ebbe7cd07090afa789f03be0b3bb51278fdcf..8fe47e609b077a709ce0cdd383d60218a7b2dfdb 100755 (executable)
@@ -5,7 +5,7 @@ if [ -n "${COMPONENT_ROOT_DIR}" ]; then
     check_lib_version VERSION ${COMPONENT_ROOT_DIR}/bin/salome
     if [ "$?" -eq "0" ]; then
        ver=`cat ${COMPONENT_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "2.2.3" ]; then
+       if [ "$ver" = "2.2.4" ]; then
            return 0
        fi
     fi
@@ -17,6 +17,13 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export COMPONENT_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${COMPONENT_ROOT_DIR}/bin/salome:\${PATH}
+    export LD_LIBRARY_PATH=\${COMPONENT_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${COMPONENT_ROOT_DIR}/bin/salome:\${COMPONENT_ROOT_DIR}/lib/salome:\${COMPONENT_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -30,6 +37,13 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export COMPONENT_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${COMPONENT_ROOT_DIR}/bin/salome:\${PATH}
+    export LD_LIBRARY_PATH=\${COMPONENT_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${COMPONENT_ROOT_DIR}/bin/salome:\${COMPONENT_ROOT_DIR}/lib/salome:\${COMPONENT_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
@@ -53,7 +67,7 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/COMPONENTbinariesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/COMPONENTbinariesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -64,7 +78,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="ComponentBin" ; fi
-export PRODUCT="COMPONENT_2.2.3"
+export PRODUCT="COMPONENT_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
index acad961c05b26e4b0bec7a077317025aa4e8a985..3d532f2c7f52d644314965c65c1c83f0ec019e02 100755 (executable)
@@ -5,7 +5,7 @@ if [ -n "${COMPONENT_SRC_DIR}" ]; then
     check_lib_version VERSION ${COMPONENT_SRC_DIR}/bin
     if [ "$?" -eq "0" ]; then
        ver=`cat ${COMPONENT_SRC_DIR}/bin/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "2.2.3" ]; then
+       if [ "$ver" = "2.2.4" ]; then
            return 0
        fi
     fi
@@ -48,7 +48,7 @@ install_source()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/COMPONENTsourcesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/COMPONENTsourcesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -64,7 +64,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="ComponentSrc" ; fi
-export PRODUCT="COMPONENT_SRC_2.2.3"
+export PRODUCT="COMPONENT_SRC_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
index e6ad60df72df5cadfc39c48986d1a3e106ad6aeb..457fdd13a305c2ef2fee4ef6bd87e516bcbd975d 100755 (executable)
@@ -5,7 +5,7 @@ if [ -n "${GEOM_ROOT_DIR}" ]; then
     check_lib_version VERSION ${GEOM_ROOT_DIR}/bin/salome
     if [ "$?" -eq "0" ]; then
        ver=`cat ${GEOM_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "2.2.3" ]; then
+       if [ "$ver" = "2.2.4" ]; then
            return 0
        fi
     fi
@@ -17,6 +17,13 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export GEOM_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${GEOM_ROOT_DIR}/bin/salome:\${PATH}
+    export LD_LIBRARY_PATH=\${GEOM_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${GEOM_ROOT_DIR}/bin/salome:\${GEOM_ROOT_DIR}/lib/salome:\${GEOM_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -30,6 +37,13 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export GEOM_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${GEOM_ROOT_DIR}/bin/salome:\${PATH}
+    export LD_LIBRARY_PATH=\${GEOM_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${GEOM_ROOT_DIR}/bin/salome:\${GEOM_ROOT_DIR}/lib/salome:\${GEOM_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
@@ -53,7 +67,7 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/GEOMbinariesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/GEOMbinariesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -64,7 +78,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="GeomBin" ; fi
-export PRODUCT="GEOM_2.2.3"
+export PRODUCT="GEOM_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
index a0c4de7dc51e3a940ad4c183bffc30bb18aeb08d..536ffc8e90c3acc68d606fb5b1c408fe2826f8e1 100755 (executable)
@@ -5,7 +5,7 @@ if [ -n "${GEOM_SRC_DIR}" ]; then
     check_lib_version VERSION ${GEOM_SRC_DIR}/bin
     if [ "$?" -eq "0" ]; then
        ver=`cat ${GEOM_SRC_DIR}/bin/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "2.2.3" ]; then
+       if [ "$ver" = "2.2.4" ]; then
            return 0
        fi
     fi
@@ -48,7 +48,7 @@ install_source()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/GEOMsourcesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/GEOMsourcesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -64,7 +64,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="GeomSrc" ; fi
-export PRODUCT="GEOM_SRC_2.2.3"
+export PRODUCT="GEOM_SRC_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
index 83a11118ef77f0c0777d4d58109e9958891c74ad..8b42cc8b7be00e729424f8a229cb356b86a684c6 100755 (executable)
@@ -5,7 +5,7 @@ if [ -n "${GHS3DPLUGIN_ROOT_DIR}" ]; then
     check_lib_version VERSION ${GHS3DPLUGIN_ROOT_DIR}/bin/salome
     if [ "$?" -eq "0" ]; then
        ver=`cat ${GHS3DPLUGIN_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "2.2.3" ]; then
+       if [ "$ver" = "2.2.4" ]; then
            return 0
        fi
     fi
@@ -18,6 +18,12 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export GHS3DPLUGIN_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export LD_LIBRARY_PATH=\${GHS3DPLUGIN_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${GHS3DPLUGIN_ROOT_DIR}/lib/salome:\${GHS3DPLUGIN_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -31,6 +37,12 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export GHS3DPLUGIN_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export LD_LIBRARY_PATH=\${GHS3DPLUGIN_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${GHS3DPLUGIN_ROOT_DIR}/lib/salome:\${GHS3DPLUGIN_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
@@ -54,7 +66,7 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINbinariesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINbinariesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -65,7 +77,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="GHS3DPLUGINBin" ; fi
-export PRODUCT="GHS3DPLUGIN_2.2.3"
+export PRODUCT="GHS3DPLUGIN_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
index d92126e44263295c32eff5f08cae0b1df26b6a43..10b9347729e64a8f9e0b0568e8d96cc33cfa4584 100755 (executable)
@@ -5,7 +5,7 @@ if [ -n "${GHS3DPLUGIN_SRC_DIR}" ]; then
     check_lib_version VERSION ${GHS3DPLUGIN_SRC_DIR}/bin
     if [ "$?" -eq "0" ]; then
        ver=`cat ${GHS3DPLUGIN_SRC_DIR}/bin/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "2.2.3" ]; then
+       if [ "$ver" = "2.2.4" ]; then
            return 0
        fi
     fi
@@ -49,7 +49,7 @@ install_source()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINsourcesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINsourcesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -65,7 +65,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="GHS3DPLUGINSrc" ; fi
-export PRODUCT="GHS3DPLUGIN_SRC_2.2.3"
+export PRODUCT="GHS3DPLUGIN_SRC_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
index ddc1c94bb5016cf3fe0a92a4b233397d2feed7d9..d58c7720aa42c8a32b3949b6ab0f8c4eed88b0c5 100755 (executable)
@@ -9,6 +9,13 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export HELLO_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${HELLO_ROOT_DIR}/bin/salome:\${PATH}
+    export LD_LIBRARY_PATH=\${HELLO_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${HELLO_ROOT_DIR}/bin/salome:\${HELLO_ROOT_DIR}/lib/salome:\${HELLO_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -22,6 +29,13 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export HELLO_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${HELLO_ROOT_DIR}/bin/salome:\${PATH}
+    export LD_LIBRARY_PATH=\${HELLO_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${HELLO_ROOT_DIR}/bin/salome:\${HELLO_ROOT_DIR}/lib/salome:\${HELLO_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
@@ -45,7 +59,7 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/HELLObinariesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/HELLObinariesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -56,7 +70,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="HelloBin" ; fi
-export PRODUCT="HELLO_2.2.3"
+export PRODUCT="HELLO_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
index 8e4b70a0c2c435dad239dd3db9ab4501cbc04cef..3c3b3c182d8812a180a1a222e1ec710cfe3ede1a 100755 (executable)
@@ -40,7 +40,7 @@ install_source()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/HELLOsourcesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/HELLOsourcesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -56,7 +56,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="HelloSrc" ; fi
-export PRODUCT="HELLO_SRC_2.2.3"
+export PRODUCT="HELLO_SRC_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
index 2fc19ce50df64abf9a8f79ac03659754718536eb..a7d18c221803e92fd24e2b4ab65422113c062372 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 check_version(){
-check_lib_version happydoc ${PYTHONHOME}/bin
+check_lib_version happydoc $PATH
 if [ "$?" -ne "0" ]; then
    return 1
 fi
@@ -17,7 +17,7 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PATH=\${INSTALL_ROOT}/${PRODUCT}/bin:\${PATH}
-export PYTHONPATH=\${INSTALL_ROOT}/${PRODUCT}/lib/python2.2/site-packages:\${PYTHONPATH}
+export PYTHONPATH=\${INSTALL_ROOT}/${PRODUCT}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -73,7 +73,7 @@ check_jb tar xfz ${SOURCE_DIR}/HappyDoc_r2_1.tar.gz -C ${INSTALL_WORK}
 cd ${PRODUCT_WORK}
 makedir ${PRODUCT_DIR}
 check_job ${PRODUCT_DIR}/INSTALL.LOG python setup.py install --prefix=${PRODUCT_DIR}
-#file_pth=${PRODUCT_DIR}/lib/python2.2/site-packages/happydoclib.pth
+#file_pth=${PRODUCT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/happydoclib.pth
 #if [ ! -f ${file_pth} ] ; then
 #    touch ${file_pth}
 #    cat > ${file_pth} <<EOF 
@@ -81,6 +81,7 @@ check_job ${PRODUCT_DIR}/INSTALL.LOG python setup.py install --prefix=${PRODUCT_
 #EOF
 #fi
 
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK}
 print_env
 }
index 17b2c58763b26239deff5044e8c3e102237450f0..449a060b5a7a074135ea2cbfe2a7626dd83a7c3f 100755 (executable)
@@ -5,7 +5,7 @@ if [ -n "${KERNEL_ROOT_DIR}" ]; then
     check_lib_version VERSION ${KERNEL_ROOT_DIR}/bin/salome
     if [ "$?" -eq "0" ]; then
        ver=`cat ${KERNEL_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "2.2.3" ]; then
+       if [ "$ver" = "2.2.4" ]; then
            return 0
        fi
     fi
@@ -17,6 +17,13 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export KERNEL_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${KERNEL_ROOT_DIR}/bin/salome:\${PATH}
+    export LD_LIBRARY_PATH=\${KERNEL_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${KERNEL_ROOT_DIR}/bin/salome:\${KERNEL_ROOT_DIR}/lib/salome:\${KERNEL_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -30,6 +37,13 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export KERNEL_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${KERNEL_ROOT_DIR}/bin/salome:\${PATH}
+    export LD_LIBRARY_PATH=\${KERNEL_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${KERNEL_ROOT_DIR}/bin/salome:\${KERNEL_ROOT_DIR}/lib/salome:\${KERNEL_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
@@ -53,7 +67,7 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/KERNELbinariesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/KERNELbinariesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 # The next two symbolic links are created only for Red Hat 9
 if [ -f /lib/libcrypto.so.0.9.7a ]; then
@@ -77,7 +91,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="KernelBin" ; fi
-export PRODUCT="KERNEL_2.2.3"
+export PRODUCT="KERNEL_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
index 6e099699df1cd302f9905743330c05a37589f022..7a9376d0610147e1b44e942d7309b0c787e6d787 100755 (executable)
@@ -5,7 +5,7 @@ if [ -n "${KERNEL_SRC_DIR}" ]; then
     check_lib_version VERSION ${KERNEL_SRC_DIR}/bin
     if [ "$?" -eq "0" ]; then
        ver=`cat ${KERNEL_SRC_DIR}/bin/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "2.2.3" ]; then
+       if [ "$ver" = "2.2.4" ]; then
            return 0
        fi
     fi
@@ -48,7 +48,7 @@ install_source()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/KERNELsourcesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/KERNELsourcesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -69,7 +69,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="KernelSrc" ; fi
-export PRODUCT="KERNEL_SRC_2.2.3"
+export PRODUCT="KERNEL_SRC_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
index 1f177b7e187c858e6fb40efe2fd24f385107a189..a2f914abfc89f5e883beaa5aabd5c10220c5e438 100755 (executable)
@@ -5,7 +5,7 @@ if [ -n "${MED_ROOT_DIR}" ]; then
     check_lib_version VERSION ${MED_ROOT_DIR}/bin/salome
     if [ "$?" -eq "0" ]; then
        ver=`cat ${MED_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "2.2.3" ]; then
+       if [ "$ver" = "2.2.4" ]; then
            return 0
        fi
     fi
@@ -17,6 +17,13 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export MED_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${MED_ROOT_DIR}/bin/salome:\${PATH}
+    export LD_LIBRARY_PATH=\${MED_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${MED_ROOT_DIR}/bin/salome:\${MED_ROOT_DIR}/lib/salome:\${MED_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -30,6 +37,13 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export MED_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${MED_ROOT_DIR}/bin/salome:\${PATH}
+    export LD_LIBRARY_PATH=\${MED_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${MED_ROOT_DIR}/bin/salome:\${MED_ROOT_DIR}/lib/salome:\${MED_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
@@ -53,7 +67,7 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/MEDbinariesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/MEDbinariesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -64,7 +78,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="MedBin" ; fi
-export PRODUCT="MED_2.2.3"
+export PRODUCT="MED_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
index 3380adda9084206319ff86766b39b45dbebff6ed..c0e791429902dcbac3ca7bea5e4e555b179add37 100755 (executable)
@@ -5,7 +5,7 @@ if [ -n "${MED_SRC_DIR}" ]; then
     check_lib_version VERSION ${MED_SRC_DIR}/bin
     if [ "$?" -eq "0" ]; then
        ver=`cat ${MED_SRC_DIR}/bin/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "2.2.3" ]; then
+       if [ "$ver" = "2.2.4" ]; then
            return 0
        fi
     fi
@@ -48,7 +48,7 @@ install_source()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/MEDsourcesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/MEDsourcesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -64,7 +64,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="MedSrc" ; fi
-export PRODUCT="MED_SRC_2.2.3"
+export PRODUCT="MED_SRC_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
index a885748878acece2af1d36a68def209c4c577de6..1fed239c6594a33192dfe23eb0acc525541e9f0a 100755 (executable)
@@ -5,7 +5,7 @@ if [ -n "${NETGENPLUGIN_ROOT_DIR}" ]; then
     check_lib_version VERSION ${NETGENPLUGIN_ROOT_DIR}/bin/salome
     if [ "$?" -eq "0" ]; then
        ver=`cat ${NETGENPLUGIN_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "2.2.3" ]; then
+       if [ "$ver" = "2.2.4" ]; then
            return 0
        fi
     fi
@@ -18,6 +18,12 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export NETGENPLUGIN_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export LD_LIBRARY_PATH=\${NETGENPLUGIN_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${NETGENPLUGIN_ROOT_DIR}/lib/salome:\${NETGENPLUGIN_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -31,6 +37,12 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export NETGENPLUGIN_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export LD_LIBRARY_PATH=\${NETGENPLUGIN_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${NETGENPLUGIN_ROOT_DIR}/lib/salome:\${NETGENPLUGIN_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
@@ -54,7 +66,7 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/NETGENPLUGINbinariesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/NETGENPLUGINbinariesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -65,7 +77,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="NETGENPLUGINBin" ; fi
-export PRODUCT="NETGENPLUGIN_2.2.3"
+export PRODUCT="NETGENPLUGIN_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
index 9a81bc77d30ce514ef34a2ae247dbc7e995f048b..66d51093880e2b0cb64bb3e249b4ec59d9ecd11a 100755 (executable)
@@ -5,7 +5,7 @@ if [ -n "${NETGENPLUGIN_SRC_DIR}" ]; then
     check_lib_version VERSION ${NETGENPLUGIN_SRC_DIR}/bin
     if [ "$?" -eq "0" ]; then
        ver=`cat ${NETGENPLUGIN_SRC_DIR}/bin/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "2.2.3" ]; then
+       if [ "$ver" = "2.2.4" ]; then
            return 0
        fi
     fi
@@ -49,7 +49,7 @@ install_source()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/NETGENPLUGINsourcesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/NETGENPLUGINsourcesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -65,7 +65,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="NETGENPLUGINSrc" ; fi
-export PRODUCT="NETGENPLUGIN_SRC_2.2.3"
+export PRODUCT="NETGENPLUGIN_SRC_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
index 10e14baf35a254c0776554ad8737a6bcec1a602a..c9850350685e5372f9b83957d872931006e83ebb 100755 (executable)
@@ -1,12 +1,9 @@
 #!/bin/sh
 
 check_version(){
-if [ -d "${PYTHONHOME}/lib/python2.2/site-packages/Numeric" ]; then
-   check_lib_version _numpy.so ${PYTHONHOME}/lib/python2.2/site-packages/Numeric
-   if [ "$?" -eq "0" ]; then
-      #echo "The product ${PRODUCT} has been already installed on yours system"
-      return 0
-   fi
+ver=`python -c 'import Numeric; print Numeric.__version__' 2>/dev/null`
+if [ "$ver" == "22.0" ]; then
+   return 0
 fi
 return 1
 }
@@ -14,7 +11,7 @@ return 1
 print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
-export PYTHONPATH=\${INSTALL_ROOT}/${PRODUCT}/lib/python2.2/site-packages/Numeric:\${PYTHONPATH}
+export PYTHONPATH=\${INSTALL_ROOT}/${PRODUCT}/lib/python\${PYTHON_VERSION}/site-packages/Numeric:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -23,17 +20,9 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 
 # looks for the native product and collects it's environment (used by make_env())
 try_native(){
-cat > ${INSTALL_WORK}/try_native.py <<EOF 
-import sys
-try :
-    import Numeric
-    sys.exit(0)    
-except ImportError, r :
-    sys.exit(1)
-EOF
-python ${INSTALL_WORK}/try_native.py
+check_version
 if [ $? -eq 0 ] ; then
-    pythonpath="`find_in_path _numpy.so ${PYTHONPATH}`"
+    pythonpath="`find_in_path Numeric.py ${PYTHONPATH}`"
     tmp="${pythonpath} ${pythonpath} \${PYTHONPATH} ${PYTHONPATH}";  
     pythonpath=`sort_path ${tmp}`
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
@@ -42,10 +31,8 @@ export PYTHONPATH=${pythonpath}
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
-    rm -f ${INSTALL_WORK}/try_native.py
     return 0
 fi
-rm -f ${INSTALL_WORK}/try_native.py
 return 1
 }
 
diff --git a/config_files/Numeric-23.7.sh b/config_files/Numeric-23.7.sh
new file mode 100755 (executable)
index 0000000..d632fa2
--- /dev/null
@@ -0,0 +1,109 @@
+#!/bin/sh
+
+check_version(){
+ver=`python -c 'import Numeric; print Numeric.__version__' 2>/dev/null`
+if [ "$ver" == "23.7" ]; then
+   return 0
+fi
+return 1
+}
+
+print_env(){
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export PYTHONPATH=\${INSTALL_ROOT}/${PRODUCT}/lib/python\${PYTHON_VERSION}/site-packages/Numeric:\${PYTHONPATH}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+check_version
+if [ $? -eq 0 ] ; then
+    pythonpath="`find_in_path Numeric.py ${PYTHONPATH}`"
+    tmp="${pythonpath} ${pythonpath} \${PYTHONPATH} ${PYTHONPATH}";  
+    pythonpath=`sort_path ${tmp}`
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export PYTHONPATH=${pythonpath}
+##
+EOF
+    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+    return 0
+fi
+return 1
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+return $?
+}
+
+install_source()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+makedir ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/Numeric-23.7.tar.gz -C ${INSTALL_WORK}
+cd ${PRODUCT_WORK}
+
+# check existence of lapack, f77blas, cblas, atlas libraries
+found=1
+check_lib_version liblapack.so
+if [ "$?" -ne "0" ] ; then
+  found=0
+fi
+if [ "$found" -eq "1" ] ; then
+    check_lib_version libf77blas.so
+    if [ "$?" -ne "0" ] ; then
+       found=0
+    fi
+fi
+if [ "$found" -eq "1" ] ; then
+    check_lib_version libcblas.so
+    if [ "$?" -ne "0" ] ; then
+       found=0
+    fi
+fi
+if [ "$found" -eq "1" ] ; then
+    check_lib_version libatlas.so
+    if [ "$?" -ne "0" ] ; then
+       found=0
+    fi
+fi
+# if any library is not found modify build procedure
+if [ "$found" -eq "0" ] ; then
+    cp setup.py setup.py.orig
+    sed -e "s%^use_dotblas = 1%use_dotblas = 0%g" -e "s%^libraries_list = \['lapack', 'cblas', 'f77blas', 'atlas', 'g2c'\]%libraries_list = \['g2c'\]%g" setup.py.orig > setup.py
+    chmod a+x setup.py
+fi
+
+check_job ${PRODUCT_DIR}/INSTALL.LOG python setup.py install --prefix=${PRODUCT_DIR}
+
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
+rm -fr ${PRODUCT_WORK}
+print_env
+}
+
+install_binary()
+{
+check_jb tar xfz ${SOURCE_DIR}/Numeric-23.7.tar.gz -C ${INSTALL_ROOT}
+
+print_env
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INSTALL_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="numeric" ; fi
+export PRODUCT="Numeric-23.7"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+$PROCEDURE 
index 05b3e84011f718895706cd6fb4c101dc978b111a..3464cdea261305e488615a99f3c7b4ff7ca8c71a 100755 (executable)
@@ -5,7 +5,7 @@ if [ -n "${PYCALCULATOR_ROOT_DIR}" ]; then
     check_lib_version VERSION ${PYCALCULATOR_ROOT_DIR}/bin/salome
     if [ "$?" -eq "0" ]; then
        ver=`cat ${PYCALCULATOR_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "2.2.3" ]; then
+       if [ "$ver" = "2.2.4" ]; then
            return 0
        fi
     fi
@@ -17,6 +17,12 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYCALCULATOR_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${PYCALCULATOR_ROOT_DIR}/bin/salome:\${PATH}
+    export PYTHONPATH=\${PYCALCULATOR_ROOT_DIR}/bin/salome:\${PYCALCULATOR_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -30,6 +36,12 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYCALCULATOR_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${PYCALCULATOR_ROOT_DIR}/bin/salome:\${PATH}
+    export PYTHONPATH=\${PYCALCULATOR_ROOT_DIR}/bin/salome:\${PYCALCULATOR_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
@@ -53,7 +65,7 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/PYCALCULATORbinariesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/PYCALCULATORbinariesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -64,7 +76,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="PyCalculatorBin" ; fi
-export PRODUCT="PYCALCULATOR_2.2.3"
+export PRODUCT="PYCALCULATOR_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
index a456946dcb3698625588b51fff43f5ccbceabcca..ff63811d997ccd987b597623fbf7209370973ec0 100755 (executable)
@@ -5,7 +5,7 @@ if [ -n "${PYCALCULATOR_SRC_DIR}" ]; then
     check_lib_version VERSION ${PYCALCULATOR_SRC_DIR}/bin
     if [ "$?" -eq "0" ]; then
        ver=`cat ${PYCALCULATOR_SRC_DIR}/bin/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "2.2.3" ]; then
+       if [ "$ver" = "2.2.4" ]; then
            return 0
        fi
     fi
@@ -48,7 +48,7 @@ install_source()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/PYCALCULATORsourcesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/PYCALCULATORsourcesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -64,7 +64,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="PyCalculatorSrc" ; fi
-export PRODUCT="PYCALCULATOR_SRC_2.2.3"
+export PRODUCT="PYCALCULATOR_SRC_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
index 67a949c276fda25e52d90f260b534e47f08e8502..b559c7670690cc29f844c1bd59bc52c8396390e7 100755 (executable)
@@ -9,6 +9,12 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYHELLO_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${PYHELLO_ROOT_DIR}/bin/salome:\${PATH}
+    export PYTHONPATH=\${PYHELLO_ROOT_DIR}/bin/salome:\${PYHELLO_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -22,6 +28,12 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYHELLO_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${PYHELLO_ROOT_DIR}/bin/salome:\${PATH}
+    export PYTHONPATH=\${PYHELLO_ROOT_DIR}/bin/salome:\${PYHELLO_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
@@ -45,7 +57,7 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/PYHELLObinariesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/PYHELLObinariesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -56,7 +68,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="PyHelloBin" ; fi
-export PRODUCT="PYHELLO_2.2.3"
+export PRODUCT="PYHELLO_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
index daaa0bd01a4f3327139b1cbe23151848f157bd16..8ca810ad976fc9a97da20bc25c75189be87fd07a 100755 (executable)
@@ -40,7 +40,7 @@ install_source()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/PYHELLOsourcesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/PYHELLOsourcesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -56,7 +56,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="PyHelloSrc" ; fi
-export PRODUCT="PYHELLO_SRC_2.2.3"
+export PRODUCT="PYHELLO_SRC_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
diff --git a/config_files/PyQt-3.13.sh b/config_files/PyQt-3.13.sh
new file mode 100755 (executable)
index 0000000..27d2b21
--- /dev/null
@@ -0,0 +1,122 @@
+#!/bin/sh
+
+check_version()
+{
+if [ -n "${PYQTDIR}" ]; then
+    check_lib_version qt.so $PYQTDIR
+    if [ "$?" -eq "0" ]; then
+       return 0
+    fi
+fi
+return 1
+}
+
+print_env()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export PYQTDIR=\${INSTALL_ROOT}/${PRODUCT}
+export PYQT_SIPS=\${PYQTDIR}/sip
+export PATH=\${PYQTDIR}:\$PATH 
+export LD_LIBRARY_PATH=\${PYQTDIR}:\$LD_LIBRARY_PATH 
+export PYTHONPATH=\${PYQTDIR}:\${PYTHONPATH}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+pyqtdir="`find_in_path pyuic ${PATH}`"
+if [ -z "${pyqtdir}" ] ; then
+    pyqtdir="`find_in_path pyuic /usr/bin`"
+fi
+if [ -n "${pyqtdir}" ] ; then
+    pyqt_sips=${pyqtdir}/sip
+    if [ ! -d "${pyqt_sips}" ] ; then
+       pyqt_sips="/usr/share/sip/qt"
+       if [ ! -d "${pyqt_sips}" ] ; then
+           return 1
+       fi
+    fi
+    python_version="`python -c 'import sys; print sys.version[:3]'`"
+    pythonpath="`find_in_path qt.so ${PYTHONPATH}`"
+    if [ -z "${pythonpath}" ] ; then
+       pythonpath="`find_in_path qt.so /usr/lib/python${python_version}/site-packages`"
+    fi
+    if [ -n "${pythonpath}" ] ; then
+       tmp="${pyqtdir} ${pyqtdir} \${PATH} ${PATH}";  
+       path=`sort_path ${tmp}`
+       tmp="${pythonpath} ${pythonpath} \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";  
+       ld_library_path=`sort_path ${tmp}`
+       tmp="${pythonpath} ${pythonpath} \${PYTHONPATH} ${PYTHONPATH}";  
+       pythonpath=`sort_path ${tmp}`
+       cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export PYQT_SIPS=${pyqt_sips}
+export PATH=${path}
+export PYTHONPATH=${pythonpath}
+export LD_LIBRARY_PATH=${ld_library_path}
+##
+EOF
+       make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+       return 0
+    fi
+fi
+return 1;
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+return $?
+}
+
+install_source()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+makedir ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/PyQt-3.13.tar.gz -C ${INSTALL_WORK}
+cd ${PRODUCT_WORK}
+
+sed -e 's%check_license()$%#check_license()%g' configure.py > configure.py.new
+mv -f configure.py.new configure.py
+
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
+    python configure.py -b ${PRODUCT_DIR} -d ${PRODUCT_DIR} -v ${PRODUCT_DIR}/sip
+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
+
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
+rm -fr ${PRODUCT_WORK}
+print_env
+}
+
+install_binary()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/PyQt-3.13.tar.gz -C ${INSTALL_ROOT}
+
+print_env
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INSTALL_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="pyqt" ; fi
+export PRODUCT="PyQt-3.13"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+$PROCEDURE 
index 266650088a05f1b808f9b8018dd9b6548d8f1124..7de10c99112caff906ac5d601004cfefa85a7774 100755 (executable)
@@ -17,9 +17,9 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYQTDIR=\${INSTALL_ROOT}/${PRODUCT}
 export PYQT_SIPS=\${PYQTDIR}/sip
-export PYTHONPATH=\${PYQTDIR}:\${PYQTDIR}/qt:\${PYQTDIR}/qtgl:\${PYQTDIR}/qttable:\${PYQTDIR}/qtxml:\${PYTHONPATH}
 export PATH=\${PYQTDIR}:\$PATH 
 export LD_LIBRARY_PATH=\${PYQTDIR}:\$LD_LIBRARY_PATH 
+export PYTHONPATH=\${PYQTDIR}:\${PYQTDIR}/qt:\${PYQTDIR}/qtgl:\${PYQTDIR}/qttable:\${PYQTDIR}/qtxml:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -28,9 +28,9 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 
 # looks for the native product and collects it's environment (used by make_env())
 try_native(){
-pyqtdir="`find_in_path sip ${PATH}`"
+pyqtdir="`find_in_path pyuic ${PATH}`"
 if [ -z "${pyqtdir}" ] ; then
-    pyqtdir="`find_in_path sip /usr/bin`"
+    pyqtdir="`find_in_path pyuic /usr/bin`"
 fi
 if [ -n "${pyqtdir}" ] ; then
     pyqt_sips=${pyqtdir}/sip
@@ -40,9 +40,10 @@ if [ -n "${pyqtdir}" ] ; then
            return 1
        fi
     fi
+    python_version="`python -c 'import sys; print sys.version[:3]'`"
     pythonpath="`find_in_path libsip.so.9.1.0 ${PYTHONPATH}`"
     if [ -z "${pythonpath}" ] ; then
-       pythonpath="`find_in_path libsip.so.9.1.0 /usr/lib/python2.2/site-packages`"
+       pythonpath="`find_in_path libsip.so.9.1.0 /usr/lib/python${python_version}/site-packages`"
     fi
     if [ -n "${pythonpath}" ] ; then
        tmp="${pyqtdir} ${pyqtdir} \${PATH} ${PATH}";  
index 2055956e0adab1508005ca7f07ba8a076d4dff73..138125e56a9b378e46e745cf083bc36d80dc0973 100755 (executable)
@@ -23,10 +23,10 @@ print_env()
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYTHONHOME=\${INSTALL_ROOT}/${PRODUCT}
-export PYTHON_INCLUDE=\${PYTHONHOME}/include/python2.2
-export PYTHONPATH=\${PYTHONHOME}/lib/python2.2:\${PYTHONPATH}
 export PATH=\${PYTHONHOME}/bin:\${PATH}
-export LD_LIBRARY_PATH=\${PYTHONHOME}/lib/python2.2:\${LD_LIBRARY_PATH}
+export PYTHON_VERSION=\`python -c "import sys; print sys.version[:3]"\`
+export PYTHON_INCLUDE=\${PYTHONHOME}/include/python\${PYTHON_VERSION}
+export PYTHONPATH=\${PYTHONHOME}/lib/python\${PYTHON_VERSION}:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -54,17 +54,15 @@ if [ -n "${pythonhome}" ] ; then
 #   if [ "`${pythonhome}/bin/python -V 2>&1`" == "Python 2.2.1" ] ; then 
        tmp="\${PYTHONHOME}/bin ${pythonhome}/bin \${PATH} ${PATH}";  
        path=`sort_path ${tmp}`
-       tmp="\${PYTHONHOME}/lib/python2.2 ${pythonhome}/lib/python2.2 \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";  
-       ld_library_path=`sort_path ${tmp}`
-       tmp="\${PYTHONHOME}/lib/python2.2 ${pythonhome}/lib/python2.2 \${PYTHONPATH} ${PYTHONPATH}";  
+       tmp="\${PYTHONHOME}/lib/python\${PYTHON_VERSION} ${pythonhome}/lib/python${maj_ver}.${min_ver} \${PYTHONPATH} ${PYTHONPATH}";  
        pythonpath=`sort_path ${tmp}`
        cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYTHONHOME=${pythonhome}
-export PYTHON_INCLUDE=\${PYTHONHOME}/include/python2.2
-export PYTHONPATH=${pythonpath}
 export PATH=${path}
-export LD_LIBRARY_PATH=${ld_library_path}
+export PYTHON_VERSION=\`python -c "import sys; print sys.version[:3]"\`
+export PYTHON_INCLUDE=\${PYTHONHOME}/include/python\${PYTHON_VERSION}
+export PYTHONPATH=${pythonpath}
 ##
 EOF
        make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
diff --git a/config_files/Python-2.3.4.sh b/config_files/Python-2.3.4.sh
new file mode 100755 (executable)
index 0000000..23f68b0
--- /dev/null
@@ -0,0 +1,108 @@
+#!/bin/sh
+
+check_version()
+{
+if [ -z "$PYTHONHOME"  ]; then
+   return 1
+fi
+isPython=`which python 2>/dev/null`
+if [ -n isPython ]; then
+  # version number is calculated as: <major>*10000+<minor>*100+<release>
+  # e.g. for Python 2.3.4 it is equal to 20304
+  ver=`python -V 2>&1`
+  ver=`echo $ver | awk '{print $2}' | awk -F. '{v1=0;v2=0;v3=0;if(NF>0)v1=$1;if(NF>1)v2=$2;if(NF>2)v3=$3;print v1*10000+v2*100+v3}'`
+  if [ $ver -eq 20304 ] ;  then 
+    return 0
+  fi
+fi
+return 1 
+}
+
+print_env()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export PYTHONHOME=\${INSTALL_ROOT}/${PRODUCT}
+export PATH=\${PYTHONHOME}/bin:\${PATH}
+export PYTHON_VERSION=\`python -c "import sys; print sys.version[:3]"\`
+export PYTHON_INCLUDE=\${PYTHONHOME}/include/python\${PYTHON_VERSION}
+export PYTHONPATH=\${PYTHONHOME}/lib/python\${PYTHON_VERSION}:\${PYTHONPATH}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+pythonhome="`find_in_path python ${PATH}`"
+if [ -z "${pythonhome}" ] ; then
+    pythonhome="`find_in_path python /usr/bin`"
+fi
+if [ -n "${pythonhome}" ] ; then
+    pythonhome=`cd ${pythonhome}/..; pwd`
+    # get version number: <major>, <minor> and <release>
+    # <major> and <minor> numbers are checked strickly, but <release> number can be larger than required one
+    # version number is calculated as: <major>*10000+<minor>*100+<release>
+    # e.g. for Python 2.3.4 it is equal to 20304
+    ver=`python -V 2>&1`
+    maj_ver=`echo $ver | awk '{print $2}' | awk -F. '{if(NF>0) print $1; else print 0}'`
+    min_ver=`echo $ver | awk '{print $2}' | awk -F. '{if(NF>1) print $2; else print 0}'`
+    rel_ver=`echo $ver | awk '{print $2}' | awk -F. '{if(NF>2) print $3; else print 0}'`
+    let ver=$maj_ver*10000+$min_ver*100+$rel_ver
+    if [ $ver -ge 20304 ] ;  then 
+       tmp="\${PYTHONHOME}/bin ${pythonhome}/bin \${PATH} ${PATH}";  
+       path=`sort_path ${tmp}`
+       tmp="\${PYTHONHOME}/lib/python\${PYTHON_VERSION} ${pythonhome}/lib/python${maj_ver}.${min_ver} \${PYTHONPATH} ${PYTHONPATH}";  
+       pythonpath=`sort_path ${tmp}`
+       cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export PYTHONHOME=${pythonhome}
+export PATH=${path}
+export PYTHON_VERSION=\`python -c "import sys; print sys.version[:3]"\`
+export PYTHON_INCLUDE=\${PYTHONHOME}/include/python\${PYTHON_VERSION}
+export PYTHONPATH=${pythonpath}
+##
+EOF
+       make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+#######       THIS COULD BE USED FOR STRICT COMPARISON  ##############################
+#      if [ $maj_ver -eq 2 ] && [ $min_ver -eq 3 ] && [ $rel_ver -eq 4 ] ;  then 
+######################################################################################
+       if [ $maj_ver -eq 2 ] && [ $min_ver -eq 3 ] && [ $rel_ver -ge 4 ] ;  then 
+           return 0
+       else
+           return 2
+       fi
+    fi
+fi
+return 1
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+return $?
+}
+
+install_source()
+{
+echo "The installation of Python 2.3.4 from sources is not provided! Use native Python."
+return 1
+}
+
+install_binary()
+{
+echo "The installation of Python 2.3.4 from binaries is not provided! Use native gcc."
+return 1
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INSTALL_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="python" ; fi
+export PRODUCT="Python-2.3.4"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+${PROCEDURE}
\ No newline at end of file
index 87d19e0043c264adb54a2a47c55740ccc46661da..3681a51822d55c6c539ae691f6115d786c977ccd 100755 (executable)
@@ -5,7 +5,7 @@ if [ -n "${SMESH_ROOT_DIR}" ]; then
     check_lib_version VERSION ${SMESH_ROOT_DIR}/bin/salome
     if [ "$?" -eq "0" ]; then
        ver=`cat ${SMESH_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "2.2.3" ]; then
+       if [ "$ver" = "2.2.4" ]; then
            return 0
        fi
     fi
@@ -17,6 +17,13 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export SMESH_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${SMESH_ROOT_DIR}/bin/salome:\${PATH}
+    export LD_LIBRARY_PATH=\${SMESH_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${SMESH_ROOT_DIR}/bin/salome:\${SMESH_ROOT_DIR}/lib/salome:\${SMESH_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -30,6 +37,13 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export SMESH_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${SMESH_ROOT_DIR}/bin/salome:\${PATH}
+    export LD_LIBRARY_PATH=\${SMESH_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${SMESH_ROOT_DIR}/bin/salome:\${SMESH_ROOT_DIR}/lib/salome:\${SMESH_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
@@ -53,7 +67,7 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/SMESHbinariesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/SMESHbinariesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -64,7 +78,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="SmeshBin" ; fi
-export PRODUCT="SMESH_2.2.3"
+export PRODUCT="SMESH_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
index 1c23653d64939f81616ab4ff026055746e79da1a..243dd4590b485fe0c6a25b25a28c46667a3e95d9 100755 (executable)
@@ -5,7 +5,7 @@ if [ -n "${SMESH_SRC_DIR}" ]; then
     check_lib_version VERSION ${SMESH_SRC_DIR}/bin
     if [ "$?" -eq "0" ]; then
        ver=`cat ${SMESH_SRC_DIR}/bin/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "2.2.3" ]; then
+       if [ "$ver" = "2.2.4" ]; then
            return 0
        fi
     fi
@@ -48,7 +48,7 @@ install_source()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/SMESHsourcesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/SMESHsourcesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -64,7 +64,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="SmeshSrc" ; fi
-export PRODUCT="SMESH_SRC_2.2.3"
+export PRODUCT="SMESH_SRC_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
index 533dfb72067fb6afbbc0ed9469cd5f8a364d869e..cd4db614f4957ddae7a17c7dbacc07f2ea955b3f 100755 (executable)
@@ -5,7 +5,7 @@ if [ -n "${SUPERV_ROOT_DIR=}" ]; then
     check_lib_version VERSION ${SUPERV_ROOT_DIR}/bin/salome
     if [ "$?" -eq "0" ]; then
        ver=`cat ${SUPERV_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "2.2.3" ]; then
+       if [ "$ver" = "2.2.4" ]; then
            return 0
        fi
     fi
@@ -17,6 +17,13 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export SUPERV_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${SUPERV_ROOT_DIR}/bin/salome:\${PATH}
+    export LD_LIBRARY_PATH=\${SUPERV_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${SUPERV_ROOT_DIR}/bin/salome:\${SUPERV_ROOT_DIR}/lib/salome:\${SUPERV_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -30,6 +37,13 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export SUPERV_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${SUPERV_ROOT_DIR}/bin/salome:\${PATH}
+    export LD_LIBRARY_PATH=\${SUPERV_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${SUPERV_ROOT_DIR}/bin/salome:\${SUPERV_ROOT_DIR}/lib/salome:\${SUPERV_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
@@ -53,7 +67,7 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/SUPERVbinariesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/SUPERVbinariesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -64,7 +78,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="SupervBin" ; fi
-export PRODUCT="SUPERV_2.2.3"
+export PRODUCT="SUPERV_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
index e6e4f5dedd2d14acf9fbbf880635a682022049d3..cc505e5da82c5b6a1c8768fb48ccd1f7e90a574b 100755 (executable)
@@ -5,7 +5,7 @@ if [ -n "${SUPERV_SRC_DIR}" ]; then
     check_lib_version VERSION ${SUPERV_SRC_DIR}/bin
     if [ "$?" -eq "0" ]; then
        ver=`cat ${SUPERV_SRC_DIR}/bin/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "2.2.3" ]; then
+       if [ "$ver" = "2.2.4" ]; then
            return 0
        fi
     fi
@@ -48,7 +48,7 @@ install_source()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/SUPERVsourcesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/SUPERVsourcesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -64,7 +64,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="SupervSrc" ; fi
-export PRODUCT="SUPERV_SRC_2.2.3"
+export PRODUCT="SUPERV_SRC_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
diff --git a/config_files/SWIG-1.3.24.sh b/config_files/SWIG-1.3.24.sh
new file mode 100755 (executable)
index 0000000..566ae77
--- /dev/null
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+check_version(){
+if [ -n "`which swig 2>/dev/null`" ]; then
+    ver=`swig -version 2>&1 | grep -i version | awk '{ print $3 }' | sed -e 's/^\([0-9.]*\)\(.*\)/\1/'`
+    if [ "$ver" == "1.3.24" ] ;  then 
+       return 0;
+    fi
+fi
+return 1;
+}
+
+print_env()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM 
+export SWIG_ROOT=\${INSTALL_ROOT}/${PRODUCT}
+export PATH=\${SWIG_ROOT}/bin:\${PATH}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+swig_root="`find_in_path swig ${PATH}`"
+if [ -z "${swig_root}" ] ; then
+    swig_root="`find_in_path swig /usr/bin`"
+fi
+if [ -n "${swig_root}" ] ; then
+    swig_root=`cd ${swig_root}/..; pwd`
+    ver=`swig -version 2>&1 | grep -i version | awk '{ print $3 }' | sed -e 's/^\([0-9.]*\)\(.*\)/\1/'`
+    if [ "$ver" == "1.3.24" ] ;  then 
+       tmp="\${SWIG_ROOT}/bin ${swig_root}/bin \${PATH} ${PATH}";
+       path=`sort_path ${tmp}`
+       cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM 
+export SWIG_ROOT=${swig_root}
+export PATH=${path}
+#
+EOF
+       make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+       return 0;
+    fi
+fi
+return 1
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+return $?
+}
+
+install_source()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/swig-1.3.24.tar.gz -C ${INSTALL_WORK}
+cd ${PRODUCT_WORK}
+makedir ${PRODUCT_DIR}
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
+  ./configure --prefix=${PRODUCT_DIR} 
+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 
+
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
+rm -fr ${PRODUCT_WORK}
+print_env
+}
+
+install_binary()
+{
+echo "It impossible to install SWIG 1.3.24 from binaries, try to install it from sources."
+return 1
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INSTALL_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="swig" ; fi
+export PRODUCT="SWIG-1.3.24"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+$PROCEDURE
\ No newline at end of file
index c72c20edda07fd8a10c26909f018721fda188cd8..ca52e2be66200a0d5b890427b933b35d5d68ca95 100755 (executable)
@@ -5,7 +5,7 @@ if [ -n "${VISU_ROOT_DIR}" ]; then
     check_lib_version VERSION ${VISU_ROOT_DIR}/bin/salome
     if [ "$?" -eq "0" ]; then
        ver=`cat ${VISU_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "2.2.3" ]; then
+       if [ "$ver" = "2.2.4" ]; then
            return 0
        fi
     fi
@@ -17,6 +17,13 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export VISU_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${VISU_ROOT_DIR}/bin/salome:\${PATH}
+    export LD_LIBRARY_PATH=\${VISU_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${VISU_ROOT_DIR}/bin/salome:\${VISU_ROOT_DIR}/lib/salome:\${VISU_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -30,6 +37,13 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export VISU_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
+  if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
+    export PATH=\${VISU_ROOT_DIR}/bin/salome:\${PATH}
+    export LD_LIBRARY_PATH=\${VISU_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+    export PYTHONPATH=\${VISU_ROOT_DIR}/bin/salome:\${VISU_ROOT_DIR}/lib/salome:\${VISU_ROOT_DIR}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}
+  fi
+fi
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
@@ -53,7 +67,7 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/VISUbinariesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/VISUbinariesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -64,7 +78,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="VisuBin" ; fi
-export PRODUCT="VISU_2.2.3"
+export PRODUCT="VISU_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
index d8fd0302ff4f5c2b3caccfce0a9d6564c2d69811..66cba9cbe0970f37380ef4aeb818b5b1b87bc9f4 100755 (executable)
@@ -5,7 +5,7 @@ if [ -n "${VISU_SRC_DIR}" ]; then
     check_lib_version VERSION ${VISU_SRC_DIR}/bin
     if [ "$?" -eq "0" ]; then
        ver=`cat ${VISU_SRC_DIR}/bin/VERSION | awk -F: '{print $2}' | tr -d '[:space:]' ` 
-       if [ "$ver" = "2.2.3" ]; then
+       if [ "$ver" = "2.2.4" ]; then
            return 0
        fi
     fi
@@ -48,7 +48,7 @@ install_source()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/VISUsourcesV2.2.3.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/VISUsourcesV2.2.4.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -64,7 +64,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="VisuSrc" ; fi
-export PRODUCT="VISU_SRC_2.2.3"
+export PRODUCT="VISU_SRC_2.2.4"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
index 23d077ac5e713df0c665d052bc11565342c4951a..558939909594c4ab16c5f2bd466adcf6a30ac1ae 100755 (executable)
@@ -21,7 +21,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 export VTKHOME=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${VTKHOME}/bin:\${PATH}
 export LD_LIBRARY_PATH=\${VTKHOME}/lib/vtk:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${VTKHOME}/lib/vtk:\${VTKHOME}/lib/python2.2/site-packages/vtk_python:\${PYTHONPATH}
+export PYTHONPATH=\${VTKHOME}/lib/vtk:\${VTKHOME}/lib/python\${PYTHON_VERSION}/site-packages/vtk_python:\${PYTHONPATH}
 export TCLLIBPATH="\${VTKHOME}/lib/vtk/tcl \${TCLLIBPATH}"
 ##
 EOF
@@ -33,11 +33,12 @@ make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 try_native(){
 check_version
 if [ $? -eq 0 ] ; then
+    python_version="`python -c 'import sys; print sys.version[:3]'`"
     tmp="\${VTKHOME}/bin ${VTKHOME}/bin \${PATH} ${PATH}";  
     path=`sort_path ${tmp}`
     tmp="\${VTKHOME}/lib/vtk ${VTKHOME}/lib/vtk \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";  
     ld_library_path=`sort_path ${tmp}`
-    tmp="\${VTKHOME}/lib/vtk:\${VTKHOME}/lib/python2.2/site-packages/vtk_python ${VTKHOME}/lib/vtk:${VTKHOME}/lib/python2.2/site-packages/vtk_python \${PYTHONPATH} ${PYTHONPATH}";  
+    tmp="\${VTKHOME}/lib/vtk:\${VTKHOME}/lib/python${PYTHON_VERSION}/site-packages/vtk_python ${VTKHOME}/lib/vtk:${VTKHOME}/lib/python${python_version}/site-packages/vtk_python \${PYTHONPATH} ${PYTHONPATH}";  
     python_path=`sort_path ${tmp}`
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
@@ -77,6 +78,10 @@ check_job ${PRODUCT_DIR}/MAKEcmake.LOG make
 check_jb tar xfz ${SOURCE_DIR}/VTK-4.2-LatestRelease.tar.gz -C ${INSTALL_WORK}
 cd ${PRODUCT_WORK}
 
+# get Python and tcl/tk version
+python_version="`python -c 'import sys; print sys.version[:3]'`"
+tcl_version="`find ${TCLHOME}/lib -name 'libtcl*.so' | awk '/libtcl[0-9.]+.so/ { print $0}' | sed -e 's%^.*libtcl\([0-9\.]*\)\.so%\1%'`"
+    
 VTK_CMAKE_OPTIONS=""
 ### common VTK settings
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
@@ -90,18 +95,18 @@ VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_PATENTED:BOOL=OFF"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_RENDERING:BOOL=ON"
 ### Wrap Python settings
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_WRAP_PYTHON:BOOL=ON"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_EXECUTABLE:STRING=${PYTHONHOME}/bin/python2.2"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_INCLUDE_PATH:STRING=${PYTHONHOME}/include/python2.2"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHONHOME}/lib/python2.2/config/libpython2.2.a"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_EXECUTABLE:STRING=${PYTHONHOME}/bin/python${python_version}"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_INCLUDE_PATH:STRING=${PYTHONHOME}/include/python${python_version}"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHONHOME}/lib/python${python_version}/config/libpython${python_version}.a"
 ### Wrap Tcl settings
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=ON"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_INCLUDE_PATH:STRING=${TCLHOME}/include"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_LIBRARY:STRING=${TCLHOME}/lib/libtcl.so"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_STUB_LIBRARY:STRING=${TCLHOME}/lib/libtclstub.a"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_LIBRARY:STRING=${TCLHOME}/lib/libtcl${tcl_version}.so"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_STUB_LIBRARY:STRING=${TCLHOME}/lib/libtclstub${tcl_version}.a"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_TCLSH:STRING=${TCLHOME}/bin/tclsh"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_INCLUDE_PATH:STRING=${TCLHOME}/include"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_LIBRARY:STRING=${TCLHOME}/lib/libtk.so"
-VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_STUB_LIBRARY:STRING=${TCLHOME}/lib/libtkstub.a"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_LIBRARY:STRING=${TCLHOME}/lib/libtk${tcl_version}.so"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_STUB_LIBRARY:STRING=${TCLHOME}/lib/libtkstub${tcl_version}.a"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_WISH:STRING=${TCLHOME}/bin/wish"
 ### if Mesa is pre-installed
 if [ -n "$MESA_HOME" ]; then
@@ -130,7 +135,7 @@ check_job ${PRODUCT_DIR}/SETUPPYTHON.LOG python setup.py install --prefix=${PROD
 rm -fr ${PRODUCT_WORK} ${INSTALL_WORK}/cmake-1.6.6
 
 # set correct symbolic links - bug of python wrappings installation
-cd ${PRODUCT_DIR}/lib/python2.2/site-packages/vtk_python
+cd ${PRODUCT_DIR}/lib/python${python_version}/site-packages/vtk_python
 ln -sf ../../../vtk/*Python*.so .
 
 print_env
diff --git a/config_files/VTK-4.2.6.sh b/config_files/VTK-4.2.6.sh
new file mode 100755 (executable)
index 0000000..ccc4baa
--- /dev/null
@@ -0,0 +1,174 @@
+#!/bin/sh
+
+check_version()
+{
+if [ -z "$VTKHOME" ]; then
+   return 1 
+fi
+check_lib_version libvtkCommon.so ${VTKHOME}/lib/vtk
+if [ "$?" -eq "0" ]; then
+   return 0
+fi
+return 1
+}
+
+print_env()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export VTKHOME=\${INSTALL_ROOT}/${PRODUCT}
+export PATH=\${VTKHOME}/bin:\${PATH}
+export LD_LIBRARY_PATH=\${VTKHOME}/lib/vtk:\${LD_LIBRARY_PATH}
+export PYTHONPATH=\${VTKHOME}/lib/vtk:\${VTKHOME}/lib/python\${PYTHON_VERSION}/site-packages/vtk_python:\${PYTHONPATH}
+export TCLLIBPATH="\${VTKHOME}/lib/vtk/tcl \${TCLLIBPATH}"
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+check_version
+if [ $? -eq 0 ] ; then
+    python_version="`python -c 'import sys; print sys.version[:3]'`"
+    tmp="\${VTKHOME}/bin ${VTKHOME}/bin \${PATH} ${PATH}";  
+    path=`sort_path ${tmp}`
+    tmp="\${VTKHOME}/lib/vtk ${VTKHOME}/lib/vtk \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";  
+    ld_library_path=`sort_path ${tmp}`
+    tmp="\${VTKHOME}/lib/vtk:\${VTKHOME}/lib/python${PYTHON_VERSION}/site-packages/vtk_python ${VTKHOME}/lib/vtk:${VTKHOME}/lib/python${python_version}/site-packages/vtk_python \${PYTHONPATH} ${PYTHONPATH}";  
+    python_path=`sort_path ${tmp}`
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export VTKHOME=${VTKHOME}
+export PATH=${path}
+export LD_LIBRARY_PATH=${ld_library_path}
+export PYTHONPATH=${python_path}
+export TCLLIBPATH="\${VTKHOME}/lib/vtk/tcl \${TCLLIBPATH}"
+##
+EOF
+    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+    return 0
+fi
+return 1;
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+return $?
+}
+
+install_source()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+makedir ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/cmake-1.6.6.tar.gz -C ${INSTALL_WORK}
+cd ${INSTALL_WORK}/cmake-1.6.6
+check_job ${PRODUCT_DIR}/CONFIGUREcmake.LOG ./configure
+cat >> ${PRODUCT_DIR}/MAKEcmake.LOG <<EOF
+used gcc=$GCC
+EOF
+check_job ${PRODUCT_DIR}/MAKEcmake.LOG make
+
+check_jb tar xfz ${SOURCE_DIR}/VTK-4.2.6.tar.gz -C ${INSTALL_WORK}
+cd ${PRODUCT_WORK}
+
+# apply a small patch for VTK (needed for gcc-3.4)
+sed -e "s%seekg(self->GetFile()->tellg()%seekg(static_cast<long>(self->GetFile()->tellg())%g" IO/vtkBMPReader.cxx > IO/vtkBMPReader.cxx.orig
+mv -f IO/vtkBMPReader.cxx.orig IO/vtkBMPReader.cxx
+sed -e "s%seekg(self->GetFile()->tellg()%seekg(static_cast<long>(self->GetFile()->tellg())%g" IO/vtkImageReader.cxx > IO/vtkImageReader.cxx.orig
+mv -f IO/vtkImageReader.cxx.orig IO/vtkImageReader.cxx
+
+# get Python and tcl/tk version
+python_version="`python -c 'import sys; print sys.version[:3]'`"
+tcl_version="`find ${TCLHOME}/lib -name 'libtcl*.so' | awk '/libtcl[0-9.]+.so/ { print $0}' | sed -e 's%^.*libtcl\([0-9\.]*\)\.so%\1%'`"
+    
+VTK_CMAKE_OPTIONS=""
+### common VTK settings
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DCMAKE_CXX_COMPILER:STRING=`which g++`"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DCMAKE_C_COMPILER:STRING=`which gcc`"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_DIR}"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_HYBRID:BOOL=ON"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_PARALLEL:BOOL=ON"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_PATENTED:BOOL=OFF" 
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_RENDERING:BOOL=ON"
+### Wrap Python settings
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_WRAP_PYTHON:BOOL=ON"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_EXECUTABLE:STRING=${PYTHONHOME}/bin/python${python_version}"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_INCLUDE_PATH:STRING=${PYTHONHOME}/include/python${python_version}"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHONHOME}/lib/python${python_version}/config/libpython${python_version}.a"
+### Wrap Tcl settings
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=ON"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_INCLUDE_PATH:STRING=${TCLHOME}/include"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_LIBRARY:STRING=${TCLHOME}/lib/libtcl${tcl_version}.so"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_STUB_LIBRARY:STRING=${TCLHOME}/lib/libtclstub${tcl_version}.a"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_TCLSH:STRING=${TCLHOME}/bin/tclsh"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_INCLUDE_PATH:STRING=${TCLHOME}/include"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_LIBRARY:STRING=${TCLHOME}/lib/libtk${tcl_version}.so"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_STUB_LIBRARY:STRING=${TCLHOME}/lib/libtkstub${tcl_version}.a"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTK_WISH:STRING=${TCLHOME}/bin/wish"
+### if Mesa is pre-installed
+if [ -n "$MESA_HOME" ]; then
+  VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_INCLUDE_DIR:STRING=${MESA_HOME}/include"
+  VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_gl_LIBRARY:STRING=${MESA_HOME}/lib/libGL.so"
+  VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_glu_LIBRARY:STRING=${MESA_HOME}/lib/libGLU.so"
+  VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DOPENGL_xmesa_INCLUDE_DIR:STRING=${MESA_HOME}/include"
+fi
+
+cat > ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF
+used VTK settings:
+$VTK_CMAKE_OPTIONS
+EOF
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ${INSTALL_WORK}/cmake-1.6.6/Source/cmake . $VTK_CMAKE_OPTIONS
+
+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_WORK}/Wrapping/Python
+check_job ${PRODUCT_DIR}/SETUPPYTHON.LOG python setup.py install --prefix=${PRODUCT_DIR}
+
+rm -fr ${PRODUCT_WORK} ${INSTALL_WORK}/cmake-1.6.6
+
+# set correct symbolic links - bug of python wrappings installation
+cd ${PRODUCT_DIR}/lib/python${python_version}/site-packages/vtk_python
+ln -sf ../../../vtk/*Python*.so .
+
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
+rm -fr ${PRODUCT_WORK}
+print_env
+}
+
+install_binary()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+if [ -n "$MESA_HOME" ]; then
+  check_jb tar xfz ${SOURCE_DIR}/VTK-4.2.6-with-Mesa.tar.gz -C ${INSTALL_ROOT}
+else
+  check_jb tar xfz ${SOURCE_DIR}/VTK-4.2.6.tar.gz -C ${INSTALL_ROOT}
+fi
+
+print_env
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INSTALL_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="vtk" ; fi
+export PRODUCT="VTK-4.2.6"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+$PROCEDURE 
index 7410799c69313ad6974ff44907332ada4fbef1c0..917e4840b8033b18b658c367f272756d81aabc01 100755 (executable)
@@ -88,10 +88,50 @@ if [ $# -eq 3 ] ; then
     product_env=${install_work}/env_${product_name}.sh
     (test -e ${product_env} && rm ${product_env} )
 fi
-### !!! writing salome.sh file !!! -> add global functions
+### !!! writing salome.sh file !!!  -> define INSTALL_ROOT
 cat >> ${install_work}/$SHRC <<EOF
+#${DELIM} Setting products installation directory ${DELIM}
 export INSTALL_ROOT=${install_root}
 
+#${DELIM} Environment switch: 0 for SALOME building, 1 for SALOME launching ${DELIM}
+export ENV_FOR_LAUNCH=1
+
+EOF
+### !!! The next is for RedHat 9 only !!! 
+if [ -f /etc/redhat-release ] ; then
+  grep -e "Red Hat Linux release 9" /etc/redhat-release > /dev/null
+  if [ $? -eq 0 ] ; then
+    cat >> ${install_work}/$SHRC <<EOF
+#${DELIM} Force RH9 to use old implementation of threads ${DELIM}
+export LD_ASSUME_KERNEL=2.4.18
+
+EOF
+  fi
+fi
+### !!! writing salome.csh file !!! -> set inital variables
+pre_vars="PATH LD_LIBRARY_PATH LD_RUN_PATH PYTHONPATH TCLLIBPATH"
+for i in $pre_vars ; do
+cat >> ${install_work}/$CSHRC <<EOF
+#${DELIM} setting initial ${i} ${DELIM}
+if (! (\$?${i}) ) then
+  setenv $i
+endif
+
+EOF
+done
+
+### !!! writing salome.(c)sh files !!! -> dump products environment files, changing 'export' by 'setenv(a|p)' where necessary
+### Note, that for performance reasons temporary environment files used during installation procedure itself
+### are created without using setenv(a|p) aliases.
+
+# 1. first dump all environment files into the $SHRC file
+product_sequence="$2"
+for i in $product_sequence ; do
+    cat ${install_work}/env_${i}.sh >> ${install_work}/$SHRC 2>/dev/null
+done
+
+# 2. writing global functions to _salome.sh file
+cat >> ${install_work}/_$SHRC <<EOF
 ##########################################################################
 # Functions exporta and exportp are used to append/prepend correspondingly 
 # one directory or a set of directories separated by semicolon symbol (':')
@@ -112,7 +152,8 @@ export INSTALL_ROOT=${install_root}
 cleandup() {
 out_var=\`echo \$1 \$2 | awk -v dir=\$3 '{                   \\
     na = split(\$2,a,":");                                \\
-    nb = split(\$1,b,":");                                \\
+    if ( \$1 == "<empty>") nb = split("",b,":");          \\
+    else nb = split(\$1,b,":");                           \\
     s = "" ;                                             \\
     for(i=1;i<=nb;i++) {                                 \\
        if(!(b[i] in ccc)) {                             \\
@@ -144,6 +185,7 @@ echo \$out_var
 # to the variable (first parameter)
 exporta () { 
 xenv=\`printenv \$1\`
+if [ -z "\$xenv" ]; then xenv="<empty>"; fi
 out_var=\`cleandup \$xenv \$2 0\`
 export \$1=\$out_var
 }
@@ -152,16 +194,16 @@ export \$1=\$out_var
 # to the variable (first parameter)
 exportp () { 
 xenv=\`printenv \$1\`
+if [ -z "\$xenv" ]; then xenv="<empty>"; fi
 out_var=\`cleandup \$xenv \$2 1\`
 export \$1=\$out_var
 }
 ###########################################################################
 
 EOF
-### !!! writing salome.csh file !!! -> add global aliases
-cat >> ${install_work}/$CSHRC <<EOF
-setenv INSTALL_ROOT ${install_root}
 
+# 3. writing global functions to _salome.csh file
+cat >> ${install_work}/_$CSHRC <<EOF
 ###########################################################################
 # Aliases setenva and setenvp are used to append/prepend correspondingly 
 # one directory or a set of directories separated by semicolon symbol (':')
@@ -226,41 +268,41 @@ alias setenvp 'set a=\!:1 ; set b=\!:2 ;  \\
 ###########################################################################
 
 EOF
-### !!! writing salome.csh file !!! -> set inital variables
-pre_vars="PATH LD_LIBRARY_PATH LD_RUN_PATH PYTHONPATH TCLLIBPATH"
-for i in $pre_vars ; do
-cat >> ${install_work}/$CSHRC <<EOF
-#$DELIM $i : initial settings $DELIM
-if (! (\$?${i}) ) then
-  setenv $i
-endif
-EOF
-done
-### !!! writing salome.(c)sh files !!! -> dump products environment files, changing 'export' by 'setenv(a|p)' where necessary
-product_sequence="$2"
-for i in $product_sequence ; do
-    sed -e 's%^export\([[:blank:]]*\)PATH=\$[{]\?PATH[}]\?:\(.*\)%exporta\1PATH \2%g' -e 's%^export\([[:blank:]]*\)PATH=\(.*\):\$[{]\?PATH[}]\?%exportp\1PATH \2%g' ${install_work}/env_${i}.sh > ${INSTALL_WORK}/_tmp1 2>/dev/null
-    sed -e 's%^export\([[:blank:]]*\)LD_LIBRARY_PATH=\$[{]\?LD_LIBRARY_PATH[}]\?:\(.*\)%exporta\1LD_LIBRARY_PATH \2%g' -e 's%^export\([[:blank:]]*\)LD_LIBRARY_PATH=\(.*\):\$[{]\?LD_LIBRARY_PATH[}]\?%exportp\1LD_LIBRARY_PATH \2%g' ${INSTALL_WORK}/_tmp1 > ${INSTALL_WORK}/_tmp2 2>/dev/null
-    sed -e 's%^export\([[:blank:]]*\)PYTHONPATH=\$[{]\?PYTHONPATH[}]\?:\(.*\)%exporta\1PYTHONPATH \2%g' -e 's%^export\([[:blank:]]*\)PYTHONPATH=\(.*\):\$[{]\?PYTHONPATH[}]\?%exportp\1PYTHONPATH \2%g' ${INSTALL_WORK}/_tmp2 > ${INSTALL_WORK}/_tmp1 2>/dev/null
-    sed -e 's%^export\([[:blank:]]*\)LD_RUN_PATH=\$[{]\?LD_RUN_PATH[}]\?:\(.*\)%exporta\1LD_RUN_PATH \2%g' -e 's%^export\([[:blank:]]*\)LD_RUN_PATH=\(.*\):\$[{]\?LD_RUN_PATH[}]\?%exportp\1LD_RUN_PATH \2%g' ${INSTALL_WORK}/_tmp1 > ${INSTALL_WORK}/_tmp2 2>/dev/null
-    cat ${INSTALL_WORK}/_tmp2 >> ${install_work}/$SHRC 2>/dev/null
-    
-    sed -e 's%^export \([[:alnum:]_[:blank:]]*\)\=%setenv \1 %g' ${INSTALL_WORK}/_tmp2 > ${INSTALL_WORK}/_tmp1 2>/dev/null
-    sed -e 's%^exporta \([[:alnum:]_[:blank:]]*\)%setenva \1%g' ${INSTALL_WORK}/_tmp1 > ${INSTALL_WORK}/_tmp2 2>/dev/null
-    sed -e 's%^exportp \([[:alnum:]_[:blank:]]*\)%setenvp \1%g' ${INSTALL_WORK}/_tmp2 > ${INSTALL_WORK}/_tmp1 2>/dev/null
-    cat ${INSTALL_WORK}/_tmp1 >> ${install_work}/$CSHRC 2>/dev/null
+cat ${install_work}/$CSHRC >> ${install_work}/_$CSHRC
+
+# 4. put the contents of salome.sh to _salome.sh replacing export by export(a|p) aliases where necessary
+sed -e 's%export\([[:blank:]]*\)PATH=\$[{]\?PATH[}]\?:\(.*\)%exporta\1PATH \2%g' -e 's%export\([[:blank:]]*\)PATH=\(.*\):\$[{]\?PATH[}]\?%exportp\1PATH \2%g' ${install_work}/$SHRC > ${INSTALL_WORK}/_tmp1 2>/dev/null
+sed -e 's%export\([[:blank:]]*\)LD_LIBRARY_PATH=\$[{]\?LD_LIBRARY_PATH[}]\?:\(.*\)%exporta\1LD_LIBRARY_PATH \2%g' -e 's%export\([[:blank:]]*\)LD_LIBRARY_PATH=\(.*\):\$[{]\?LD_LIBRARY_PATH[}]\?%exportp\1LD_LIBRARY_PATH \2%g' ${INSTALL_WORK}/_tmp1 > ${INSTALL_WORK}/_tmp2 2>/dev/null
+sed -e 's%export\([[:blank:]]*\)PYTHONPATH=\$[{]\?PYTHONPATH[}]\?:\(.*\)%exporta\1PYTHONPATH \2%g' -e 's%export\([[:blank:]]*\)PYTHONPATH=\(.*\):\$[{]\?PYTHONPATH[}]\?%exportp\1PYTHONPATH \2%g' ${INSTALL_WORK}/_tmp2 > ${INSTALL_WORK}/_tmp1 2>/dev/null
+sed -e 's%export\([[:blank:]]*\)LD_RUN_PATH=\$[{]\?LD_RUN_PATH[}]\?:\(.*\)%exporta\1LD_RUN_PATH \2%g' -e 's%export\([[:blank:]]*\)LD_RUN_PATH=\(.*\):\$[{]\?LD_RUN_PATH[}]\?%exportp\1LD_RUN_PATH \2%g' ${INSTALL_WORK}/_tmp1 > ${INSTALL_WORK}/_tmp2
+cat ${INSTALL_WORK}/_tmp2 >> ${install_work}/_$SHRC
+
+# 5. Create a salome.csh file from salome.sh by replacing export by setenv, etc.
+sed -e 's%export \([[:alnum:]_[:blank:]]*\)\=%setenv \1 %g' ${install_work}/$SHRC > ${INSTALL_WORK}/_tmp1 2>/dev/null
+cat ${INSTALL_WORK}/_tmp1 >> ${install_work}/$CSHRC
+
+# 6. Create a _salome.csh file from _salome.sh by replacing export by setenv, exporta by setenva, etc.
+sed -e 's%export \([[:alnum:]_[:blank:]]*\)\=%setenv \1 %g' ${INSTALL_WORK}/_tmp2 > ${INSTALL_WORK}/_tmp1 2>/dev/null
+sed -e 's%exporta \([[:alnum:]_[:blank:]]*\)%setenva \1%g'  ${INSTALL_WORK}/_tmp1 > ${INSTALL_WORK}/_tmp2 2>/dev/null
+sed -e 's%exportp \([[:alnum:]_[:blank:]]*\)%setenvp \1%g'  ${INSTALL_WORK}/_tmp2 > ${INSTALL_WORK}/_tmp1 2>/dev/null
+sed -e 's%if \[ -n "\${ENV_FOR_LAUNCH}" \] ; then%if ( ${?ENV_FOR_LAUNCH} ) then%g' ${INSTALL_WORK}/_tmp1 > ${INSTALL_WORK}/_tmp2 2>/dev/null
+sed -e 's%if \[ "\${ENV_FOR_LAUNCH}" == "1" \] ; then%if ( "\${ENV_FOR_LAUNCH}" == "1" ) then%g' ${INSTALL_WORK}/_tmp2 > ${INSTALL_WORK}/_tmp1 2>/dev/null
+sed -e 's%^\([[:blank:]]*\)fi\([[:blank:]]*\)$%\1endif\2%g' ${INSTALL_WORK}/_tmp1 > ${INSTALL_WORK}/_tmp2 2>/dev/null
+cat ${INSTALL_WORK}/_tmp2 >> ${install_work}/_$CSHRC 2>/dev/null
 
-    rm -f ${INSTALL_WORK}/_tmp1 ${INSTALL_WORK}/_tmp2
-done 
+rm -f ${INSTALL_WORK}/_tmp1 ${INSTALL_WORK}/_tmp2
 
 if [ $# -eq 4 ] ; then
     product_dir=$4
     if [ -e ${product_dir} ] ; then
-       cp -f ${install_work}/$SHRC ${install_work}/$CSHRC ${product_dir}/.
+       cp -f ${install_work}/_$SHRC  ${product_dir}/$SHRC
+       cp -f ${install_work}/_$CSHRC ${product_dir}/$CSHRC
     fi
 fi
-cp -f ${install_work}/$CSHRC ${install_root}/env_products.csh
-cp -f ${install_work}/$SHRC ${install_root}/env_products.sh
+sed -e 's%setenv ENV_FOR_LAUNCH 1%setenv ENV_FOR_LAUNCH 0%' ${install_work}/_$CSHRC > ${install_root}/env_products.csh
+sed -e 's%export ENV_FOR_LAUNCH=1%export ENV_FOR_LAUNCH=0%' ${install_work}/_$SHRC  > ${install_root}/env_products.sh
+rm -f ${install_work}/_$SHRC
+rm -f ${install_work}/_$CSHRC
 ### !!! copying build.csh script
 if [ -e ./build.csh ]; then
     cp -f ./build.csh ${install_root}
index 0fe4380e0b76adf6109b881d30d433aaf7f5f692..2aaf2f329cedaf5e04577cd029b2b48cfc85ab4f 100755 (executable)
@@ -15,9 +15,12 @@ if [ "$?" -ne "0" ]; then
    return 1
 fi
 check_lib_version doxywizard $PATH
-if [ "$?" -eq "0" ]; then
-   #echo "The product ${PRODUCT} has been already installed on yours system"
-   return 0
+if [ "$?" -ne "0" ]; then
+   return 1
+fi
+ver=`doxygen --version`
+if [ "$ver" == "1.3-rc2" ]; then
+    return 0
 fi
 return 1
 }
diff --git a/config_files/doxygen-1.3.7.sh b/config_files/doxygen-1.3.7.sh
new file mode 100755 (executable)
index 0000000..96175b9
--- /dev/null
@@ -0,0 +1,84 @@
+#!/bin/sh
+
+check_version()
+{
+check_lib_version doxygen $PATH
+if [ "$?" -ne "0" ]; then
+   return 1
+fi
+check_lib_version doxytag $PATH
+if [ "$?" -ne "0" ]; then
+   return 1
+fi
+check_lib_version doxywizard $PATH
+if [ "$?" -ne "0" ]; then
+   return 1
+fi
+ver=`doxygen --version`
+if [ "$ver" == "1.3.7" ]; then
+    return 0
+fi
+return 1
+}
+
+print_env()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export PATH=\${INSTALL_ROOT}/${PRODUCT}/bin:\${PATH}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+check_version
+if [ $? -eq 0 ] ; then
+    doxygen="`find_in_path doxygen ${PATH}`"
+    tmp="${doxygen} ${doxygen} \${PATH} ${PATH}";  
+    path=`sort_path ${tmp}`
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export PATH=${path}
+##
+EOF
+    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+    return 0
+fi
+return 1;
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+return $?
+}
+
+install_source()
+{
+echo "The installation of doxygen 1.3.7 from sources is not provided! Use native doxygen."
+return 1
+}
+
+install_binary()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/doxygen-1.3.7.tar.gz -C ${INSTALL_ROOT}
+
+print_env
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INSTALL_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="doxygen" ; fi
+export PRODUCT="doxygen-1.3.7"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+$PROCEDURE 
diff --git a/config_files/gcc-3.4.sh b/config_files/gcc-3.4.sh
new file mode 100755 (executable)
index 0000000..db364ac
--- /dev/null
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+check_version(){
+# version number is calculated as: <major>*10000+<minor>*100+<release>
+# e.g. for gcc 3.2 it is equal to 30200, for gcc 3.4.1 - 30401
+gcc_ver=`gcc -dumpversion | awk -F. '{v1=0;v2=0;v3=0;if(NF>0)v1=$1;if(NF>1)v2=$2;if(NF>2)v3=$3;print v1*10000+v2*100+v3}'`
+if [ $gcc_ver -eq 30401 ]  ; then
+    return 0
+fi
+return 1
+}
+
+print_env(){
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export GCC_ROOT=\${INSTALL_ROOT}/${PRODUCT}
+export CXX=\${GCC_ROOT}/bin/g++
+export CC=\${GCC_ROOT}/bin/gcc
+export PATH=\${GCC_ROOT}/bin:\${PATH}
+export LD_LIBRARY_PATH=\${GCC_ROOT}/lib:\${LD_LIBRARY_PATH}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+gcc_root="`find_in_path gcc ${PATH}`"
+if [ -z "${gcc_root}" ] ; then
+    gcc_root="`find_in_path gcc /usr/bin`"
+fi
+if [ -n "${gcc_root}" ] ; then
+    gcc_root=`cd ${gcc_root}/..; pwd`
+    # get version number: <major>, <minor> and <release>
+    # <major> and <minor> numbers are checked strickly, but <release> number can be larger than required one
+    # version number is calculated as: <major>*10000+<minor>*100+<release>
+    # e.g. for gcc 3.2 it is equal to 30200, for gcc 3.4.1 - 30401
+    maj_ver=`gcc -dumpversion | awk -F. '{if(NF>0) print $1; else print 0}'`
+    min_ver=`gcc -dumpversion | awk -F. '{if(NF>1) print $2; else print 0}'`
+    rel_ver=`gcc -dumpversion | awk -F. '{if(NF>2) print $3; else print 0}'`
+    let gcc_ver=$maj_ver*10000+$min_ver*100+$rel_ver
+    if [ $gcc_ver -ge 30401 ]  ; then
+       tmp="\${GCC_ROOT}/bin ${gcc_root}/bin \${PATH} ${PATH}";  
+       path=`sort_path ${tmp}`
+       tmp="\${GCC_ROOT}/lib ${gcc_root}/lib \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";  
+       ld_library_path=`sort_path ${tmp}`
+       cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export GCC_ROOT=${gcc_root}
+export CXX=\${GCC_ROOT}/bin/g++
+export CC=\${GCC_ROOT}/bin/gcc
+export PATH=${path}
+export LD_LIBRARY_PATH=${ld_library_path}
+##
+EOF
+       make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+#######       THIS COULD BE USED FOR STRICT COMPARISON  ##############################
+#      if [ $maj_ver -eq 3 ] && [ $min_ver -eq 4 ] && [ $rel_ver -eq 1 ] ;  then 
+######################################################################################
+       if [ $maj_ver -eq 3 ] && [ $min_ver -eq 4 ] && [ $rel_ver -ge 1 ] ;  then 
+           return 0
+       else
+           return 2
+       fi
+   fi
+fi
+return 1
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+return $?
+}
+
+install_source()
+{
+echo "The installation of gcc 3.4.1 from sources is not provided! Use native gcc."
+return 1
+}
+
+install_binary()
+{
+echo "The installation of gcc 3.4.1 from binaries is not provided! Use native gcc."
+return 1
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INSTALL_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="gcc" ; fi
+export PRODUCT="gcc-3.4.1"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+$PROCEDURE 
\ No newline at end of file
index ef4a872227725c4735be070f7bb331b095ec25b8..b047817e79375857cd2897f6f34a2c1bec26dc3e 100755 (executable)
@@ -2,10 +2,12 @@
 
 check_version()
 {
-check_lib_version dot ${PATH}
-if [ "$?" -eq "0" ]; then
-   #echo "The product ${PRODUCT} has been already installed on yours system"
-   return 0
+isdot=`which dot 2>/dev/null`
+if [ -n isdot ]; then
+  ver=`dot -V 2>&1 | awk '{print $3}'`
+  if [ "$ver" == "1.9" ]; then
+    return 0
+  fi
 fi
 return 1
 }
diff --git a/config_files/graphviz-2.2.1.sh b/config_files/graphviz-2.2.1.sh
new file mode 100755 (executable)
index 0000000..a3880fb
--- /dev/null
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+check_version()
+{
+isdot=`which dot 2>/dev/null`
+if [ -n isdot ]; then
+  ver=`dot -V 2>&1 | awk '{print $3}'`
+  if [ "$ver" == "2.2.1" ]; then
+    return 0
+  fi
+fi
+return 1
+}
+
+print_env()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export PATH=\${INSTALL_ROOT}/${PRODUCT}/bin:\${PATH}
+export LD_LIBRARY_PATH=\${INSTALL_ROOT}/${PRODUCT}/lib/graphviz:\${LD_LIBRARY_PATH}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+check_version
+if [ $? -eq 0 ] ; then
+    dot="`find_in_path dot ${PATH}`"
+    dot=`cd ${dot}/..; pwd`
+    tmp="${dot}/bin ${dot}/bin \${PATH} ${PATH}";  
+    path=`sort_path ${tmp}`
+    tmp="${dot}/lib/graphviz ${dot}/lib/graphviz \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";  
+    ld_library_path=`sort_path ${tmp}`
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export PATH=${path}
+export LD_LIBRARY_PATH=${ld_library_path}
+##
+EOF
+    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+    return 0
+fi
+return 1;
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+return $?
+}
+
+install_source()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/graphviz-2.2.1.tar.gz -C ${INSTALL_WORK}
+
+cd ${PRODUCT_WORK}
+makedir ${PRODUCT_DIR}
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG configure --prefix=${PRODUCT_DIR} --with-tcl=${TCLHOME} --disable-rpath 
+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
+
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
+rm -fr ${PRODUCT_WORK}
+print_env
+}
+
+install_binary()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/graphviz-2.2.1.tar.gz -C ${INSTALL_ROOT}
+
+print_env
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INSTALL_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="graphviz" ; fi
+export PRODUCT="graphviz-2.2.1"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+$PROCEDURE 
diff --git a/config_files/hdf5-1.6.3.sh b/config_files/hdf5-1.6.3.sh
new file mode 100755 (executable)
index 0000000..bd56c8e
--- /dev/null
@@ -0,0 +1,110 @@
+#!/bin/sh
+
+check_version()
+{
+if [ -z "$HDF5HOME" ]; then
+    return 1 
+fi
+check_lib_version libhdf5.so.0.0.0 ${HDF5HOME}/lib
+if [ "$?" -ne "0" ]; then
+    return 1
+fi
+check_lib_version libhdf5.settings ${HDF5HOME}/lib
+if [ "$?" -eq "0" ]; then
+    ver=`grep "HDF5 Version:" ${HDF5HOME}/lib/libhdf5.settings | awk '{print $3}'` 
+    if [ "$ver" = "1.6.3" ]; then 
+       return 0
+    fi
+fi
+return 1
+}
+
+print_env()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export HDF5HOME=\${INSTALL_ROOT}/${PRODUCT}
+export PATH=\${HDF5HOME}/bin:\$PATH
+export LD_LIBRARY_PATH=\${HDF5HOME}/lib:\${LD_LIBRARY_PATH}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+check_version
+if [ $? -eq 0 ] ; then
+    tmp="\${HDF5HOME}/bin ${HDF5HOME}/bin \${PATH} ${PATH}";  
+    path=`sort_path ${tmp}`
+    tmp="\${HDF5HOME}/lib ${HDF5HOME}/lib \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";  
+    ld_library_path=`sort_path ${tmp}`
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export HDF5HOME=${HDF5HOME}
+export PATH=${path}
+export LD_LIBRARY_PATH=${ld_library_path}
+##
+EOF
+    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+    return 0
+fi
+return 1;
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+return $?
+}
+
+install_source()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/hdf5-1.6.3.tar.gz -C ${INSTALL_WORK}
+cd ${PRODUCT_WORK}
+makedir ${PRODUCT_DIR}
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
+    ./configure --prefix=${PRODUCT_DIR} -disable-debug --enable-production --enable-threadsafe --enable-hdf5v1_2 \
+       --enable-stream-vfd --disable-hsizet --with-pthread=/usr/include,/usr/lib 
+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
+
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
+rm -fr ${PRODUCT_WORK}
+print_env
+}
+
+install_binary()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/hdf5-1.6.3.tar.gz -C ${INSTALL_ROOT}
+
+### modify libhdf5.la file to correct direct path to hdf5 library
+### no need to do this for sources installation because 'make install' does it!
+cd ${PRODUCT_DIR}/lib
+sed -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" libhdf5.la > libhdf5.la.new
+mv -f libhdf5.la.new libhdf5.la
+
+print_env
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INSTALL_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="hdf" ; fi
+export PRODUCT="hdf5-1.6.3"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+$PROCEDURE 
index a1e379a8084d7503f13e79c3e91152490b63e95c..85cf5b736b54970a530ef237255a14cc34e62b43 100755 (executable)
@@ -71,8 +71,9 @@ used gcc=$GCC
 EOF
 
 check_job ${PRODUCT_DIR}/MAKE.LOG make
-check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
+check_job ${PRODUCT_DIR}/INSTALL.LOG make install
 
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK}
 
 ### modify libmed.la libmedC.la files to correct direct path to hdf5 library
diff --git a/config_files/netgen-4.3.sh b/config_files/netgen-4.3.sh
new file mode 100755 (executable)
index 0000000..2df6bd4
--- /dev/null
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+check_version()
+{
+# check existance of netgen
+# unfortunarely we can't find anything about netgen version
+if [ -n "$NETGENROOT" ]; then
+  return 0
+fi
+return 1
+}
+
+print_env()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export NETGENHOME=\${INSTALL_ROOT}/${PRODUCT}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+check_version
+if [ $? -eq 0 ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export NETGENHOME=\${NETGENROOT}
+##
+EOF
+    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+    return 0
+fi
+return 1;
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+return $?
+}
+
+install_source()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+makedir ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/netgen-4.3.tar.gz -C ${INSTALL_WORK}
+
+export MACHINE=LINUX
+
+for directory in csg general geom2d gprim interface linalg meshing opti stlgeom ; do
+    cd ${PRODUCT_WORK}/libsrc/${directory}
+    check_job ${PRODUCT_DIR}/MAKE.LOG make
+done
+
+mkdir -p ${PRODUCT_DIR}/lib/LINUX
+cp -f ${PRODUCT_WORK}/lib/LINUX/* ${PRODUCT_DIR}/lib/LINUX
+mkdir -p ${PRODUCT_DIR}/include
+cp -f ${PRODUCT_WORK}/libsrc/interface/nglib.h ${PRODUCT_DIR}/include
+
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
+rm -fr ${PRODUCT_WORK}
+print_env
+}
+
+install_binary()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/netgen-4.3.tar.gz -C ${INSTALL_ROOT}
+
+print_env
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INSTALL_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="netgen" ; fi
+export PRODUCT="netgen-4.3"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+$PROCEDURE 
diff --git a/config_files/netgen-4.4.sh b/config_files/netgen-4.4.sh
new file mode 100755 (executable)
index 0000000..7758e58
--- /dev/null
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+check_version()
+{
+# check existance of netgen
+# unfortunarely we can't find anything about netgen version
+if [ -n "$NETGENROOT" ]; then
+  return 0
+fi
+return 1
+}
+
+print_env()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export NETGENHOME=\${INSTALL_ROOT}/${PRODUCT}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+check_version
+if [ $? -eq 0 ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export NETGENHOME=\${NETGENROOT}
+##
+EOF
+    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+    return 0
+fi
+return 1;
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+return $?
+}
+
+install_source()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+makedir ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/netgen-4.4.tar.gz -C ${INSTALL_WORK}
+
+export MACHINE=LINUX
+
+for directory in csg general geom2d gprim interface linalg meshing opti stlgeom ; do
+    cd ${PRODUCT_WORK}/libsrc/${directory}
+    check_job ${PRODUCT_DIR}/MAKE.LOG make
+done
+
+mkdir -p ${PRODUCT_DIR}/lib/LINUX
+cp -f ${PRODUCT_WORK}/lib/LINUX/* ${PRODUCT_DIR}/lib/LINUX
+mkdir -p ${PRODUCT_DIR}/include
+cp -f ${PRODUCT_WORK}/libsrc/interface/nglib.h ${PRODUCT_DIR}/include
+
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
+rm -fr ${PRODUCT_WORK}
+print_env
+}
+
+install_binary()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/netgen-4.4.tar.gz -C ${INSTALL_ROOT}
+
+print_env
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INSTALL_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="netgen" ; fi
+export PRODUCT="netgen-4.4"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+$PROCEDURE 
diff --git a/config_files/netgen4.3.sh b/config_files/netgen4.3.sh
deleted file mode 100755 (executable)
index 9387512..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-
-check_version()
-{
-# check existance of netgen
-# unfortunarely we can't find anything about netgen version
-if [ -n "$NETGENROOT" ]; then
-  return 0
-fi
-return 1
-}
-
-print_env()
-{
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export NETGENHOME=\${INSTALL_ROOT}/${PRODUCT}
-##
-EOF
-(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
-}
-
-# looks for the native product and collects it's environment (used by make_env())
-try_native(){
-check_version
-if [ $? -eq 0 ] ; then
-    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
-#$DELIM ${PRODUCT_TYPE} $DELIM
-export NETGENHOME=\${NETGENROOT}
-##
-EOF
-    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
-    return 0
-fi
-return 1;
-}
-
-try_preinstalled(){
-try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
-return $?
-}
-
-install_source()
-{
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-makedir ${PRODUCT_DIR}
-
-check_jb tar xfz ${SOURCE_DIR}/netgen4.3.tar.gz -C ${INSTALL_WORK}
-
-export MACHINE=LINUX
-
-for directory in csg general geom2d gprim interface linalg meshing opti stlgeom ; do
-    cd ${PRODUCT_WORK}/libsrc/${directory}
-    check_job ${PRODUCT_DIR}/MAKE.LOG make
-done
-
-mkdir -p ${PRODUCT_DIR}/lib/LINUX
-cp -f ${PRODUCT_WORK}/lib/LINUX/* ${PRODUCT_DIR}/lib/LINUX
-mkdir -p ${PRODUCT_DIR}/include
-cp -f ${PRODUCT_WORK}/libsrc/interface/nglib.h ${PRODUCT_DIR}/include
-
-rm -fr ${PRODUCT_WORK}
-print_env
-}
-
-install_binary()
-{
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
-source ${INSTALL_WORK}/$SHRC
-
-check_jb tar xfz ${SOURCE_DIR}/netgen4.3.tar.gz -C ${INSTALL_ROOT}
-
-print_env
-}
-
-export PROCEDURE=$1;
-export INSTALL_WORK=$2;
-export SOURCE_DIR=$3;
-export INSTALL_ROOT=$4;
-export PRODUCT_SEQUENCE=$5;
-if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="netgen" ; fi
-export PRODUCT="netgen4.3"
-export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
-export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
-source ./common.sh
-$PROCEDURE 
diff --git a/config_files/omniORB-4.0.5.sh b/config_files/omniORB-4.0.5.sh
new file mode 100755 (executable)
index 0000000..e5f0223
--- /dev/null
@@ -0,0 +1,160 @@
+#!/bin/sh
+
+check_version()
+{
+if [ -z "${OMNIORBDIR}" ]; then
+   #echo "OMNIORBDIR doesn't set"
+   return 1
+fi
+python_version="`python -c 'import sys; print sys.version[:3]'`"
+check_lib_version libomniORB4.so.0.5 ${OMNIORBDIR}/lib
+if [ "$?" -ne "0" ]; then
+   return 1
+fi
+check_lib_version _omnipymodule.so.2.4 ${OMNIORBDIR}/lib/python${python_version}/site-packages
+if [ "$?" -ne "0" ]; then
+   return 1
+fi
+check_lib_version libCOSNotify4.so.0.1 ${OMNIORBDIR}/lib
+if [ "$?" -ne "0" ]; then
+   return 1
+fi
+check_lib_version notifd ${OMNIORBDIR}/bin
+if [ "$?" -ne "0" ]; then
+   return 1
+fi
+return 0
+}
+
+print_env()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export OMNIORBDIR=\${INSTALL_ROOT}/${PRODUCT}
+export OMNIORB_CONFIG=\${OMNIORBDIR}/.omniORB.cfg
+export PYTHONPATH=\${OMNIORBDIR}/lib:\${OMNIORBDIR}/lib/python\${PYTHON_VERSION}/site-packages:\${PYTHONPATH}
+export PATH=\$OMNIORBDIR/bin:\$PATH
+export LD_LIBRARY_PATH=\$OMNIORBDIR/lib:\$LD_LIBRARY_PATH 
+##
+EOF
+cat > ${PRODUCT_DIR}/.omniORB.cfg <<EOF
+InitRef = NameService=corbaname::`hostname`:2810
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+check_version
+if [ $? -eq 0 ] ; then
+    python_version="`python -c 'import sys; print sys.version[:3]'`"
+    tmp="\${OMNIORBDIR}/bin ${OMNIORBDIR}/bin \${PATH} ${PATH}";  
+    path=`sort_path ${tmp}`
+    tmp="\${OMNIORBDIR}/lib ${OMNIORBDIR}/lib \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";  
+    ld_library_path=`sort_path ${tmp}`
+    tmp="\${OMNIORBDIR}/lib:\${OMNIORBDIR}/lib/python\${PYTHON_VERSION}/site-packages ${OMNIORBDIR}/lib:${OMNIORBDIR}/lib/python${python_version}/site-packages \${PYTHONPATH} ${PYTHONPATH}";  
+    pythonpath=`sort_path ${tmp}`
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export OMNIORBDIR=${OMNIORBDIR}
+export OMNIORB_CONFIG=\${OMNIORBDIR}/.omniORB.cfg
+export PYTHONPATH=${pythonpath}
+export PATH=${path}
+export LD_LIBRARY_PATH=${ld_library_path}
+##
+EOF
+    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+    return 0
+fi
+return 1;
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+return $?
+}
+
+install_source()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+makedir ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/omniORB-4.0.5.tar.gz -C ${INSTALL_WORK}
+check_jb tar xfz ${SOURCE_DIR}/omniORBpy-2.5.tar.gz -C ${INSTALL_WORK}
+check_jb tar xfz ${SOURCE_DIR}/omniNotify-2.1.tar.gz -C ${INSTALL_WORK}
+
+# install omniORB
+cd ${INSTALL_WORK}/omniORB-4.0.5
+mkdir build
+cd build
+
+check_job ${PRODUCT_DIR}/CONFIGURE_OMNIORB.LOG \
+    ../configure --prefix=${PRODUCT_DIR}
+
+GCC=`which gcc`
+cat >> ${PRODUCT_DIR}/MAKE_OMNIORB.LOG <<EOF
+used gcc=$GCC
+EOF
+check_job ${PRODUCT_DIR}/MAKE_OMNIORB.LOG make
+check_job ${PRODUCT_DIR}/INSTALL_OMNIORB.LOG make install
+
+# install omniORBpy
+cd ${INSTALL_WORK}/omniORBpy-2.5
+mkdir build
+cd build
+
+check_job ${PRODUCT_DIR}/CONFIGURE_OMNIORBPY.LOG \
+    ../configure --prefix=${PRODUCT_DIR}
+
+GCC=`which gcc`
+cat >> ${PRODUCT_DIR}/MAKE_OMNIORBPY.LOG <<EOF
+used gcc=$GCC
+EOF
+check_job ${PRODUCT_DIR}/MAKE_OMNIORBPY.LOG make
+check_job ${PRODUCT_DIR}/INSTALL_OMNIORBPY.LOG make install
+
+# install omniNotify
+cd ${INSTALL_WORK}/omniNotify
+mkdir build
+cd build
+
+check_job ${PRODUCT_DIR}/CONFIGURE_OMNINOTIFY.LOG \
+    ../configure --prefix=${PRODUCT_DIR}
+
+GCC=`which gcc`
+cat >> ${PRODUCT_DIR}/MAKE_OMNINOTIFY.LOG <<EOF
+used gcc=$GCC
+EOF
+check_job ${PRODUCT_DIR}/MAKE_OMNINOTIFY.LOG make
+check_job ${PRODUCT_DIR}/INSTALL_OMNINOTIFY.LOG make install
+
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
+rm -fr ${PRODUCT_WORK}
+print_env
+}
+
+install_binary()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/omniORB-4.0.5.tar.gz -C ${INSTALL_ROOT}
+
+ln -s ${PRODUCT_DIR} ${INSTALL_ROOT}/omni
+print_env
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INSTALL_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="omni" ; fi
+export PRODUCT="omniORB-4.0.5"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+$PROCEDURE 
diff --git a/config_files/qt-3.3.3.sh b/config_files/qt-3.3.3.sh
new file mode 100755 (executable)
index 0000000..46316d2
--- /dev/null
@@ -0,0 +1,95 @@
+#!/bin/sh
+
+check_version(){
+if [ -z "$QTDIR" ]; then
+   return 1
+fi
+ver=`grep "QT_VERSION_STR" ${QTDIR}/include/qglobal.h | sed -e 's%^#define QT_VERSION_STR\([[:space:]]*\)%%g' -e 's%\"%%g'`
+if [ "$ver" == "3.3.3" ] ; then
+    return 0
+fi
+return 1
+}
+
+print_env()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export QTDIR=\${INSTALL_ROOT}/${PRODUCT}
+export PATH=\${QTDIR}/bin:\$PATH 
+export LD_LIBRARY_PATH=\${QTDIR}/lib:\${LD_LIBRARY_PATH}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+qtdir="`find_in_path libqt-mt.so.3.3.3 ${LD_LIBRARY_PATH}`"
+if [ -z "${qtdir}" ] ; then
+    qtdir="`find_in_path libqt-mt.so.3.3.3 /usr/lib/qt3`"
+fi
+if [ -n "${qtdir}" ] ; then
+    qtdir=`cd ${qtdir}/..; pwd`
+    moc="`find_in_path moc ${qtdir}/bin`"
+    uic="`find_in_path uic ${qtdir}/bin`"
+    if [ -n "${moc}" ] && [ -n "${uic}" ] ; then
+       tmp="\${QTDIR}/bin ${qtdir}/bin \${PATH} ${PATH}";  
+       path=`sort_path ${tmp}`
+       tmp="\${QTDIR}/lib ${qtdir}/lib \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";  
+       ld_library_path=`sort_path ${tmp}`
+       cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export QTDIR=${qtdir}
+export PATH=${path}
+export LD_LIBRARY_PATH=${ld_library_path}
+##
+EOF
+       make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+       return 0
+    fi
+fi
+return 1
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+return $?
+}
+
+install_source()
+{
+echo "The installation of Qt 3.3.3 from sources is not provided! Use native Qt."
+return 1
+}
+
+install_binary()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/qt-3.3.3.tar.gz -C ${INSTALL_ROOT}
+
+cd ${PRODUCT_DIR}/lib
+sed -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" libqt-mt.la > libqt-mt.la.new
+mv -f libqt-mt.la.new libqt-mt.la
+cd ${PRODUCT_DIR}/bin
+sed -e "s%export QTDIR=\(.*\)%export QTDIR=${PRODUCT_DIR}%g" designer > designer.new
+mv -f designer.new designer
+chmod 755 designer
+
+print_env
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INSTALL_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="qt" ; fi
+export PRODUCT="qt-3.3.3"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+$PROCEDURE 
index 7c5d00f5e174fe328dc51ab9891e2e9a2da5a3ab..17c177d1ab9b709d74fa86437552558a1b72b1a6 100755 (executable)
@@ -4,8 +4,8 @@ check_version(){
 if [ -z "$QTDIR" ]; then
    return 1
 fi
-check_lib_version libqt-mt.so.3.0.5 ${QTDIR}/lib
-if [ "$?" -eq "0" ] ; then
+ver=`grep "QT_VERSION_STR" ${QTDIR}/include/qglobal.h | sed -e 's%^#define QT_VERSION_STR\([[:space:]]*\)%%g' -e 's%\"%%g'`
+if [ "$ver" == "3.0.5" ] ; then
     return 0
 fi
 return 1
diff --git a/config_files/qwt-4.2.0.sh b/config_files/qwt-4.2.0.sh
new file mode 100755 (executable)
index 0000000..6ceebaf
--- /dev/null
@@ -0,0 +1,95 @@
+#!/bin/sh
+
+check_version()
+{
+if [ -n "${QWTHOME}" ]; then
+    check_lib_version libqwt.so.4.2.0 ${QWTHOME}/lib
+    if [ "$?" -eq "0" ]; then
+       return 0
+    fi
+fi
+return 1
+}
+
+print_env()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export QWTHOME=\${INSTALL_ROOT}/${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 ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+qwthome="`find_in_path libqwt.so.4.2.0 ${LD_LIBRARY_PATH}`"
+if [ -n "${qwthome}" ] ; then
+    qwthome=`cd ${qwthome}/..; pwd`
+    tmp="\${QWTHOME}/lib ${QWTHOME}/lib \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";  
+    ld_library_path=`sort_path ${tmp}`
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export QWTHOME=${qwthome}
+export LD_LIBRARY_PATH=${ld_library_path}
+##
+EOF
+    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+    return 0
+fi
+return 1
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+return $?
+}
+
+install_source()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfj ${SOURCE_DIR}/qwt-4.2.0.tar.bz2 -C ${INSTALL_WORK}
+cd ${PRODUCT_WORK}
+makedir ${PRODUCT_DIR}
+
+qmake qwt.pro -o Makefile
+
+GCC=`which gcc`
+cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF
+used gcc=$GCC
+EOF
+
+check_job ${PRODUCT_DIR}/MAKE.LOG make 
+cp -rf include lib ${PRODUCT_DIR}
+
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
+rm -rf ${PRODUCT_WORK}
+
+print_env
+}
+
+install_binary()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/qwt-4.2.0.tar.gz -C ${INSTALL_ROOT}
+
+print_env
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INSTALL_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="qwt" ; fi
+export PRODUCT="qwt-4.2.0"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+$PROCEDURE 
index 31bf63b1b5fc7591f5a6051704bbdb255fccf47a..d37a97eca30ecbdead71bd2806efcb67c6048180 100755 (executable)
@@ -2,13 +2,10 @@
 
 check_version()
 {
-if [ -n "$SIPDIR" ]; then
-    check_lib_version sip ${SIPDIR}
-    if [ "$?" -eq "0" ]; then
-       check_lib_version libsip.so.9.1.0 ${SIPDIR}
-       if [ "$?" -eq "0" ]; then
-           return 0
-       fi
+if [ -n "${SIPDIR}" ]; then
+    sip_ver=`${SIPDIR}/sip -V | awk '{print $1}'`
+    if [ "$sip_ver" == "3.3.2" ]; then
+       return 0
     fi
 fi
 return 1
@@ -19,8 +16,8 @@ print_env()
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export SIPDIR=\${INSTALL_ROOT}/${PRODUCT}
-export PYTHONPATH=\${SIPDIR}:\${PYTHONPATH}
 export PATH=\${SIPDIR}:\${PATH}
+export PYTHONPATH=\${SIPDIR}:\${PYTHONPATH}
 export LD_LIBRARY_PATH=\${SIPDIR}:\${LD_LIBRARY_PATH}
 ##
 EOF
@@ -35,9 +32,10 @@ if [ -z "${sipdir}" ] ; then
     sipdir="`find_in_path sip /usr/bin`"
 fi
 if [ -n "${sipdir}" ] ; then
+    python_version="`python -c 'import sys; print sys.version[:3]'`"
     sippython="`find_in_path libsip.so.9.1.0 ${PYTHONPATH}`"
     if [ -z "${sippython}" ] ; then
-       sippython="`find_in_path libsip.so.9.1.0 /usr/lib/python2.2/site-packages`"
+       sippython="`find_in_path libsip.so.9.1.0 /usr/lib/python${python_version}/site-packages`"
     fi
     if [ -n ${sippython} ]; then
        tmp="${sipdir} ${sipdir} \${PATH} ${PATH}";  
diff --git a/config_files/sip-4.1.sh b/config_files/sip-4.1.sh
new file mode 100755 (executable)
index 0000000..64c64ee
--- /dev/null
@@ -0,0 +1,110 @@
+#!/bin/sh
+
+check_version()
+{
+if [ -n "${SIPDIR}" ]; then
+    sip_ver=`${SIPDIR}/sip -V | awk '{print $1}'`
+    if [ "$sip_ver" == "4.1" ]; then
+       return 0
+    fi
+fi
+return 1
+}
+
+print_env()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export SIPDIR=\${INSTALL_ROOT}/${PRODUCT}
+export PATH=\${SIPDIR}:\${PATH}
+export PYTHONPATH=\${SIPDIR}:\${PYTHONPATH}
+export LD_LIBRARY_PATH=\${SIPDIR}:\${LD_LIBRARY_PATH}
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+sipdir="`find_in_path sip ${PATH}`"
+if [ -z "${sipdir}" ] ; then
+    sipdir="`find_in_path sip /usr/bin`"
+fi
+if [ -n "${sipdir}" ] ; then
+    python_version="`python -c 'import sys; print sys.version[:3]'`"
+    sippython="`find_in_path sip.so ${PYTHONPATH}`"
+    if [ -z "${sippython}" ] ; then
+        sippython="`find_in_path sip.so /usr/lib/python${python_version}/site-packages`"
+    fi
+    if [ -n ${sippython} ]; then
+        tmp="${sipdir} ${sipdir} \${PATH} ${PATH}";
+        path=`sort_path ${tmp}`
+        tmp="${sipdir} ${sipdir} \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";
+        ld_library_path=`sort_path ${tmp}`
+        tmp="${sippython} ${sippython} \${PYTHONPATH} ${PYTHONPATH}";
+        pythonpath=`sort_path ${tmp}`
+        cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export PATH=${path}
+export PYTHONPATH=${pythonpath}
+export LD_LIBRARY_PATH=${ld_library_path}
+##
+EOF
+        make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+        return 0
+    fi
+fi
+return 1
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+return $?
+}
+
+install_source()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+makedir ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/sip-4.1.tar.gz -C ${INSTALL_WORK}
+cd ${PRODUCT_WORK}
+
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
+    python configure.py -b ${PRODUCT_DIR} -d ${PRODUCT_DIR} -e ${PRODUCT_DIR} -v ${PRODUCT_DIR} -l qt-mt 
+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
+
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
+rm -fr ${PRODUCT_WORK}
+print_env
+}
+
+install_binary()
+{
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+check_jb tar xfz ${SOURCE_DIR}/sip-4.1.tar.gz -C ${INSTALL_ROOT}
+
+print_env
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INSTALL_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="sip" ; fi
+export PRODUCT="sip-4.1"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+$PROCEDURE 
diff --git a/config_files/tcltk8.4.5.sh b/config_files/tcltk8.4.5.sh
new file mode 100755 (executable)
index 0000000..541e559
--- /dev/null
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+check_version()
+{
+if [ -z "$TCLHOME" ]; then
+   echo "TCLHOME doesn't set"
+   return 1
+fi
+
+check_lib_version tclsh8.4 ${TCLHOME}/bin
+if [ "$?" -ne "0" ]; then
+      return 1
+fi
+
+check_lib_version wish8.4 ${TCLHOME}/bin
+if [ "$?" -ne "0" ]; then
+      return 1
+fi
+
+check_lib_version libtcl8.4.so
+if [ "$?" -ne "0" ]; then
+      return 1
+fi
+
+check_lib_version libtk8.4.so
+if [ "$?" -ne "0" ]; then
+      return 1
+fi
+
+echo "The product ${PRODUCT} has been already installed on yours system"
+return 0
+}
+
+print_env()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export TCLHOME=\${INSTALL_ROOT}/${PRODUCT}
+export PATH=\${TCLHOME}/bin:\${PATH}
+export LD_LIBRARY_PATH=\${TCLHOME}/lib:\${LD_LIBRARY_PATH}
+export TCLLIBPATH="\${TCLHOME}/lib \${TCLHOME}/lib/tcl8.4 \${TCLHOME}/lib/tk8.4 \${TCLLIBPATH}"
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+}
+
+# looks for the native product and collects it's environment (used by make_env())
+try_native(){
+tclhome="`find_in_path tclsh ${PATH}`"
+if [ -z "${tclhome}" ] ; then
+    tclhome="`find_in_path tclsh /usr/bin`"
+fi
+if [ -n "${tclhome}" ] ; then
+    tclhome=`cd ${tclhome}/..; pwd`
+    tmp="\${TCLHOME}/bin ${tclhome}/bin \${PATH} ${PATH}";  
+    path=`sort_path ${tmp}`
+    tmp="\${TCLHOME}/lib ${tclhome}/lib \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";  
+    ld_library_path=`sort_path ${tmp}`
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export TCLHOME=${tclhome}
+export PATH=${path}
+export LD_LIBRARY_PATH=${ld_library_path}
+export TCLLIBPATH="\${TCLHOME}/lib \${TCLHOME}/lib/tcl8.4 \${TCLHOME}/lib/tk8.4 \${TCLLIBPATH}"
+##
+EOF
+    (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+    make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
+    return 0
+fi
+return 1;
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+return $?
+}
+
+install_source()
+{
+echo "The installation of tcl/tk 8.4.5 from sources is not provided! Use native tcl/tk."
+return 1
+}
+
+install_binary()
+{
+echo "The installation of tcl/tk 8.4.5 from binaries is not provided! Use native tcl/tk."
+return 1
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INSTALL_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="tcl" ; fi
+export PRODUCT="tcltk8.4.5"
+export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+source ./common.sh
+$PROCEDURE 
index cd9423ed483ebc4cddd72b4245d1deab367c72af..af41a070d0d9a843bed8b88f5dcd668dfd44d1b0 100755 (executable)
Binary files a/doc/choicepage.png and b/doc/choicepage.png differ
index cbe0a7d7e42aaa4684eb5b6904b9e09b3b5f3a0c..a7ff7960fac0aa72aabb4689e8ea56ab1c8b6a4c 100755 (executable)
Binary files a/doc/productpage.png and b/doc/productpage.png differ
index 4e72a8878fa48508ad4b73e8fbb0c386d2bffca8..4efe9187c3b6a81a42eb192758a43a4f7525d91f 100755 (executable)
Binary files a/doc/progresspage.png and b/doc/progresspage.png differ
index b7403796a8459166418884bd48187e6ccaf058f8..fbdec4ba179788b04390c4ae37270e302c264e72 100755 (executable)
@@ -10,7 +10,7 @@
        
   <meta name="Author"
  content="Vadim SANDLER (v-sandler@opencascade.com)">
-  <title>SALOME v2.2.0 Installation Wizard Help</title>
+  <title>SALOME v2.2.x Installation Wizard Help</title>
 </head>
   <body style="color: rgb(0,0,0); background-color: rgb(255,255,229);"
  link="#0000ee" vlink="#551a8b" alink="#ff0000">
@@ -41,7 +41,7 @@
 </table>
   </center>
    
-<div align="right"><b><font color="#000099">updated for the version 2.2.0</font></b></div>
+<div align="right"><b><font color="#000099">updated for the version 2.2.4</font></b></div>
    
 <hr>  
 <ul>
@@ -95,9 +95,9 @@ configuration xml file.<br>
  </p>
    
 <p>The installation procedure can support some different Linux platforms
-(currently it provides only configuration scripts for <i>RedHat-8.0</i>)
-and various number of products. <br>
-  The using of configuration xml files gives flexible way to modify the list 
+and various number of products. Currently the basic target platform is <i>Linux RedHat 8.0</i>. 
+From SALOME version 2.2.4 Installation Wizard also supports <i>Linux Mandrake 10.1</i>.<br>
+The using of configuration xml files gives flexible way to modify the list 
 of products to be installed by the Installation Wizard without changing program's 
 source code. Just create your own configuration file and implement installation 
 scripts for products you want to be provided by Wizard. See <a
@@ -145,16 +145,20 @@ This feature can be switched off by clicking <i>"Auto set prerequisites products
  checkbox. <br>
   Special button in the right part of the page - <i>"Unselect All" </i>-
 allows to reset quickly all products to the <i>"not install"</i> state. <br>
-  If you want to use native Linux Red Hat 8.0 products (these are gcc, tcl, 
+  If you want to use native products (for example, for Linux Red Hat 8.0 these are gcc, tcl, 
 Python, Qt, Sip and PyQt), select <i>"use native" </i>option. </p>
-   
+
+<p>There are also two checkboxes on this page: <i>"SALOME sources"</i> and <i>"SALOME binaries"</i>.
+These three-state checkboxes allow quick selecting/unselecting SALOME packages
+for the installation.</p>
+
 <p>The box at the right side of the page displays the information about currently 
 highlighted product: name, version, short description (if provided), required
 disk space, temporary files disk space, list of prerequisites and user choice.
 </p>
    
 <center><a name="ProductPage"></a><br>
-  <img src="productpage.png" height="558" width="599" alt="">
+  <img src="productpage.png" height="551" width="567" alt="">
    
 <p><b>Figure 1:</b> "Installation settings" page in the advanced mode</p>
   </center>
@@ -165,7 +169,7 @@ on the hard drive is required for installation of selected products. <br>
  disk space is approximate and may differ when you install products on your
  hard drive. </p>
    
-<p>Installation procedure uses a special directory to store temporary files.
+<p>The installation procedure uses a special directory to store temporary files.
  The <i>"Space for temporary files:"</i> field shows the information about
  required disk space on the hard drive for extracting and compiling of the
  selected products. You can change the default directory - just type path
@@ -193,7 +197,7 @@ wizard will follow to the next page: </p>
    
 <center>  
 <p><a name="ChoicePage"></a><br>
-  <img src="choicepage.png" height="558" width="599" alt="">
+  <img src="choicepage.png" height="551" width="567" alt="">
  </p>
    
 <p><b>Figure 2:</b> "Check your choice" page</p>
@@ -205,7 +209,7 @@ wizard will follow to the next page: </p>
 follow to the <a href="#ProgressPage">next page</a>. </p>
    
 <center><a name="ProgressPage"></a><br>
-  <img src="progresspage.png" height="558" width="599" alt="">
+  <img src="progresspage.png" height="551" width="567" alt="">
    
 <p><b>Figure 3:</b> "Installation progress" page</p>
   </center>
@@ -238,7 +242,7 @@ or click <i>"Next"</i> button to go the Readme page: </p>
    
 <center>  
 <p><a name="readmepage"></a><br>
-  <img src="readmepage.png" height="558" width="599" alt="">
+  <img src="readmepage.png" height="551" width="567" alt="">
  </p>
    
 <p><b>Figure 4:</b> "Finish installation" page</p>
@@ -267,7 +271,7 @@ and <span style="font-style: italic;"><span style="font-weight: bold;">KERNEL mo
 products version</font> procedure</h3>
   Unfortunately under Linux platform there is no exact algorithm to identify
  the product's version. The table below contains the information relating
-to checking preinstalled products for the Linux RedHat 8.0 platform <br>
+to checking preinstalled products for the Linux RedHat 8.0 platform. <br>
   &nbsp;  
 <table border="1" width="100%" nosave="">
     <tbody>
@@ -307,7 +311,7 @@ to checking preinstalled products for the Linux RedHat 8.0 platform <br>
   existence of libtkx8.3.so</td>
         <td>set TCLHOME if you have preinstalled version of tcl. <br>
   set LD_LIBRARY_PATH on a directory where libs can be found.</td>
-        <td>It is recommended to use native tcl on Linux RedHat 8.0</td>
+        <td>It is recommended to use native tcl/tk on Linux RedHat 8.0</td>
       </tr>
       <tr>
        <td valign="top">boost 1.30.2<br>
@@ -325,11 +329,12 @@ BOOST from binaries.<br>
      <tr>
         <td>Open CASCADE 5.2<br>
         </td>
-        <td>existence of CASROOT environment variable</td>
+        <td>existence of CASROOT environment variable<br>ver_major=`grep "!define OCC_VERSION_MAJOR" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'`<br>
+ver_minor=`grep "!define OCC_VERSION_MINOR" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'`<br>
+ver="$ver_major.$ver_minor"<br>
+</td>
         <td>set CASROOT if you have preinstalled version of Open CASCADE</td>
-        <td>Unfortunately we can't say anything exactly about CASCADE 5.2 
-and we only check CASROOT environment variable. If you have problem with
-preinstalled version of Open CASCADE, reinstall it</td>
+        <td>CASCADE's Standard_Version.hxx file provides version information.</td>
       </tr>
      <tr>
         <td>Patch for Open CASCADE 5.2<br>
@@ -337,8 +342,8 @@ preinstalled version of Open CASCADE, reinstall it</td>
         <td></td>
         <td></td>
         <td>Open CASCADE 5.2 provided with the Installation Wizard already includes the patch,
-necessary for SALOME 2.2.0. In addition the Installation Wizard provides the sources of a Open CASCADE patch
-which can be applied to original Open CASCADE 5.2. sources before compilation.</td>
+necessary for SALOME 2.2.x. In addition the Installation Wizard provides the sources of a Open CASCADE patch
+which can be applied to original Open CASCADE 5.2 sources before its compilation.</td>
       </tr>
       <tr>
         <td>Python 2.2.1</td>
@@ -371,9 +376,9 @@ to use OpenGL drivers installed on your computer locally. This check procedure
       <tr>
         <td>Qt 3.0.5</td>
         <td>existence of QTDIR <br>
-  existence of libqt-mt.so.3.0.5</td>
+  ver=`grep "QT_VERSION_STR" ${QTDIR}/include/qglobal.h | sed -e 's%^#define QT_VERSION_STR\([[:space:]]*\)%%g' -e 's%\"%%g'`</td>
         <td>set QTDIR if you have preinstalled version of qt</td>
-        <td>We try to find libqt-mt.so.3.0.5 in ${QTDIR}/lib folder. <br>
+        <td>Qt's qglobal.h file provides version information: ver should be 3.0.5.<br>
   You should set MESA_HOME only if you have preinstalled version of Mesa
 3.4.2.       <br>
   It is recommended to use native Qt on Linux RedHat 8.0</td>
@@ -389,7 +394,7 @@ to use OpenGL drivers installed on your computer locally. This check procedure
         <td>Hdf 5-1.4.4</td>
         <td>existence of HDF5HOME <br>
   existence of libhdf5.so.0.0.0 <br>
-  existence of libhdf5.settings</td>
+  existence of libhdf5.settings<br>ver=`grep "HDF5 Version:" ${HDF5HOME}/lib/libhdf5.settings | awk '{print $3}'`</td>
         <td>set HDF5HOME if you have preinstalled version of hdf</td>
         <td>We try to find libhdf5.so.0.0.0 and libhdf5.settings in ${HDF5HOME}/lib
  folder. <br>
@@ -453,24 +458,16 @@ folder.</td>
       </tr>
       <tr>
         <td>Numeric 22.0</td>
-        <td>existence of Numeric folder <br>
-  existence of _numpy.so</td>
-        <td>set PYTHONHOME if you have preinstalled version of python</td>
-        <td>Unfortunately we can't check the version number. <br>
-  We try to find Numeric folder in ${PYTHONHOME}/lib/python2.2/site-packages/Numeric
- folder. <br>
-  If you have problem with preinstalled version of numeric 22.0 reinstall
-it.</td>
+        <td>ver=`python -c 'import Numeric; print Numeric.__version__' 2>/dev/null`</td>
+        <td>set PYTHONHOME if you have preinstalled version of Numeric package</td>
+        <td>If you have problem with preinstalled version of numeric 22.0 reinstall it.</td>
       </tr>
       <tr>
         <td>Sip 3.3.2</td>
-        <td>existence of SIPDIR <br>
-  existence of sip <br>
-  existence of libsip.so.9.1.0</td>
+        <td>existence of SIPDIR <br>sip_ver=`${SIPDIR}/sip -V | awk '{print $1}'`</td>
         <td>set SIPDIR to directory where you have sip preinstalled</td>
-        <td>We try to find sip and libsip.so.9.1.0 in $SIPDIR folder if you 
-set SIPDIR , otherwise searching is done using $PATH and $LD_LIBRARY_PATH
- accordingly. <br>
+        <td>Searching for the sip binary is performed in the folder pointed by the $SIPDIR variable if it is set
+and then by using $PATH variable. <br>
   It is recommended to use native Sip on Linux RedHat 8.0</td>
       </tr>
       <tr>
@@ -489,8 +486,8 @@ otherwise searching is done using $LD_LIBRARY_PATH . <br>
         <td>HappyDoc 2.1</td>
         <td>existence of happydoc <br>
   ver=`happydoc | grep "HappyDoc version 2.1"`</td>
-        <td>set PYTHONHOME if you have preinstalled version of python</td>
-        <td>We try to find happydoc in $PYTHONHOME/bin folder. <br>
+        <td>set PATH variable to the directory where you have HappyDoc installed.</td>
+        <td>We try to find happydoc in $PATH. <br>
   ver should not be empty. <br>
   This product is not obligatory. It was added only for your comfort.</td>
       </tr>
@@ -499,22 +496,21 @@ otherwise searching is done using $LD_LIBRARY_PATH . <br>
         <td>existence of doxygen <br>
   existence of doxysearch <br>
   existence of doxytag <br>
-  existence of doxywizard</td>
+  existence of doxywizard<br>ver=`doxygen --version`</td>
         <td>set QTDIR if you have preinstalled version of qt <br>
   set PATH on a directory where doxygen, doxysearch, doxytag and doxywizard
  can be found</td>
-        <td>Unfortunately we can't check the version number. <br>
-  It's necessary to have compiled Qt in order to build doxywizard. <br>
+        <td>doxygen, doxysearch, doxytag, doxywizard binaries should exist; ver should be 1.3-rc2.<br>
+It's necessary to have compiled Qt in order to build doxywizard. <br>
   If you have problem with preinstalled version of doxygen 1.3-rc2 reinstall
  it. <br>
   This product is not obligatory. It was added only for your comfort.</td>
       </tr>
       <tr>
         <td>Graphviz 1.9</td>
-        <td>existence of dot</td>
+        <td>existence of dot binary.<br>ver=`dot -V 2>&1 | awk '{print $3}'`</td>
         <td>add GraphViz's bin directory to the PATH environment variable</td>
-        <td>Unfortunately we can't check the version number. <br>
-  We try to find dot program in the $PATH</td>
+        <td>We try to find dot program in the $PATH.</td>
       </tr>
       <tr>
         <td>MODULE binaries<br>
@@ -525,8 +521,8 @@ otherwise searching is done using $LD_LIBRARY_PATH . <br>
   ver=`cat $MODULE_ROOT_DIR/bin/salome/VERSION | awk -F: '{print $2}' | tr 
 -d '[:space:]'`</td>
         <td>set MODULE_ROOT_DIR if you have preinstalled binaries of MODULE
- version 2.2.0</td>
-        <td>MODULE binaries should exist and ver should be equal to 2.2.0</td>
+ version 2.2.4</td>
+        <td>MODULE binaries should exist and ver should be equal to 2.2.4</td>
       </tr>
       <tr>
         <td>MODULE sources<br>
@@ -536,8 +532,8 @@ otherwise searching is done using $LD_LIBRARY_PATH . <br>
   existence of VERSION file <br>
   ver=`cat $MODULE_SRC/bin/VERSION | awk -F: '{print $2}' | tr -d '[:space:]'`</td>
         <td>set MODULE_SRC_DIR if you have preinstalled sources of MODULE
-version  2.2.0</td>
-        <td>MODULE sources should exist and ver should be equal to 2.2.0</td>
+version  2.2.4</td>
+        <td>MODULE sources should exist and ver should be equal to 2.2.4</td>
       </tr>
        
   </tbody>  
@@ -557,8 +553,8 @@ should coincide with prerequisite. Release number can be larger. It is done for
 to use native products for newer versions of Red Hat (for example, Linux Red Hat 9 includes native
 gcc 3.2.2 installation).
 If native product has version number larger than that required by installation procedure,
-you will be prompted by the warning message like this: "You have newer version of gcc installed
-on your computer than that is required (3.2). Continue?". You can press "Yes" button
+you will be prompted by the warning message like this: <i>"You have newer version of gcc installed
+on your computer than that is required (3.2). Continue?"</i>. You can press <i>"Yes"</i> button
 to procede with the installation but in this case you should be aware of what you are doing.
 SALOME binaries (inluding other products) are compiled with the prerequisites from the list
 and most likely can not be run successfully if this products are not found.
index f60228d1aedc3b689e6a1ee74afc56f89662041f..aa2bc826217fb92eed6029a5b6af86af4a58c7ca 100644 (file)
Binary files a/doc/readmepage.png and b/doc/readmepage.png differ
index 82cd745f4acd232ec802e2dacdb76ccf1e66badd..d3d2725a73206617ef4bc7cddfa7d693f88e475f 100755 (executable)
@@ -1,5 +1,8 @@
 #!/usr/bin/env python
 
+import warnings
+warnings.filterwarnings("ignore", "", DeprecationWarning)
+
 import xmllib
 import sys, os, string, re
 
@@ -484,7 +487,7 @@ if __name__ == "__main__":
     # define xml file -----------------
     if (xml_file is None) :
         xml_file_name = "config.xml"
-        if os.path.exists("/proc/version"):
+        if os.path.exists("/etc/redhat-release"):
             data = open("/etc/redhat-release").readline()
             res = re.search(r'Red\s+Hat\s+Linux\s+release\s+([\d.]*)', data)
             if res is not None:
@@ -492,8 +495,15 @@ if __name__ == "__main__":
                 filename = "config_RedHat" + num+ ".xml"
                 if (os.path.exists(cur_dir + filename)):
                     xml_file_name = filename
-                
+            else:
+                res = re.search(r'Mandrakelinux\s+release\s+([\d.]*)', data)
+                if res is not None:
+                    num = re.sub("[.]", "_", (res.groups())[0])
+                    filename = "config_Mandrake" + num+ ".xml"
+                    if (os.path.exists(cur_dir + filename)):
+                        xml_file_name = filename
         xml_file = cur_dir +  xml_file_name
+
     if xml_file is None or not os.path.exists(xml_file):
         error_exit("No xml file is found, try to run with options -f <xmlfile>")
 
index e1beb403c012478ad72e663b09c537a7568f07a6..810c6402124d37e8a6b1e79a1b8a1aa57f463644 100644 (file)
@@ -155,8 +155,12 @@ InstallWizard::InstallWizard( QWidget *parent, const char *name, bool modal,
   d->nextButton->setDefault( TRUE );
   
   connect( d->backButton, SIGNAL(clicked()),
+    this, SIGNAL(backClicked()) );
+  connect( this, SIGNAL(backClicked()),
     this, SLOT(back()) );
   connect( d->nextButton, SIGNAL(clicked()),
+    this, SIGNAL(nextClicked()) );
+  connect( this, SIGNAL(nextClicked()),
     this, SLOT(next()) );
   connect( d->finishButton, SIGNAL(clicked()),
     this, SLOT(accept()) );
@@ -168,9 +172,9 @@ InstallWizard::InstallWizard( QWidget *parent, const char *name, bool modal,
 #ifndef QT_NO_ACCEL
   d->accel = new QAccel( this, "arrow-key accel" );
   d->backAccel = d->accel->insertItem( Qt::ALT + Qt::Key_Left );
-  d->accel->connectItem( d->backAccel, this, SLOT(back()) );
+  d->accel->connectItem( d->backAccel, this, SIGNAL(backClicked()) );
   d->nextAccel = d->accel->insertItem( Qt::ALT + Qt::Key_Right );
-  d->accel->connectItem( d->nextAccel, this, SLOT(next()) );
+  d->accel->connectItem( d->nextAccel, this, SIGNAL(nextClicked()) );
 #endif
 }
 
index ddd49ad2721835e5c253e350b8b32307d946e037..8b36597894b3ab9e91682c7c4c9e8f251eae02fe 100644 (file)
@@ -112,6 +112,8 @@ protected slots:
   virtual void help();
   
 signals:
+  void nextClicked();
+  void backClicked();
   void helpClicked();
   void selected( const QString& );
   
index 36835e6c74831dd07ef5807dce717b0d0cb1dfc6..a8d80fa90f293e8707079cf2d3bbd005db656bf1 100644 (file)
@@ -36,7 +36,7 @@ HelpWindow::HelpWindow( SALOME_InstallWizard* wizard ) : QMainWindow( 0, "Salome
   // caption
   setCaption( wizard->getCaption() + " " + wizard->getIWName() + " " + tr( "Help" ) );
   // icon
-  setIcon( QPixmap( (const char**)image0_data ) );
+  setIcon( QPixmap( (const char**)image_icon ) );
   // create browser
   browser = new QTextBrowser( this );
   browser->mimeSourceFactory()->setFilePath( hlpDir );
@@ -50,7 +50,7 @@ HelpWindow::HelpWindow( SALOME_InstallWizard* wizard ) : QMainWindow( 0, "Salome
   addToolBar( toolbar, "Toolbar" );
   QToolButton* button;
   // --> back
-  button = new QToolButton( QIconSet( (const char**)_img_back ), 
+  button = new QToolButton( QIconSet( (const char**)image_back ), 
                             tr( "Backward" ), 
                             "", 
                             browser, 
@@ -59,7 +59,7 @@ HelpWindow::HelpWindow( SALOME_InstallWizard* wizard ) : QMainWindow( 0, "Salome
   button->setEnabled( FALSE );
   connect( browser, SIGNAL( backwardAvailable( bool ) ), button, SLOT( setEnabled( bool ) ) );
   // --> forward
-  button = new QToolButton( QIconSet( (const char**)_img_forward ), 
+  button = new QToolButton( QIconSet( (const char**)image_next ), 
                             tr( "Forward" ), 
                             "", 
                             browser, 
@@ -68,14 +68,27 @@ HelpWindow::HelpWindow( SALOME_InstallWizard* wizard ) : QMainWindow( 0, "Salome
   button->setEnabled( FALSE );
   connect( browser, SIGNAL( forwardAvailable( bool ) ),  button, SLOT( setEnabled( bool ) ) );
   // --> home
-  button = new QToolButton( QIconSet( (const char**)_img_home ), 
+  button = new QToolButton( QIconSet( (const char**)image_home ), 
                             tr( "Home" ), 
                             "", 
                             browser, 
                             SLOT( home() ), 
                             toolbar );
   toolbar->addSeparator();
-  button = new QToolButton( QIconSet( (const char**)_img_close ), 
+  button = new QToolButton( QIconSet( (const char**)image_zoom_in ), 
+                            tr( "Increaze font size" ), 
+                            "", 
+                            browser, 
+                            SLOT( zoomIn() ), 
+                            toolbar );
+  button = new QToolButton( QIconSet( (const char**)image_zoom_out ), 
+                            tr( "Decreaze font size" ), 
+                            "", 
+                            browser, 
+                            SLOT( zoomOut() ), 
+                            toolbar );
+  toolbar->addSeparator();
+  button = new QToolButton( QIconSet( (const char**)image_close ), 
                             tr( "Close" ), 
                             "", 
                             this, 
@@ -84,7 +97,7 @@ HelpWindow::HelpWindow( SALOME_InstallWizard* wizard ) : QMainWindow( 0, "Salome
   toolbar->addSeparator();
   // --> logo
   QLabel* logo = new QLabel( toolbar, "logo" );
-  logo->setPixmap( QPixmap( (const char**)image1_data ) );
+  logo->setPixmap( QPixmap( (const char**)image_logo ) );
   logo->setAlignment( AlignRight | AlignVCenter );
   logo->setScaledContents( false );
   toolbar->setStretchableWidget( logo );
index 64ac2c11b0e044c90347dfde5ab18f82355d4c74..ecc0a901f762b66de73df4561eefe1e8e18a26e3 100644 (file)
@@ -303,12 +303,12 @@ SALOME_InstallWizard::SALOME_InstallWizard(QString aXmlFileName)
   setTitleFont( fnt );
 
   // set icon
-  setIcon( QPixmap( ( const char** ) image0_data ) );
+  setIcon( QPixmap( ( const char** ) image_icon ) );
   // enable sizegrip
   setSizeGripEnabled( true );
   
   // add logo
-  addLogo( QPixmap( (const char**)image1_data ) );
+  addLogo( QPixmap( (const char**)image_logo ) );
   
   // set defaults
   setVersion( "1.2" );
@@ -1339,8 +1339,9 @@ void SALOME_InstallWizard::launchScript()
   nextButton()->setText( tr( "&Next >" ) );
   QWhatsThis::add( nextButton(), tr( "Moves to the next step of the installation procedure" ) );
   QToolTip::add  ( nextButton(), tr( "Moves to the next step of the installation procedure" ) );
-  nextButton()->disconnect();
-  connect( nextButton(), SIGNAL( clicked() ), this, SLOT( next() ) );
+  disconnect( this, SIGNAL( nextClicked() ), this, SLOT( next() ) );
+  disconnect( this, SIGNAL( nextClicked() ), this, SLOT( onStart() ) );
+  connect(    this, SIGNAL( nextClicked() ), this, SLOT( next() ) );
   // <Back> button
   setBackEnabled( true );
   // script parameters
@@ -1532,8 +1533,9 @@ void SALOME_InstallWizard::pageChanged( const QString & mytitle)
   nextButton()->setText( tr( "&Next >" ) );
   QWhatsThis::add( nextButton(), tr( "Moves to the next step of the installation procedure" ) );
   QToolTip::add  ( nextButton(), tr( "Moves to the next step of the installation procedure" ) );
-  nextButton()->disconnect();
-  connect( nextButton(), SIGNAL( clicked() ), this, SLOT( next() ) );
+  disconnect( this, SIGNAL( nextClicked() ), this, SLOT( next() ) );
+  disconnect( this, SIGNAL( nextClicked() ), this, SLOT( onStart() ) );
+  connect(    this, SIGNAL( nextClicked() ), this, SLOT( next() ) );
   cancelButton()->disconnect();
   connect( cancelButton(), SIGNAL( clicked()), this, SLOT( reject() ) );
 
@@ -1562,8 +1564,9 @@ void SALOME_InstallWizard::pageChanged( const QString & mytitle)
       QWhatsThis::add( nextButton(), tr( "Starts installation process" ) );
       QToolTip::add  ( nextButton(), tr( "Starts installation process" ) );
       // reconnect Next button - to use it as Start button
-      nextButton()->disconnect();
-      connect( nextButton(), SIGNAL( clicked() ), this, SLOT( onStart() ) );
+      disconnect( this, SIGNAL( nextClicked() ), this, SLOT( next() ) );
+      disconnect( this, SIGNAL( nextClicked() ), this, SLOT( onStart() ) );
+      connect(    this, SIGNAL( nextClicked() ), this, SLOT( onStart() ) );
       setNextEnabled( true );
       // reconnect Cancel button to terminate process
       cancelButton()->disconnect();
@@ -1726,8 +1729,9 @@ void SALOME_InstallWizard::productInstalled( )
     nextButton()->setText( tr( "&Next >" ) );
     QWhatsThis::add( nextButton(), tr( "Moves to the next step of the installation procedure" ) );
     QToolTip::add  ( nextButton(), tr( "Moves to the next step of the installation procedure" ) );
-    nextButton()->disconnect();
-    connect( nextButton(), SIGNAL( clicked() ), this, SLOT( next() ) );
+    disconnect( this, SIGNAL( nextClicked() ), this, SLOT( next() ) );
+    disconnect( this, SIGNAL( nextClicked() ), this, SLOT( onStart() ) );
+    connect(    this, SIGNAL( nextClicked() ), this, SLOT( next() ) );
     // enable <Back> button
     setBackEnabled( true );
   }
index 771d1fe54df7c3ae764c2e70063ac45b9964f8ca..e61146d2eb9db6dc76d2982972f38718e7dff9a5 100644 (file)
@@ -3034,80 +3034,8 @@ static const char* const SALOME_Logo_xpm[] = {
 "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
 "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt"};
 
-static const char* const _img_back[]={
-"16 16 5 1",
-"# c #000000",
-"a c #ffffff",
-"c c #808080",
-"b c #c0c0c0",
-". c None",
-"................",
-".......#........",
-"......##........",
-".....#a#........",
-"....#aa########.",
-"...#aabaaaaaaa#.",
-"..#aabbbbbbbbb#.",
-"...#abbbbbbbbb#.",
-"...c#ab########.",
-"....c#a#ccccccc.",
-".....c##c.......",
-"......c#c.......",
-".......cc.......",
-"........c.......",
-"................",
-"......................"};
-
-static const char* const _img_forward[]={
-"16 16 5 1",
-"# c #000000",
-"a c #ffffff",
-"c c #808080",
-"b c #c0c0c0",
-". c None",
-"................",
-"................",
-".........#......",
-".........##.....",
-".........#a#....",
-"..########aa#...",
-"..#aaaaaaabaa#..",
-"..#bbbbbbbbbaa#.",
-"..#bbbbbbbbba#..",
-"..########ba#c..",
-"..ccccccc#a#c...",
-"........c##c....",
-"........c#c.....",
-"........cc......",
-"........c.......",
-"................",
-"................"};
 
-static const char* const _img_home[]={
-"16 16 4 1",
-"# c #000000",
-"a c #ffffff",
-"b c #c0c0c0",
-". c None",
-"........... ....",
-"   ....##.......",
-"..#...####......",
-"..#..#aabb#.....",
-"..#.#aaaabb#....",
-"..##aaaaaabb#...",
-"..#aaaaaaaabb#..",
-".#aaaaaaaaabbb#.",
-"###aaaaaaaabb###",
-"..#aaaaaaaabb#..",
-"..#aaa###aabb#..",
-"..#aaa#.#aabb#..",
-"..#aaa#.#aabb#..",
-"..#aaa#.#aabb#..",
-"..#aaa#.#aabb#..",
-"..#####.######..",
-"................"};
-
-static const char* const _img_close[]={
+static const char* const image_close[]={
 "16 16 3 1",
 ". c None",
 "# c #800000",
@@ -3129,7 +3057,7 @@ static const char* const _img_close[]={
 "................",
 "................"};
 
-static const char* const image1_data[] = { 
+static const char* const image_logo[] = { 
 "54 20 415 2",
 "bH c #004f87",
 "a1 c #005089",
@@ -3567,7 +3495,7 @@ static const char* const image1_data[] = {
 "QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQteteuevaiQtQtQtQtQtQtQt",
 "aiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiaiai.7ewexeyezeAeBeC#Kaiaiaiai#5"};
 
-static const char* const image0_data[] = { 
+static const char* const image_icon[] = { 
 "16 16 14 1",
 ". c None",
 "g c #392900",
@@ -3600,4 +3528,1016 @@ static const char* const image0_data[] = {
 "................",
 "................"};
 
+static const char* const image_home[] = { 
+"20 20 188 2",
+"      c None",
+".     c #D2D2D2",
+"+     c #595959",
+"@     c #0F0F0F",
+"#     c #B8B8B8",
+"$     c #D8D8D8",
+"%     c #BFBFBF",
+"&     c #9A9A9A",
+"*     c #C9C9C9",
+"=     c #818181",
+"-     c #ADADAD",
+";     c #7D7D7D",
+">     c #3F3F3F",
+",     c #A8A8A8",
+"'     c #D4D4D4",
+")     c #757575",
+"!     c #0A0A0A",
+"~     c #B9B9B9",
+"{     c #7E7E7E",
+"]     c #AAAAAA",
+"^     c #BEBEBE",
+"/     c #B4B4B4",
+"(     c #6D6D6D",
+"_     c #4C4C4C",
+":     c #747474",
+"<     c #626262",
+"[     c #AFAFAF",
+"}     c #7F7F7F",
+"|     c #7C7C7C",
+"1     c #797979",
+"2     c #5E5E5E",
+"3     c #4A4A4A",
+"4     c #9F9F9F",
+"5     c #737373",
+"6     c #333333",
+"7     c #C2C2C2",
+"8     c #A4A4A4",
+"9     c #545454",
+"0     c #4E4E4E",
+"a     c #4F4F4F",
+"b     c #343434",
+"c     c #D7D7D7",
+"d     c #CFCFCF",
+"e     c #717171",
+"f     c #C3C3C3",
+"g     c #9B9B9B",
+"h     c #4D4D4D",
+"i     c #898787",
+"j     c #D3D2D2",
+"k     c #E1E1E1",
+"l     c #A7A5A5",
+"m     c #535353",
+"n     c #222222",
+"o     c #CECECE",
+"p     c #858585",
+"q     c #ACACAC",
+"r     c #A0A0A0",
+"s     c #4E4D4D",
+"t     c #888787",
+"u     c #F3F3F3",
+"v     c #FAFAFA",
+"w     c #E0DFDF",
+"x     c #A4A2A2",
+"y     c #5A5959",
+"z     c #525252",
+"A     c #9D9D9D",
+"B     c #D3D3D3",
+"C     c #828282",
+"D     c #9E9E9E",
+"E     c #8D8D8D",
+"F     c #505050",
+"G     c #868585",
+"H     c #D5D4D4",
+"I     c #F2F2F2",
+"J     c #F9F9F9",
+"K     c #F7F7F7",
+"L     c #E2E2E2",
+"M     c #A2A1A1",
+"N     c #585757",
+"O     c #515151",
+"P     c #3E3E3E",
+"Q     c #999999",
+"R     c #696969",
+"S     c #989898",
+"T     c #898989",
+"U     c #7A7A7A",
+"V     c #CCCBCB",
+"W     c #F8F8F8",
+"X     c #F6F6F6",
+"Y     c #DDDCDC",
+"Z     c #3D3D3D",
+"`     c #312F2F",
+" .    c #BCBCBC",
+"..    c #E4E4E4",
+"+.    c #F8F7F6",
+"@.    c #D7BFAE",
+"#.    c #AA7A5B",
+"$.    c #8D5237",
+"%.    c #8A6051",
+"&.    c #F8F6F6",
+"*.    c #EFEDEC",
+"=.    c #292929",
+"-.    c #565656",
+";.    c #AEAEAE",
+">.    c #686767",
+",.    c #5F5E5E",
+"'.    c #C5C5C5",
+").    c #E7E7E7",
+"!.    c #D6C2B8",
+"~.    c #A87E66",
+"{.    c #DBC7B8",
+"].    c #DAB99F",
+"^.    c #9C5021",
+"/.    c #936959",
+"(.    c #888888",
+"_.    c #404040",
+":.    c #939393",
+"<.    c #A9A9A9",
+"[.    c #676767",
+"}.    c #C8C8C8",
+"|.    c #EBEBEB",
+"1.    c #D4C4C6",
+"2.    c #BD9C9A",
+"3.    c #E7CAB0",
+"4.    c #D2945B",
+"5.    c #B46830",
+"6.    c #9E6A53",
+"7.    c #F4F2F2",
+"8.    c #8E8E8E",
+"9.    c #424242",
+"0.    c #A2A2A2",
+"a.    c #6C6C6C",
+"b.    c #616161",
+"c.    c #ECECEC",
+"d.    c #D1BDBE",
+"e.    c #B38A83",
+"f.    c #DDB18C",
+"g.    c #CE7C30",
+"h.    c #AB4F08",
+"i.    c #A16C53",
+"j.    c #F4F0F0",
+"k.    c #DBDADA",
+"l.    c #434343",
+"m.    c #6E6E6E",
+"n.    c #D1BCBD",
+"o.    c #AE8177",
+"p.    c #D49B6A",
+"q.    c #C86C17",
+"r.    c #A64A05",
+"s.    c #A26D53",
+"t.    c #9C9C9C",
+"u.    c #AA7A6F",
+"v.    c #CF925D",
+"w.    c #C76A14",
+"x.    c #A04405",
+"y.    c #F2F0F0",
+"z.    c #C8B5B6",
+"A.    c #955F51",
+"B.    c #C47430",
+"C.    c #BE5C08",
+"D.    c #963E06",
+"E.    c #5C5C5C",
+"F.    c #C0ADAE",
+"G.    c #86452D",
+"H.    c #AB5413",
+"I.    c #A84C04",
+"J.    c #8A3605",
+"K.    c #986750",
+"L.    c #E8E6E6",
+"M.    c #D1D1D1",
+"N.    c #959595",
+"O.    c #575757",
+"P.    c #666666",
+"Q.    c #574E4F",
+"R.    c #3A190E",
+"S.    c #471E04",
+"T.    c #431A01",
+"U.    c #3E1702",
+"V.    c #452F24",
+"W.    c #696868",
+"X.    c #5F5F5F",
+"Y.    c #4C3330",
+"Z.    c #B0B0B0",
+"`.    c #787878",
+" +    c #6B6B6B",
+".+    c #6C6B6B",
+"++    c #8F7E7C",
+"@+    c #BBBBBB",
+"              . + @ # $                 ",
+"      % &   * = - ; > , '               ",
+"      ) ! ~ { ] ^ / ( _ & '             ",
+"      : ! < [ , } | 1 2 3 4 '           ",
+"      5 6 7 8 9 0 0 a + 9 b ] c         ",
+"    d e f g h i j k l 9 m a n ] '       ",
+"  o p q r s t j u v w x y z h 6 A '     ",
+"B C D E F G H I J J K L M N O 3 P Q '   ",
+"R S T F U V u W W W K X Y D 9 F 3 P r   ",
+"8 Z ` y  ...+.@.#.$.%.&.*.* e 6 =.-.;.  ",
+"  7 >.,.'.).!.~.{.].^./.X c (._.:.<.    ",
+"    e [.}.|.1.2.3.4.5.6.7.$ 8.9.0.      ",
+"    a.b.}.c.d.e.f.g.h.i.j.k.g l.]       ",
+"    m.b.}.c.n.o.p.q.r.s.j.k.t.l.-       ",
+"    m.b.}.c.n.u.v.w.x.i.y.k.t.l.-       ",
+"    m.b.}.c.z.A.B.C.D.i.j.k.t.l.-       ",
+"    m.E.% k F.G.H.I.J.K.L.M.N.l.-       ",
+"    0._ O.P.Q.R.S.T.U.V.W.X.l.Y.Z.      ",
+"      D `.m.a. + + +.+ + + +a.++@+      ",
+"            ^ ^ ^ ^ ^ ^ ^ ^             "};
+
+static const char* const image_back[] = { 
+"20 20 119 2",
+"      c None",
+".     c #788994",
+"+     c #5C6E82",
+"@     c #2D4D6A",
+"#     c #596C7F",
+"$     c #244164",
+"%     c #2B4B6B",
+"&     c #5C6F83",
+"*     c #6080A2",
+"=     c #4D6A91",
+"-     c #2C4C6C",
+";     c #637588",
+">     c #6D85A1",
+",     c #C0D3E4",
+"'     c #3F7099",
+")     c #224162",
+"!     c #8E9195",
+"~     c #98A1AB",
+"{     c #909BA6",
+"]     c #8E99A5",
+"^     c #8D97A1",
+"/     c #A1A1A2",
+"(     c #5B6E82",
+"_     c #6C839F",
+":     c #D6DEE9",
+"<     c #A5CFE4",
+"[     c #2B88B6",
+"}     c #2C6188",
+"|     c #627987",
+"1     c #8D9EB0",
+"2     c #8796A8",
+"3     c #6F8BA3",
+"4     c #173353",
+"5     c #484B51",
+"6     c #6E89A7",
+"7     c #D8DFEA",
+"8     c #BEE0EE",
+"9     c #50B1D5",
+"0     c #1A91C5",
+"a     c #46A1CD",
+"b     c #A8D5EA",
+"c     c #D4EBF5",
+"d     c #CBE7F4",
+"e     c #90C3E0",
+"f     c #214A70",
+"g     c #4A515B",
+"h     c #587497",
+"i     c #CCDEEE",
+"j     c #B1D7EA",
+"k     c #58B7DA",
+"l     c #1894C6",
+"m     c #0E84BF",
+"n     c #1C90C5",
+"o     c #5AAFD6",
+"p     c #96C9E2",
+"q     c #8CC4E2",
+"r     c #4F9CC9",
+"s     c #104973",
+"t     c #4C525E",
+"u     c #55585E",
+"v     c #114369",
+"w     c #178EBC",
+"x     c #1DAED8",
+"y     c #159ED1",
+"z     c #0E88C3",
+"A     c #0E86C1",
+"B     c #148AC0",
+"C     c #198CBC",
+"D     c #1989B7",
+"E     c #1688B8",
+"F     c #1388BA",
+"G     c #0E4774",
+"H     c #4D545F",
+"I     c #585C64",
+"J     c #0D4770",
+"K     c #1A8EBE",
+"L     c #2BB6DC",
+"M     c #1BA4D6",
+"N     c #1396C8",
+"O     c #23A1C7",
+"P     c #34A0C3",
+"Q     c #33A0C3",
+"R     c #2397BE",
+"S     c #158CB9",
+"T     c #0D3F6A",
+"U     c #4E545E",
+"V     c #57616D",
+"W     c #0E4A6E",
+"X     c #2495BF",
+"Y     c #2BB5DA",
+"Z     c #147DAA",
+"`     c #0F547E",
+" .    c #0C365A",
+"..    c #0C3559",
+"+.    c #0C3659",
+"@.    c #0F3858",
+"#.    c #091F39",
+"$.    c #4E5056",
+"%.    c #606B77",
+"&.    c #0E476D",
+"*.    c #1B7FAD",
+"=.    c #125F8C",
+"-.    c #244567",
+";.    c #9B9FA6",
+">.    c #9DA1A7",
+",.    c #A0A4AA",
+"'.    c #A4A8AE",
+").    c #A0A3A7",
+"!.    c #B5B5B6",
+"~.    c #5B6571",
+"{.    c #0D446C",
+"].    c #104C78",
+"^.    c #315171",
+"/.    c #61636B",
+"(.    c #102B4A",
+"_.    c #315071",
+":.    c #63656B",
+"<.    c #2E445C",
+"[.    c #828488",
+"                                        ",
+"                                        ",
+"                    .                   ",
+"                  + @                   ",
+"                # $ %                   ",
+"              & * = -                   ",
+"            ; > , ' ) ! ~ { ] ^ /       ",
+"          ( _ : < [ } | 1 2 3 4 5       ",
+"        # 6 7 8 9 0 a b c d e f g       ",
+"      + h i j k l m n o p q r s t       ",
+"      u v w x y z A B C D E F G H       ",
+"        I J K L M N O P Q R S T U       ",
+"          V W X Y Z `  ...+.@.#.$.      ",
+"            %.&.*.=.-.;.>.,.'.).!.      ",
+"              ~.{.].^.                  ",
+"                /.(._.                  ",
+"                  :.<.                  ",
+"                    [.                  ",
+"                                        ",
+"                                        "};
+
+static const char* const image_next[] = { 
+"20 20 109 2",
+"      c None",
+".     c #828F9C",
+"+     c #33506E",
+"@     c #545454",
+"#     c #2B4A6B",
+"$     c #285572",
+"%     c #565656",
+"&     c #2B4B6B",
+"*     c #7BA9CA",
+"=     c #37607B",
+"-     c #585E61",
+";     c #ACB2B8",
+">     c #99A2AC",
+",     c #848F9B",
+"'     c #7E8995",
+")     c #838E9A",
+"!     c #8A95A0",
+"~     c #224466",
+"{     c #9FC3DB",
+"]     c #AFCADE",
+"^     c #436479",
+"/     c #62696E",
+"(     c #6D7E91",
+"_     c #5C7B97",
+":     c #758CA3",
+"<     c #8494A7",
+"[     c #8998AA",
+"}     c #6D89A5",
+"|     c #99C4DE",
+"1     c #A4CEE4",
+"2     c #C1D5E2",
+"3     c #436378",
+"4     c #5C6265",
+"5     c #65778A",
+"6     c #A3BBCF",
+"7     c #AED2E5",
+"8     c #D6E8F2",
+"9     c #D5E7F3",
+"0     c #B3D6EB",
+"a     c #8CC2E0",
+"b     c #3CA7D2",
+"c     c #45A7D2",
+"d     c #B5DAEB",
+"e     c #C8D9E5",
+"f     c #3B627C",
+"g     c #606060",
+"h     c #607387",
+"i     c #C0CDDA",
+"j     c #7AB5D5",
+"k     c #5CB5D7",
+"l     c #63B8DA",
+"m     c #31A5D1",
+"n     c #2C9ACC",
+"o     c #0E81BA",
+"p     c #1284BC",
+"q     c #44A6D1",
+"r     c #A9D3E8",
+"s     c #C1D8E9",
+"t     c #295673",
+"u     c #616161",
+"v     c #4F637A",
+"w     c #BCCAD9",
+"x     c #6DB6D8",
+"y     c #1386B6",
+"z     c #1785B3",
+"A     c #1389BA",
+"B     c #0F8DC3",
+"C     c #0F84BC",
+"D     c #0E86C1",
+"E     c #32A0CF",
+"F     c #47BEE0",
+"G     c #2091BE",
+"H     c #114264",
+"I     c #636363",
+"J     c #465C73",
+"K     c #7FA1BD",
+"L     c #599EC3",
+"M     c #2396BD",
+"N     c #33A1C4",
+"O     c #279BC1",
+"P     c #159DCA",
+"Q     c #129ED0",
+"R     c #1BA5D6",
+"S     c #2FB8DC",
+"T     c #2391BD",
+"U     c #0D4568",
+"V     c #666666",
+"W     c #475E75",
+"X     c #0F334E",
+"Y     c #0A2D46",
+"Z     c #092E47",
+"`     c #093049",
+" .    c #0D537D",
+"..    c #1397C9",
+"+.    c #2491BC",
+"@.    c #0E4465",
+"#.    c #646A6E",
+"$.    c #979FA7",
+"%.    c #848688",
+"&.    c #878787",
+"*.    c #8B8B8B",
+"=.    c #8E8E8E",
+"-.    c #909090",
+";.    c #234363",
+">.    c #1A98C6",
+",.    c #6D747A",
+"'.    c #2F4F6F",
+").    c #2A74A0",
+"!.    c #8494A4",
+"                                        ",
+"                                        ",
+"                  .                     ",
+"                  + @                   ",
+"                  # $ %                 ",
+"                  & * = -               ",
+"      ; > , ' ) ! ~ { ] ^ /             ",
+"      ( _ : < < [ } | 1 2 3 4           ",
+"      5 6 7 8 9 0 a b c d e f g         ",
+"      h i j k l m n o p q r s t u       ",
+"      v w x y z A B C D E F G H I       ",
+"      J K L M N O P Q R S T U V         ",
+"      W X Y Y Z `  ...S +.@.#.          ",
+"      $.%.&.*.=.-.;.>.T @.,.            ",
+"                  '.).U #.              ",
+"                  '.H V                 ",
+"                  '.I                   ",
+"                  !.                    ",
+"                                        ",
+"                                        "};
+
+static const char* const image_zoom_in[] = { 
+"20 20 240 2",
+"      c None",
+".     c #A0A0A0",
+"+     c #505151",
+"@     c #48494A",
+"#     c #4A4A4B",
+"$     c #5A5A5B",
+"%     c #D2D2D2",
+"&     c #ADADAD",
+"*     c #626263",
+"=     c #7A7C7D",
+"-     c #A9AEAF",
+";     c #BEC8CA",
+">     c #C0CDCF",
+",     c #B8C3C5",
+"'     c #909597",
+")     c #414343",
+"!     c #646464",
+"~     c #CECECE",
+"{     c #A9A9A9",
+"]     c #666667",
+"^     c #ADB2B3",
+"/     c #E0EAEB",
+"(     c #E5F4F6",
+"_     c #DAF3F8",
+":     c #D2F0F7",
+"<     c #C4EBF4",
+"[     c #CAECF3",
+"}     c #CDDFE2",
+"|     c #828586",
+"1     c #6E6E6E",
+"2     c #C6C6C6",
+"3     c #D6D6D6",
+"4     c #595A5A",
+"5     c #ABB2B3",
+"6     c #E7F2F4",
+"7     c #F7FDFD",
+"8     c #DEF4F9",
+"9     c #C0E8F1",
+"0     c #A6DDEA",
+"a     c #96D3E0",
+"b     c #A9DDE6",
+"c     c #C3D8DC",
+"d     c #808483",
+"e     c #737373",
+"f     c #9F9F9F",
+"g     c #838687",
+"h     c #D5E1E4",
+"i     c #E9F7F9",
+"j     c #F9FCFD",
+"k     c #FAFDFE",
+"l     c #E2F5F8",
+"m     c #BAE5EE",
+"n     c #9FDAE7",
+"o     c #8ACEDB",
+"p     c #7AC4D2",
+"q     c #9FD5E1",
+"r     c #A5BBBE",
+"s     c #747575",
+"t     c #B7B7B7",
+"u     c #5A5B5B",
+"v     c #B8BFC0",
+"w     c #DEEDF1",
+"x     c #D4EDF4",
+"y     c #E4F4F8",
+"z     c #C2E9F0",
+"A     c #A8DEEA",
+"B     c #92D6E4",
+"C     c #7AC9DB",
+"D     c #5FB0C2",
+"E     c #7DC3D1",
+"F     c #AED6DE",
+"G     c #899293",
+"H     c #8A8A8A",
+"I     c #535455",
+"J     c #C2CBCD",
+"K     c #DCEFF3",
+"L     c #C5E8EF",
+"M     c #C3E9F0",
+"N     c #BBE7EF",
+"O     c #A6DEEA",
+"P     c #92D5E4",
+"Q     c #7ECDDF",
+"R     c #63B9CD",
+"S     c #4A9FAF",
+"T     c #6AB8C5",
+"U     c #ADDAE3",
+"V     c #7D8B8D",
+"W     c #686868",
+"X     c #4E4F4F",
+"Y     c #B4BDBD",
+"Z     c #D1EAEF",
+"`     c #B0DDE6",
+" .    c #A2DBE6",
+"..    c #9DD9E7",
+"+.    c #90D5E4",
+"@.    c #5EC0D4",
+"#.    c #4BA3B3",
+"$.    c #42919E",
+"%.    c #6DBBC9",
+"&.    c #A9D3DB",
+"*.    c #747A7B",
+"=.    c #616161",
+"-.    c #676868",
+";.    c #929695",
+">.    c #C8DEE2",
+",.    c #A3DAE5",
+"'.    c #8ACDDA",
+").    c #81C9D7",
+"!.    c #73C3D4",
+"~.    c #5ABCCF",
+"{.    c #47A3B4",
+"].    c #3C8A98",
+"^.    c #4C9FAE",
+"/.    c #98D1DF",
+"(.    c #A8B7B9",
+"_.    c #4E5253",
+":.    c #787878",
+"<.    c #BDBDBD",
+"[.    c #565756",
+"}.    c #97A0A1",
+"|.    c #C1E7EF",
+"1.    c #8FCEDB",
+"2.    c #6DBAC9",
+"3.    c #59ADBC",
+"4.    c #499DAC",
+"5.    c #3F8D9B",
+"6.    c #4C9EAF",
+"7.    c #8BCDDE",
+"8.    c #C9DFE3",
+"9.    c #777B7B",
+"0.    c #3D3E3E",
+"a.    c #A7A7A7",
+"b.    c #D4D4D4",
+"c.    c #898989",
+"d.    c #656565",
+"e.    c #9AA2A2",
+"f.    c #C3E0E7",
+"g.    c #A6D7E2",
+"h.    c #92CFDA",
+"i.    c #83C8D6",
+"j.    c #89CCDA",
+"k.    c #B4DFE9",
+"l.    c #C6D8DC",
+"m.    c #6D6E6E",
+"n.    c #313536",
+"o.    c #4F4829",
+"p.    c #B1A675",
+"q.    c #B8B8B8",
+"r.    c #6C6C6C",
+"s.    c #6D6D6D",
+"t.    c #737F80",
+"u.    c #8BA4A9",
+"v.    c #AEC9CD",
+"w.    c #B6D2D6",
+"x.    c #AABEC3",
+"y.    c #7F9A9E",
+"z.    c #5F6668",
+"A.    c #323433",
+"B.    c #5D594B",
+"C.    c #F1EBD7",
+"D.    c #ABA075",
+"E.    c #95917C",
+"F.    c #ACACAC",
+"G.    c #6F6F6F",
+"H.    c #636363",
+"I.    c #6A6A6B",
+"J.    c #666666",
+"K.    c #4F5353",
+"L.    c #555858",
+"M.    c #363014",
+"N.    c #B29F58",
+"O.    c #C1BBA4",
+"P.    c #BCBCBD",
+"Q.    c #707071",
+"R.    c #868687",
+"S.    c #9B9B9B",
+"T.    c #797979",
+"U.    c #6A6A6A",
+"V.    c #7B7B7B",
+"W.    c #9D9C99",
+"X.    c #7D754B",
+"Y.    c #6F6634",
+"Z.    c #4B4E4F",
+"`.    c #939495",
+" +    c #B3B3B4",
+".+    c #B9B9B9",
+"++    c #A1A1A1",
+"@+    c #B3B3B3",
+"#+    c #AAAAAA",
+"$+    c #A8A8A8",
+"%+    c #AAA9A3",
+"&+    c #716D57",
+"*+    c #383A3B",
+"=+    c #4B4D4E",
+"-+    c #898A8A",
+";+    c #A5A5A6",
+">+    c #676768",
+",+    c #BBBBBB",
+"'+    c #D0D0D0",
+")+    c #5E5E5E",
+"!+    c #767676",
+"~+    c #AEAEAE",
+"{+    c #575758",
+"]+    c #272828",
+"^+    c #494C4D",
+"/+    c #828484",
+"(+    c #626262",
+"_+    c #6C6C6D",
+":+    c #989898",
+"<+    c #979797",
+"[+    c #5C5C5C",
+"}+    c #969696",
+"|+    c #4C4C4C",
+"1+    c #373839",
+"2+    c #4A4D4E",
+"3+    c #818283",
+"4+    c #7E7E7F",
+"5+    c #444445",
+"6+    c #434343",
+"7+    c #464646",
+"8+    c #151515",
+"9+    c #1D1D1D",
+"0+    c #959595",
+"a+    c #373737",
+"b+    c #2A2B2C",
+"c+    c #313232",
+"d+    c #3E3E3F",
+"e+    c #454545",
+"f+    c #444444",
+"g+    c #BCBCBC",
+"h+    c #919191",
+"i+    c #313131",
+"j+    c #0B0C0C",
+"k+    c #2F2F30",
+"l+    c #878788",
+"m+    c #4E4E4E",
+"n+    c #545454",
+"o+    c #B0B0B0",
+"p+    c #9A9A9A",
+"q+    c #A4A4A4",
+"        . + @ @ # $ %                   ",
+"    & * = - ; > , ' ) ! ~               ",
+"  { ] ^ / ( _ : < [ } | 1 2             ",
+"3 4 5 6 7 7 8 9 0 a b c d e             ",
+"f g h i j k l m n o p q r s t           ",
+"u v w x y l z A B C D E F G H           ",
+"I J K L M N O P Q R S T U V W           ",
+"X Y Z `  ...+.Q @.#.$.%.&.*.=.          ",
+"-.;.>.,.'.).!.~.{.].^./.(._.:.          ",
+"<.[.}.|.1.2.3.4.5.6.7.8.9.0.a.          ",
+"b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.          ",
+"  q.r.s.t.u.v.w.x.y.z.A.B.C.D.E.        ",
+"    F.G.H.d.I.W J.K.L.M.N.O.P.Q.R.      ",
+"      t S.T.s.U.W V.W.X.Y.Z.`. +r.T..+  ",
+"    ++++  @+#+$+a.{ & %+&+*+=+-+;+>+=.,+",
+"  '+)+!+                ~+{+]+^+/+++(+_+",
+":+<+V.[+}+                f |+1+2+3+4+5+",
+"6+7+6+8+9+H                 0+a+b+^+c+d+",
+"  @+e+f+g+                    h+i+j+k+l+",
+"    m+n+                        o+p+:+q+"};
+
+static const char* const image_zoom_out[] = { 
+"20 20 240 2",
+"      c None",
+".     c #A0A0A0",
+"+     c #505151",
+"@     c #48494A",
+"#     c #4A4A4B",
+"$     c #5A5A5B",
+"%     c #D2D2D2",
+"&     c #ADADAD",
+"*     c #626263",
+"=     c #7A7C7D",
+"-     c #A9AEAF",
+";     c #BEC8CA",
+">     c #C0CDCF",
+",     c #B8C3C5",
+"'     c #909597",
+")     c #414343",
+"!     c #646464",
+"~     c #CECECE",
+"{     c #A9A9A9",
+"]     c #666667",
+"^     c #ADB2B3",
+"/     c #E0EAEB",
+"(     c #E5F4F6",
+"_     c #DAF3F8",
+":     c #D2F0F7",
+"<     c #C4EBF4",
+"[     c #CAECF3",
+"}     c #CDDFE2",
+"|     c #828586",
+"1     c #6E6E6E",
+"2     c #C6C6C6",
+"3     c #595A5A",
+"4     c #ABB2B3",
+"5     c #E7F2F4",
+"6     c #F7FDFD",
+"7     c #DEF4F9",
+"8     c #C0E8F1",
+"9     c #A6DDEA",
+"0     c #96D3E0",
+"a     c #A9DDE6",
+"b     c #C3D8DC",
+"c     c #808483",
+"d     c #737373",
+"e     c #9F9F9F",
+"f     c #838687",
+"g     c #D5E1E4",
+"h     c #E9F7F9",
+"i     c #F9FCFD",
+"j     c #FAFDFE",
+"k     c #E2F5F8",
+"l     c #BAE5EE",
+"m     c #9FDAE7",
+"n     c #8ACEDB",
+"o     c #7AC4D2",
+"p     c #9FD5E1",
+"q     c #A5BBBE",
+"r     c #747575",
+"s     c #B7B7B7",
+"t     c #5A5B5B",
+"u     c #B8BFC0",
+"v     c #DEEDF1",
+"w     c #D4EDF4",
+"x     c #E4F4F8",
+"y     c #C2E9F0",
+"z     c #A8DEEA",
+"A     c #92D6E4",
+"B     c #7AC9DB",
+"C     c #5FB0C2",
+"D     c #7DC3D1",
+"E     c #AED6DE",
+"F     c #899293",
+"G     c #8A8A8A",
+"H     c #535455",
+"I     c #C2CBCD",
+"J     c #DCEFF3",
+"K     c #C5E8EF",
+"L     c #C3E9F0",
+"M     c #BBE7EF",
+"N     c #A6DEEA",
+"O     c #92D5E4",
+"P     c #7ECDDF",
+"Q     c #63B9CD",
+"R     c #4A9FAF",
+"S     c #6AB8C5",
+"T     c #ADDAE3",
+"U     c #7D8B8D",
+"V     c #686868",
+"W     c #CDCDCD",
+"X     c #4E4F4F",
+"Y     c #B4BDBD",
+"Z     c #D1EAEF",
+"`     c #B0DDE6",
+" .    c #A2DBE6",
+"..    c #9DD9E7",
+"+.    c #90D5E4",
+"@.    c #5EC0D4",
+"#.    c #4BA3B3",
+"$.    c #42919E",
+"%.    c #6DBBC9",
+"&.    c #A9D3DB",
+"*.    c #747A7B",
+"=.    c #616161",
+"-.    c #C5C5C5",
+";.    c #676868",
+">.    c #929695",
+",.    c #C8DEE2",
+"'.    c #A3DAE5",
+").    c #8ACDDA",
+"!.    c #81C9D7",
+"~.    c #73C3D4",
+"{.    c #5ABCCF",
+"].    c #47A3B4",
+"^.    c #3C8A98",
+"/.    c #4C9FAE",
+"(.    c #98D1DF",
+"_.    c #A8B7B9",
+":.    c #4E5253",
+"<.    c #787878",
+"[.    c #C3C3C3",
+"}.    c #BDBDBD",
+"|.    c #565756",
+"1.    c #97A0A1",
+"2.    c #C1E7EF",
+"3.    c #8FCEDB",
+"4.    c #6DBAC9",
+"5.    c #59ADBC",
+"6.    c #499DAC",
+"7.    c #3F8D9B",
+"8.    c #4C9EAF",
+"9.    c #8BCDDE",
+"0.    c #C9DFE3",
+"a.    c #777B7B",
+"b.    c #3D3E3E",
+"c.    c #A7A7A7",
+"d.    c #898989",
+"e.    c #656565",
+"f.    c #9AA2A2",
+"g.    c #C3E0E7",
+"h.    c #A6D7E2",
+"i.    c #92CFDA",
+"j.    c #83C8D6",
+"k.    c #89CCDA",
+"l.    c #B4DFE9",
+"m.    c #C6D8DC",
+"n.    c #6D6E6E",
+"o.    c #313536",
+"p.    c #4F4829",
+"q.    c #B1A675",
+"r.    c #C5C5C3",
+"s.    c #B8B8B8",
+"t.    c #6C6C6C",
+"u.    c #6D6D6D",
+"v.    c #737F80",
+"w.    c #8BA4A9",
+"x.    c #AEC9CD",
+"y.    c #B6D2D6",
+"z.    c #AABEC3",
+"A.    c #7F9A9E",
+"B.    c #5F6668",
+"C.    c #323433",
+"D.    c #5D594B",
+"E.    c #F1EBD7",
+"F.    c #ABA075",
+"G.    c #95917C",
+"H.    c #D3D3D3",
+"I.    c #ACACAC",
+"J.    c #6F6F6F",
+"K.    c #636363",
+"L.    c #6A6A6B",
+"M.    c #666666",
+"N.    c #4F5353",
+"O.    c #555858",
+"P.    c #363014",
+"Q.    c #B29F58",
+"R.    c #C1BBA4",
+"S.    c #BCBCBD",
+"T.    c #707071",
+"U.    c #868687",
+"V.    c #C9C9C9",
+"W.    c #9B9B9B",
+"X.    c #797979",
+"Y.    c #6A6A6A",
+"Z.    c #7B7B7B",
+"`.    c #9D9C99",
+" +    c #7D754B",
+".+    c #6F6634",
+"++    c #4B4E4F",
+"@+    c #939495",
+"#+    c #B3B3B4",
+"$+    c #B9B9B9",
+"%+    c #CFCFCF",
+"&+    c #C1C1C1",
+"*+    c #B3B3B3",
+"=+    c #AAAAAA",
+"-+    c #A8A8A8",
+";+    c #AAA9A3",
+">+    c #716D57",
+",+    c #383A3B",
+"'+    c #4B4D4E",
+")+    c #898A8A",
+"!+    c #A5A5A6",
+"~+    c #676768",
+"{+    c #BBBBBB",
+"]+    c #CACACA",
+"^+    c #AEAEAE",
+"/+    c #575758",
+"(+    c #272828",
+"_+    c #494C4D",
+":+    c #828484",
+"<+    c #A1A1A1",
+"[+    c #626262",
+"}+    c #6C6C6D",
+"|+    c #989898",
+"1+    c #979797",
+"2+    c #969696",
+"3+    c #BEBEBE",
+"4+    c #4C4C4C",
+"5+    c #373839",
+"6+    c #4A4D4E",
+"7+    c #818283",
+"8+    c #7E7E7F",
+"9+    c #444445",
+"0+    c #434343",
+"a+    c #3A3A3A",
+"b+    c #1D1D1D",
+"c+    c #959595",
+"d+    c #373737",
+"e+    c #2A2B2C",
+"f+    c #313232",
+"g+    c #3E3E3F",
+"h+    c #BCBCBC",
+"i+    c #C8C8C8",
+"j+    c #919191",
+"k+    c #313131",
+"l+    c #0B0C0C",
+"m+    c #2F2F30",
+"n+    c #878788",
+"o+    c #B0B0B0",
+"p+    c #9A9A9A",
+"q+    c #A4A4A4",
+"        . + @ @ # $ %                   ",
+"    & * = - ; > , ' ) ! ~               ",
+"  { ] ^ / ( _ : < [ } | 1 2             ",
+"  3 4 5 6 6 7 8 9 0 a b c d             ",
+"e f g h i j k l m n o p q r s           ",
+"t u v w x k y z A B C D E F G           ",
+"H I J K L M N O P Q R S T U V W         ",
+"X Y Z `  ...+.P @.#.$.%.&.*.=.-.        ",
+";.>.,.'.).!.~.{.].^./.(._.:.<.[.        ",
+"}.|.1.2.3.4.5.6.7.8.9.0.a.b.c.[.        ",
+"  d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.        ",
+"  s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.      ",
+"  % I.J.K.e.L.V M.N.O.P.Q.R.S.T.U.V.    ",
+"    W s W.X.u.Y.V Z.`. +.+++@+#+t.X.$+  ",
+"      %+&+*+=+-+c.{ & ;+>+,+'+)+!+~+=.{+",
+"          %+2 [.[.[.V.]+^+/+(+_+:+<+[+}+",
+"|+|+|+1+2+3+            % e 4+5+6+7+8+9+",
+"0+0+a+b+b+G               ~ c+d+e+_+f+g+",
+"2 2 [.h+h+H.                i+j+k+l+m+n+",
+"                              W o+p+|+q+"};
+
 #endif
+