From 5c6298e430dbf988e590301392f34e40f22436b0 Mon Sep 17 00:00:00 2001 From: inv Date: Wed, 21 Apr 2010 06:58:59 +0000 Subject: [PATCH] Update for 5.1.4 --- README | 20 +++---- config_Debian_3.1.xml | 62 +++++++++++----------- config_Debian_4.0.xml | 62 +++++++++++----------- config_Debian_4.0_64bit.xml | 66 ++++++++++++------------ config_Fedora_Core_6.xml | 62 +++++++++++----------- config_Mandriva_2006.0.xml | 62 +++++++++++----------- config_Mandriva_2006.0_64bit.xml | 62 +++++++++++----------- config_Mandriva_2008.0.xml | 62 +++++++++++----------- config_Mandriva_2008.0_64bit.xml | 62 +++++++++++----------- config_Red_Hat_Enterprise_WS_4_64bit.xml | 62 +++++++++++----------- config_Scientific_SL_5.1_64bit.xml | 62 +++++++++++----------- src/Makefile | 2 +- src/SALOME_InstallWizard.cxx | 6 +-- src/main.cxx | 2 +- 14 files changed, 327 insertions(+), 327 deletions(-) diff --git a/README b/README index fa1a5f1..8865e29 100644 --- a/README +++ b/README @@ -122,13 +122,13 @@ source salome.csh where is KERNEL binaries directory, e.g. - KERNEL_5.1.3 for the 5.1.3 version. + KERNEL_5.1.4 for the 5.1.4 version. 2.2. Launching of SALOME After you set environment you can start SALOME. Go to the KERNEL - module's binaries directory (KERNEL_5.1.3/bin/salome for the version - 5.1.3) by using of 'cd' command and then type: + module's binaries directory (KERNEL_5.1.4/bin/salome for the version + 5.1.4) by using of 'cd' command and then type: runSalome [] @@ -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_5.1.3 for KERNEL module of SALOME version 5.1.3. + KERNEL_SRC_5.1.4 for KERNEL module of SALOME version 5.1.4. Compilation and installation should be performed according to the dependencies between modules: @@ -389,12 +389,12 @@ - create a configuration script by typing - ../KERNEL_SRC_5.1.3/build_configure + ../KERNEL_SRC_5.1.4/build_configure - run configure script which will check the environment and create Makefile files: - ../KERNEL_SRC_5.1.3/configure --prefix=/home/user/salome/KERNEL-5.1.3 + ../KERNEL_SRC_5.1.4/configure --prefix=/home/user/salome/KERNEL-5.1.4 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-5.1.3 directory. + installed into /home/user/salome/KERNEL-5.1.4 directory. - modify your environment scripts: * for bash: - export KERNEL_ROOT_DIR=/home/user/salome/KERNEL-5.1.3 + export KERNEL_ROOT_DIR=/home/user/salome/KERNEL-5.1.4 * for csh: - setenv KERNEL_ROOT_DIR /home/user/salome/KERNEL-5.1.3 + setenv KERNEL_ROOT_DIR /home/user/salome/KERNEL-5.1.4 - 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/ - where is a MODULE-5.1.3 (see above). + where is a MODULE-5.1.4 (see above). 4.2. Automatic build procedure: build.csh and build.sh scripts diff --git a/config_Debian_3.1.xml b/config_Debian_3.1.xml index 5e331b4..88141e9 100755 --- a/config_Debian_3.1.xml +++ b/config_Debian_3.1.xml @@ -1,11 +1,11 @@ - @@ -24,7 +24,7 @@ type="component" description="SALOME platform KERNEL module"> @@ -44,7 +44,7 @@ type="component" description="SALOME platform GEOM module"> @@ -83,7 +83,7 @@ type="component" description="SALOME platform NETGEN meshing algorithm plugin"> @@ -142,7 +142,7 @@ type="component" description="SALOME platform PYCALCULATOR module"> @@ -151,7 +151,7 @@ type="component" description="SALOME platform CALCULATOR module"> @@ -160,7 +160,7 @@ type="component" description="Example SALOME C++ module: Hello."> @@ -169,7 +169,7 @@ type="component" description="Example SALOME Python module: Hello."> @@ -178,7 +178,7 @@ type="component" description="LIGHT (no-CORBA-engine) SALOME module example"> @@ -187,7 +187,7 @@ type="component" description="LIGHT Python (no-CORBA-engine) SALOME module example"> @@ -196,7 +196,7 @@ type="component" description="SALOME-based module implement simple interface to calculate Sierpinsky fields"> @@ -205,7 +205,7 @@ type="component" description="SALOME-based module implement simple interface to calculate Sierpinsky fields"> @@ -214,7 +214,7 @@ type="component" description="Med Memory package"> @@ -223,7 +223,7 @@ type="component" description="Partitioning/decimation module for the SALOME platform"> @@ -232,7 +232,7 @@ type="component" description="Tool to supervise execution of complex interconnected scientific applications"> @@ -251,7 +251,7 @@ type="component" description="Component and module generator for SALOME"> @@ -260,7 +260,7 @@ type="component" description="SALOME samples files"> @@ -288,7 +288,7 @@ type="component" description="SALOME module generator documentation"> @@ -298,7 +298,7 @@ type="component" description="SALOME documentation"> - @@ -24,7 +24,7 @@ type="component" description="SALOME platform KERNEL module"> @@ -44,7 +44,7 @@ type="component" description="SALOME platform GEOM module"> @@ -83,7 +83,7 @@ type="component" description="SALOME platform NETGEN meshing algorithm plugin"> @@ -142,7 +142,7 @@ type="component" description="SALOME platform PYCALCULATOR module"> @@ -151,7 +151,7 @@ type="component" description="SALOME platform CALCULATOR module"> @@ -160,7 +160,7 @@ type="component" description="Example SALOME C++ module: Hello."> @@ -169,7 +169,7 @@ type="component" description="Example SALOME Python module: Hello."> @@ -178,7 +178,7 @@ type="component" description="LIGHT (no-CORBA-engine) SALOME module example"> @@ -187,7 +187,7 @@ type="component" description="LIGHT Python (no-CORBA-engine) SALOME module example"> @@ -196,7 +196,7 @@ type="component" description="SALOME-based module implement simple interface to calculate Sierpinsky fields"> @@ -205,7 +205,7 @@ type="component" description="SALOME-based module implement simple interface to calculate Sierpinsky fields"> @@ -214,7 +214,7 @@ type="component" description="Med Memory package"> @@ -223,7 +223,7 @@ type="component" description="Partitioning/decimation module for the SALOME platform"> @@ -232,7 +232,7 @@ type="component" description="Tool to supervise execution of complex interconnected scientific applications"> @@ -251,7 +251,7 @@ type="component" description="Component and module generator for SALOME"> @@ -260,7 +260,7 @@ type="component" description="SALOME samples files"> @@ -288,7 +288,7 @@ type="component" description="SALOME module generator documentation"> @@ -298,7 +298,7 @@ type="component" description="SALOME documentation"> - @@ -24,7 +24,7 @@ type="component" description="SALOME platform KERNEL module"> @@ -44,7 +44,7 @@ type="component" description="SALOME platform GEOM module"> @@ -83,7 +83,7 @@ type="component" description="SALOME platform NETGEN meshing algorithm plugin"> @@ -142,7 +142,7 @@ type="component" description="SALOME platform PYCALCULATOR module"> @@ -151,7 +151,7 @@ type="component" description="SALOME platform CALCULATOR module"> @@ -160,7 +160,7 @@ type="component" description="Example SALOME C++ module: Hello."> @@ -169,7 +169,7 @@ type="component" description="Example SALOME Python module: Hello."> @@ -178,7 +178,7 @@ type="component" description="LIGHT (no-CORBA-engine) SALOME module example"> @@ -187,7 +187,7 @@ type="component" description="LIGHT Python (no-CORBA-engine) SALOME module example"> @@ -196,7 +196,7 @@ type="component" description="SALOME-based module implement simple interface to calculate Sierpinsky fields"> @@ -205,7 +205,7 @@ type="component" description="SALOME-based module implement simple interface to calculate Sierpinsky fields"> @@ -214,7 +214,7 @@ type="component" description="Med Memory package"> @@ -223,7 +223,7 @@ type="component" description="Partitioning/decimation module for the SALOME platform"> @@ -232,7 +232,7 @@ type="component" description="Tool to supervise execution of complex interconnected scientific applications"> @@ -251,7 +251,7 @@ type="component" description="Component and module generator for SALOME"> @@ -260,7 +260,7 @@ type="component" description="SALOME samples files"> @@ -288,7 +288,7 @@ type="component" description="SALOME module generator documentation"> @@ -298,7 +298,7 @@ type="component" description="SALOME documentation"> + script="tcltk-8.5.8.sh"/> - @@ -24,7 +24,7 @@ type="component" description="SALOME platform KERNEL module"> @@ -44,7 +44,7 @@ type="component" description="SALOME platform GEOM module"> @@ -83,7 +83,7 @@ type="component" description="SALOME platform NETGEN meshing algorithm plugin"> @@ -142,7 +142,7 @@ type="component" description="SALOME platform PYCALCULATOR module"> @@ -151,7 +151,7 @@ type="component" description="SALOME platform CALCULATOR module"> @@ -160,7 +160,7 @@ type="component" description="Example SALOME C++ module: Hello."> @@ -169,7 +169,7 @@ type="component" description="Example SALOME Python module: Hello."> @@ -178,7 +178,7 @@ type="component" description="LIGHT (no-CORBA-engine) SALOME module example"> @@ -187,7 +187,7 @@ type="component" description="LIGHT Python (no-CORBA-engine) SALOME module example"> @@ -196,7 +196,7 @@ type="component" description="SALOME-based module implement simple interface to calculate Sierpinsky fields"> @@ -205,7 +205,7 @@ type="component" description="SALOME-based module implement simple interface to calculate Sierpinsky fields"> @@ -214,7 +214,7 @@ type="component" description="Med Memory package"> @@ -223,7 +223,7 @@ type="component" description="Partitioning/decimation module for the SALOME platform"> @@ -232,7 +232,7 @@ type="component" description="Tool to supervise execution of complex interconnected scientific applications"> @@ -251,7 +251,7 @@ type="component" description="Component and module generator for SALOME"> @@ -260,7 +260,7 @@ type="component" description="SALOME samples files"> @@ -288,7 +288,7 @@ type="component" description="SALOME module generator documentation"> @@ -298,7 +298,7 @@ type="component" description="SALOME documentation"> - @@ -24,7 +24,7 @@ type="component" description="SALOME platform KERNEL module"> @@ -44,7 +44,7 @@ type="component" description="SALOME platform GEOM module"> @@ -83,7 +83,7 @@ type="component" description="SALOME platform NETGEN meshing algorithm plugin"> @@ -142,7 +142,7 @@ type="component" description="SALOME platform PYCALCULATOR module"> @@ -151,7 +151,7 @@ type="component" description="SALOME platform CALCULATOR module"> @@ -160,7 +160,7 @@ type="component" description="Example SALOME C++ module: Hello."> @@ -169,7 +169,7 @@ type="component" description="Example SALOME Python module: Hello."> @@ -178,7 +178,7 @@ type="component" description="LIGHT (no-CORBA-engine) SALOME module example"> @@ -187,7 +187,7 @@ type="component" description="LIGHT Python (no-CORBA-engine) SALOME module example"> @@ -196,7 +196,7 @@ type="component" description="SALOME-based module implement simple interface to calculate Sierpinsky fields"> @@ -205,7 +205,7 @@ type="component" description="SALOME-based module implement simple interface to calculate Sierpinsky fields"> @@ -214,7 +214,7 @@ type="component" description="Med Memory package"> @@ -223,7 +223,7 @@ type="component" description="Partitioning/decimation module for the SALOME platform"> @@ -232,7 +232,7 @@ type="component" description="Tool to supervise execution of complex interconnected scientific applications"> @@ -251,7 +251,7 @@ type="component" description="Component and module generator for SALOME"> @@ -260,7 +260,7 @@ type="component" description="SALOME samples files"> @@ -288,7 +288,7 @@ type="component" description="SALOME module generator documentation"> @@ -298,7 +298,7 @@ type="component" description="SALOME documentation"> - @@ -24,7 +24,7 @@ type="component" description="SALOME platform KERNEL module"> @@ -44,7 +44,7 @@ type="component" description="SALOME platform GEOM module"> @@ -83,7 +83,7 @@ type="component" description="SALOME platform NETGEN meshing algorithm plugin"> @@ -142,7 +142,7 @@ type="component" description="SALOME platform PYCALCULATOR module"> @@ -151,7 +151,7 @@ type="component" description="SALOME platform CALCULATOR module"> @@ -160,7 +160,7 @@ type="component" description="Example SALOME C++ module: Hello."> @@ -169,7 +169,7 @@ type="component" description="Example SALOME Python module: Hello."> @@ -178,7 +178,7 @@ type="component" description="LIGHT (no-CORBA-engine) SALOME module example"> @@ -187,7 +187,7 @@ type="component" description="LIGHT Python (no-CORBA-engine) SALOME module example"> @@ -196,7 +196,7 @@ type="component" description="SALOME-based module implement simple interface to calculate Sierpinsky fields"> @@ -205,7 +205,7 @@ type="component" description="SALOME-based module implement simple interface to calculate Sierpinsky fields"> @@ -214,7 +214,7 @@ type="component" description="Med Memory package"> @@ -223,7 +223,7 @@ type="component" description="Partitioning/decimation module for the SALOME platform"> @@ -232,7 +232,7 @@ type="component" description="Tool to supervise execution of complex interconnected scientific applications"> @@ -251,7 +251,7 @@ type="component" description="Component and module generator for SALOME"> @@ -260,7 +260,7 @@ type="component" description="SALOME samples files"> @@ -288,7 +288,7 @@ type="component" description="SALOME module generator documentation"> @@ -298,7 +298,7 @@ type="component" description="SALOME documentation"> - @@ -24,7 +24,7 @@ type="component" description="SALOME platform KERNEL module"> @@ -44,7 +44,7 @@ type="component" description="SALOME platform GEOM module"> @@ -83,7 +83,7 @@ type="component" description="SALOME platform NETGEN meshing algorithm plugin"> @@ -142,7 +142,7 @@ type="component" description="SALOME platform PYCALCULATOR module"> @@ -151,7 +151,7 @@ type="component" description="SALOME platform CALCULATOR module"> @@ -160,7 +160,7 @@ type="component" description="Example SALOME C++ module: Hello."> @@ -169,7 +169,7 @@ type="component" description="Example SALOME Python module: Hello."> @@ -178,7 +178,7 @@ type="component" description="LIGHT (no-CORBA-engine) SALOME module example"> @@ -187,7 +187,7 @@ type="component" description="LIGHT Python (no-CORBA-engine) SALOME module example"> @@ -196,7 +196,7 @@ type="component" description="SALOME-based module implement simple interface to calculate Sierpinsky fields"> @@ -205,7 +205,7 @@ type="component" description="SALOME-based module implement simple interface to calculate Sierpinsky fields"> @@ -214,7 +214,7 @@ type="component" description="Med Memory package"> @@ -223,7 +223,7 @@ type="component" description="Partitioning/decimation module for the SALOME platform"> @@ -232,7 +232,7 @@ type="component" description="Tool to supervise execution of complex interconnected scientific applications"> @@ -251,7 +251,7 @@ type="component" description="Component and module generator for SALOME"> @@ -260,7 +260,7 @@ type="component" description="SALOME samples files"> @@ -288,7 +288,7 @@ type="component" description="SALOME module generator documentation"> @@ -298,7 +298,7 @@ type="component" description="SALOME documentation"> - @@ -24,7 +24,7 @@ type="component" description="SALOME platform KERNEL module"> @@ -44,7 +44,7 @@ type="component" description="SALOME platform GEOM module"> @@ -83,7 +83,7 @@ type="component" description="SALOME platform NETGEN meshing algorithm plugin"> @@ -142,7 +142,7 @@ type="component" description="SALOME platform PYCALCULATOR module"> @@ -151,7 +151,7 @@ type="component" description="SALOME platform CALCULATOR module"> @@ -160,7 +160,7 @@ type="component" description="Example SALOME C++ module: Hello."> @@ -169,7 +169,7 @@ type="component" description="Example SALOME Python module: Hello."> @@ -178,7 +178,7 @@ type="component" description="LIGHT (no-CORBA-engine) SALOME module example"> @@ -187,7 +187,7 @@ type="component" description="LIGHT Python (no-CORBA-engine) SALOME module example"> @@ -196,7 +196,7 @@ type="component" description="SALOME-based module implement simple interface to calculate Sierpinsky fields"> @@ -205,7 +205,7 @@ type="component" description="SALOME-based module implement simple interface to calculate Sierpinsky fields"> @@ -214,7 +214,7 @@ type="component" description="Med Memory package"> @@ -223,7 +223,7 @@ type="component" description="Partitioning/decimation module for the SALOME platform"> @@ -232,7 +232,7 @@ type="component" description="Tool to supervise execution of complex interconnected scientific applications"> @@ -251,7 +251,7 @@ type="component" description="Component and module generator for SALOME"> @@ -260,7 +260,7 @@ type="component" description="SALOME samples files"> @@ -288,7 +288,7 @@ type="component" description="SALOME module generator documentation"> @@ -298,7 +298,7 @@ type="component" description="SALOME documentation"> - @@ -24,7 +24,7 @@ type="component" description="SALOME platform KERNEL module"> @@ -44,7 +44,7 @@ type="component" description="SALOME platform GEOM module"> @@ -83,7 +83,7 @@ type="component" description="SALOME platform NETGEN meshing algorithm plugin"> @@ -142,7 +142,7 @@ type="component" description="SALOME platform PYCALCULATOR module"> @@ -151,7 +151,7 @@ type="component" description="SALOME platform CALCULATOR module"> @@ -160,7 +160,7 @@ type="component" description="Example SALOME C++ module: Hello."> @@ -169,7 +169,7 @@ type="component" description="Example SALOME Python module: Hello."> @@ -178,7 +178,7 @@ type="component" description="LIGHT (no-CORBA-engine) SALOME module example"> @@ -187,7 +187,7 @@ type="component" description="LIGHT Python (no-CORBA-engine) SALOME module example"> @@ -196,7 +196,7 @@ type="component" description="SALOME-based module implement simple interface to calculate Sierpinsky fields"> @@ -205,7 +205,7 @@ type="component" description="SALOME-based module implement simple interface to calculate Sierpinsky fields"> @@ -214,7 +214,7 @@ type="component" description="Med Memory package"> @@ -223,7 +223,7 @@ type="component" description="Partitioning/decimation module for the SALOME platform"> @@ -232,7 +232,7 @@ type="component" description="Tool to supervise execution of complex interconnected scientific applications"> @@ -251,7 +251,7 @@ type="component" description="Component and module generator for SALOME"> @@ -260,7 +260,7 @@ type="component" description="SALOME samples files"> @@ -288,7 +288,7 @@ type="component" description="SALOME module generator documentation"> @@ -298,7 +298,7 @@ type="component" description="SALOME documentation"> - @@ -24,7 +24,7 @@ type="component" description="SALOME platform KERNEL module"> @@ -44,7 +44,7 @@ type="component" description="SALOME platform GEOM module"> @@ -83,7 +83,7 @@ type="component" description="SALOME platform NETGEN meshing algorithm plugin"> @@ -142,7 +142,7 @@ type="component" description="SALOME platform PYCALCULATOR module"> @@ -151,7 +151,7 @@ type="component" description="SALOME platform CALCULATOR module"> @@ -160,7 +160,7 @@ type="component" description="Example SALOME C++ module: Hello."> @@ -169,7 +169,7 @@ type="component" description="Example SALOME Python module: Hello."> @@ -178,7 +178,7 @@ type="component" description="LIGHT (no-CORBA-engine) SALOME module example"> @@ -187,7 +187,7 @@ type="component" description="LIGHT Python (no-CORBA-engine) SALOME module example"> @@ -196,7 +196,7 @@ type="component" description="SALOME-based module implement simple interface to calculate Sierpinsky fields"> @@ -205,7 +205,7 @@ type="component" description="SALOME-based module implement simple interface to calculate Sierpinsky fields"> @@ -214,7 +214,7 @@ type="component" description="Med Memory package"> @@ -223,7 +223,7 @@ type="component" description="Partitioning/decimation module for the SALOME platform"> @@ -232,7 +232,7 @@ type="component" description="Tool to supervise execution of complex interconnected scientific applications"> @@ -251,7 +251,7 @@ type="component" description="Component and module generator for SALOME"> @@ -260,7 +260,7 @@ type="component" description="SALOME samples files"> @@ -288,7 +288,7 @@ type="component" description="SALOME module generator documentation"> @@ -298,7 +298,7 @@ type="component" description="SALOME documentation"> setText( "Copyright © 2007-2009 CEA/DEN" ); + copyright->setText( "Copyright © 2007-2010 CEA/DEN" ); QFont font = title->font(); font.setPointSize( (int)( font.pointSize() * 1.8 ) ); title->setFont( font ); @@ -559,9 +559,9 @@ SALOME_InstallWizard::SALOME_InstallWizard(const QString& aXmlFileName, addLogo( pixmap( pxLogo ) ); // set defaults - setVersion( "5.1.3" ); + setVersion( "5.1.4" ); setCaption( tr( "SALOME %1" ).arg( myVersion ) ); - setCopyright( tr( "
Copyright © 2007-2009 CEA/DEN, EDF R&D, OPEN CASCADE
" + setCopyright( tr( "
Copyright © 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
" "
Copyright © 2003-2007 OPEN CASCADE,
EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D,
LEG, PRINCIPIA R&D, BUREAU VERITAS
" )); setLicense( tr( "
GNU LGPL
" ) ); diff --git a/src/main.cxx b/src/main.cxx index 81ccd14..c573652 100644 --- a/src/main.cxx +++ b/src/main.cxx @@ -67,7 +67,7 @@ int main( int argc, char **argv ) ( QT_VERSION >> 16 ) & 0xFF, ( QT_VERSION >> 8 ) & 0xFF, ( QT_VERSION ) & 0xFF ); - printf("Copyright (C) 2002-2009 CEA\n"); + printf("Copyright (C) 2002-2010 CEA\n"); return 0; } else if ( a == "--target" || a == "-d" ) { -- 2.39.2