Update for Salome 6.4.0

diff --git a/README b/README
index 2c50ae376eebe08d5caa605b0bb8c5f4827c4e5a..1362bb1b5426fc2f1d3f042cefd2546e5899cef9 100644 (file)
--- a/README
+++ b/README
@@ -122,13 +122,13 @@
                source salome.csh
 
           where <KERNEL_ROOT_DIR> is KERNEL binaries directory, e.g. 
-          KERNEL_6.3.0 for the 6.3.0 version.
+          KERNEL_6.4.0 for the 6.4.0 version.
 
      2.2. Launching of SALOME
        
           After you set environment you can start SALOME. Go to the KERNEL 
-          module's binaries directory (KERNEL_6.3.0/bin/salome for the version 
-          6.3.0) by using of 'cd' command and then type:
+          module's binaries directory (KERNEL_6.4.0/bin/salome for the version 
+          6.4.0) by using of 'cd' command and then type:
 
                runSalome [<parameters>]
 
@@ -318,7 +318,7 @@
           In this scenario it is supposed that you have installed SALOME
           modules sources in the /home/user/salome directory. The name of each module
           sources directory depends on the version of the platform, for example,
-          KERNEL_SRC_6.3.0 for KERNEL module of SALOME version 6.3.0.
+          KERNEL_SRC_6.4.0 for KERNEL module of SALOME version 6.4.0.
 
           Compilation and installation should be performed according to 
           the dependencies between modules:
@@ -389,12 +389,12 @@
 
           - create a configuration script by typing
 
-               ../KERNEL_SRC_6.3.0/build_configure
+               ../KERNEL_SRC_6.4.0/build_configure
 
           - run configure script which will check the environment and create 
            Makefile files:
 
-               ../KERNEL_SRC_6.3.0/configure --prefix=/home/user/salome/KERNEL-6.3.0
+               ../KERNEL_SRC_6.4.0/configure --prefix=/home/user/salome/KERNEL-6.4.0
 
           Note, that --prefix option defines the directory where you want to 
           install KERNEL module after 'make install' procedure. configure script
@@ -409,17 +409,17 @@
                make install
 
           After you have completed this scenario, KERNEL module is built and 
-          installed into /home/user/salome/KERNEL-6.3.0 directory.
+          installed into /home/user/salome/KERNEL-6.4.0 directory.
 
           - modify your environment scripts:
 
           * for bash:
 
-               export KERNEL_ROOT_DIR=/home/user/salome/KERNEL-6.3.0
+               export KERNEL_ROOT_DIR=/home/user/salome/KERNEL-6.4.0
 
           * for csh:
 
-               setenv KERNEL_ROOT_DIR /home/user/salome/KERNEL-6.3.0
+               setenv KERNEL_ROOT_DIR /home/user/salome/KERNEL-6.4.0
 
           - then repeat this scenario for other modules you want to build taking 
             into account the dependencies between modules (see dependencies table
@@ -437,7 +437,7 @@
 
                setenv MODULE_ROOT_DIR /home/user/salome/<MODULE_distribution>
 
-          where <MODULE_distribution> is a MODULE-6.3.0 (see above).
+          where <MODULE_distribution> is a MODULE-6.4.0 (see above).
 
      4.2. Automatic build procedure: build.csh and build.sh scripts
 

diff --git a/bin/SALOME_InstallWizard b/bin/SALOME_InstallWizard
index 02845574e07d7d3277057251692295180a7ef783..2d226e75cb6ddb129360b9ab943876b178507dc5 100755 (executable)
Binary files a/bin/SALOME_InstallWizard and b/bin/SALOME_InstallWizard differ

diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index fa542fc3c13c14926c8fc6f258d8d2076a553cc7..22a362da12d26f8e58f7622c171487c777bdc278 100755 (executable)
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -1,11 +1,11 @@
 <document>
 
-  <config version="6.3.1"
+  <config version="6.4.0"
          caption="SALOME v%1"
          copyright="&lt;h5>Copyright (C) 2007-2011 CEA/DEN, EDF R&amp;D, OPEN CASCADE&lt;br>&lt;br>Copyright (C) 2003-2007 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>"
          platforms="Mandriva 2008.0"
-         targetdir="${HOME}/salome_6.3.1"
+         targetdir="${HOME}/salome_6.4.0"
          tempdir="/tmp"
          optionallibs="libcppunit,libblsurf"/>
 
@@ -24,7 +24,7 @@
              type="component"
             description="SALOME platform KERNEL module">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    woguimode="true"
                    installdiskspace="39376,13516,135020"
@@ -35,7 +35,7 @@
              type="component"
             description="SALOME platform GUI module">
       <installation os="Mandriva 2008.0"
-                   version="6.3.1" 
+                   version="6.4.0" 
                    disable="false"
                    installdiskspace="16852,17076,102216"
                    script="GUI.sh"/>
@@ -44,7 +44,7 @@
              type="component"
             description="SALOME platform GEOM module">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    woguimode="true"
                    installdiskspace="32484,27092,157884"
@@ -54,7 +54,7 @@
              type="component"
             description="SALOME platform MED module">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    woguimode="true"
                    installdiskspace="132980,94224,423000"
@@ -64,7 +64,7 @@
              type="component"
             description="SALOME platform SMESH module">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    woguimode="true"
                    installdiskspace="35052,22268,155620"
@@ -74,7 +74,7 @@
              type="component"
             description="SALOME platform VISU module">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    installdiskspace="28204,13148,128936"
                    script="VISU.sh"/>
@@ -83,7 +83,7 @@
              type="component"
             description="SALOME platform PARAVIS module">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    installdiskspace="161032,1396,599320"
                    script="PARAVIS.sh"/>
@@ -92,7 +92,7 @@
              type="component"
             description="SALOME platform HEXABLOCK module">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    installdiskspace="35052,22268,155620"
                    script="HEXABLOCK.sh"/>
@@ -101,7 +101,7 @@
              type="component"
             description="SALOME platform HEXABLOCK meshing algorithm plugin">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    installdiskspace="5772,54320,64924"
                    script="HEXABLOCKPLUGIN.sh"/>
@@ -110,7 +110,7 @@
              type="component"
             description="SALOME platform NETGEN meshing algorithm plugin">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    woguimode="true"
                    installdiskspace="5772,54320,64924"
@@ -120,7 +120,7 @@
              type="component"
             description="SALOME platform GHS3D meshing algorithm plugin. For use this plugin you should add the path to ghs3d to your PATH environment variable.">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    woguimode="true"
                    installdiskspace="816,2360,9188"
@@ -130,7 +130,7 @@
              type="component"
             description="SMESH plugin from CEA">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    woguimode="true"
                    installdiskspace="792,2560,9636"
@@ -140,7 +140,7 @@
              type="component"
             description="SMESH plugin from CEA">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    woguimode="true"
                    installdiskspace="584,2332,8420"
@@ -150,7 +150,7 @@
              type="component"
             description="SMESH plugin from CEA sources">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    woguimode="true"
                    installdiskspace="1356,2756,12000"
@@ -160,7 +160,7 @@
              type="component"
             description="SALOME platform COMPONENT module">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    installdiskspace="2960,3100,18892"
                    script="COMPONENT.sh"/>
@@ -169,7 +169,7 @@
              type="component"
             description="SALOME platform PYCALCULATOR module">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    installdiskspace="220,2060,5764"
                    script="PYCALCULATOR.sh"/>
@@ -178,7 +178,7 @@
              type="component"
             description="SALOME platform CALCULATOR module">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    installdiskspace="1012,2320,8644"
                    script="CALCULATOR.sh"/>
@@ -187,7 +187,7 @@
              type="component"
             description="Example SALOME C++ module: Hello.">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    installdiskspace="540,2096,6656"
                    script="HELLO.sh"/>
@@ -196,7 +196,7 @@
              type="component"
             description="Example SALOME Python module: Hello.">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    installdiskspace="408,1968,5468"
                    script="PYHELLO.sh"/>
@@ -205,7 +205,7 @@
              type="component"
             description="Example from Salome tutorial.">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    installdiskspace="408,1968,5468"
                    script="ATOMGEN.sh"/>
@@ -214,7 +214,7 @@
              type="component"
             description="Example from Salome tutorial.">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    installdiskspace="408,1968,5468"
                    script="ATOMSOLV.sh"/>
@@ -223,7 +223,7 @@
              type="component"
             description="Example from Salome tutorial.">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    installdiskspace="408,1968,5468"
                    script="ATOMIC.sh"/>
@@ -232,7 +232,7 @@
              type="component"
             description="LIGHT (no-CORBA-engine) SALOME module example">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    installdiskspace="248,2080,6364"
                    script="LIGHT.sh"/>
@@ -241,7 +241,7 @@
              type="component"
             description="LIGHT Python (no-CORBA-engine) SALOME module example">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    installdiskspace="112,1796,4772"
                    script="PYLIGHT.sh"/>
@@ -250,7 +250,7 @@
              type="component"
             description="SALOME-based module implement simple interface to calculate Sierpinsky fields">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    installdiskspace="196,1808,5060"
                    script="RANDOMIZER.sh"/>
@@ -259,7 +259,7 @@
              type="component"
             description="SALOME-based module implement simple interface to calculate Sierpinsky fields">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    installdiskspace="480,2316,7680"
                    script="SIERPINSKY.sh"/>
@@ -268,7 +268,7 @@
              type="component"
             description="Med Memory package">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="true"
                    installdiskspace="208,221,2958"
                    script="FILTER.sh"/>
@@ -277,7 +277,7 @@
              type="component"
             description="Tool to supervise execution of complex interconnected scientific applications">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    installdiskspace="49528,27596,226440"
                    script="YACS.sh"/>
@@ -286,7 +286,7 @@
             type="component"
              description="Component and module generator for SALOME">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    installdiskspace="356,668,1200"
                    script="YACSGEN.sh"/>
@@ -296,7 +296,7 @@
             type="component"
              description="Component and module generator for SALOME">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    installdiskspace="1880,512,15476"
                    script="JOBMANAGER.sh"/>
@@ -305,7 +305,7 @@
              type="component"
             description="SALOME samples files">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    installdiskspace="115800,115800,115800"
                    script="SAMPLES.sh"/>
@@ -314,7 +314,7 @@
              type="component"
             description="Introduction to the developing of an application based on SALOME platform">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    installdiskspace="115800,115800,115800"
                    script="TUTORIAL.sh"/>
@@ -323,7 +323,7 @@
              type="component"
             description="SALOME platform HOMARD module">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    installdiskspace="115800,115800,115800"
                    script="HOMARD.sh"/>
@@ -341,7 +341,7 @@
             type="component"
              description="SALOME module generator">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    installdiskspace="1332,3160,11504"
                    script="HXX2SALOME.sh"/>
@@ -350,7 +350,7 @@
             type="component"
              description="SALOME module generator documentation">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    installdiskspace="0,2308,2308"
                    script="HXX2SALOMEDOC.sh"/>
@@ -359,7 +359,7 @@
             type="component"
              description="SALOME documentation">
       <installation os="Mandriva 2008.0"
-                    version="6.3.1" 
+                    version="6.4.0" 
                    disable="false"
                    woguimode="true"
                    installdiskspace="0,814464,0"
@@ -540,10 +540,10 @@
             type="prerequisite"
             description="MED format interface library">
       <installation os="Mandriva 2008.0"
-                    version="3.0.3" 
+                    version="3.0.4" 
                    disable="false"
                    installdiskspace="11524,11468,45860"
-                   script="med-3.0.3.sh"/>
+                   script="med-3.0.4.sh"/>
     </product>
     <product name="Metis"
             type="prerequisite"

diff --git a/config_files/common.sh b/config_files/common.sh
index b6658c6011dc49bbde5c260274bfdd3b75935ea7..b32cec265d9f5e302411102eec01e878a2ee4d29 100755 (executable)
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -19,9 +19,9 @@ export CSHRC="salome.csh"
 #####################################################
 # !WARNING! This is current SALOME version number 
 ####################################################
-export SALOME_VERSION="6.3.1"
-export YACSGEN_VERSION="6.3.1"
-export JOBMANAGER_VERSION="6.3.1"
+export SALOME_VERSION="6.4.0"
+export YACSGEN_VERSION="6.4.0"
+export JOBMANAGER_VERSION="6.4.0"
 
 # Name of the single directory for SALOME modules
 export SDIR_NAME="SALOME_${SALOME_VERSION}"
@@ -900,6 +900,20 @@ if [ "$l" != "X" ] ; then
     chmod -f --reference=$l $l"_"
     mv -f $l"_" $l 
 
+    # . process freetype dependencies
+    freetypedir=`printenv FREETYPEDIR`/lib
+    if [ ! -d ${freetypedir} ] ; then freetypedir=`printenv FREETYPEDIR`/lib ; fi
+    sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*freetype-[0-9]\.[0-9]\+\.[0-9]/lib% \1${freetypedir}%g" $l > $l"_"
+    chmod -f --reference=$l $l"_"
+    mv -f $l"_" $l 
+
+    # . process  ftgl dependencies
+    ftgldir=`printenv FTGLDIR`/lib
+    if [ ! -d ${ftgldir} ] ; then ftgldir=`printenv FTGLDIR`/lib ; fi
+    sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*ftgl-[0-9]\.[0-9]\+\.[0-9]/lib% \1${ftgldir}%g" $l > $l"_"
+    chmod -f --reference=$l $l"_"
+    mv -f $l"_" $l 
+
 fi
 done
 

diff --git a/doc/readme.html b/doc/readme.html
index 5134aeb55698111928f6e3513f94bf114e5de963..529635a986ad4a0c2a582c31e877237e6f712330 100755 (executable)
--- a/doc/readme.html
+++ b/doc/readme.html
@@ -36,7 +36,7 @@ Wizard Help</font></font></h3>
 </table>
 </center>
 <div align="right"><b><font color="#000099">updated for the version </font><font
- color="#ff0000">6.3.1</font></b></div>
+ color="#ff0000">6.4.0</font></b></div>
 <hr>
 <ul>
   <li> <a href="#install_from_wizard">Installing products with the

diff --git a/src/SALOME_InstallWizard.cxx b/src/SALOME_InstallWizard.cxx
index 501bc76e31c2f9db01d72161042c8aae8763f0ec..ba1c90a10e1d84049901c33a371b4e92e1bb7309 100644 (file)
--- a/src/SALOME_InstallWizard.cxx
+++ b/src/SALOME_InstallWizard.cxx
@@ -572,7 +572,7 @@ SALOME_InstallWizard::SALOME_InstallWizard(const QString& aXmlFileName,
   addLogo( pixmap( pxLogo ) );
 
   // set defaults
-  setVersion( "6.3.1" );
+  setVersion( "6.4.0" );
   setCaption( tr( "SALOME %1" ).arg( myVersion ) );
   setCopyright( tr( "<h5>Copyright &copy; 2007-2011 CEA/DEN, EDF R&amp;D, OPEN CASCADE<br></h5>"
                "<h5>Copyright &copy; 2003-2007 OPEN CASCADE,<br>EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D,<br>LEG, PRINCIPIA R&amp;D, BUREAU VERITAS</h5>" ));