Fix pb. with the progress deceleration when we install salome with the option "instal...

diff --git a/bin/SALOME_InstallWizard b/bin/SALOME_InstallWizard
index e80f5703f9cb9992b7c69a4dddb7dfad817509ab..38c59c49994c5ee22d10c0117dfaadf39a8811eb 100755 (executable)
Binary files a/bin/SALOME_InstallWizard and b/bin/SALOME_InstallWizard differ

diff --git a/config_files/BLSURFPLUGIN.sh b/config_files/BLSURFPLUGIN.sh
index 18da20d57fb079985a667b8ddfdad8056fb4f1b3..da984d2ccbd93b7d8d43238d1e7d3a3c7f2c0181 100755 (executable)
--- a/config_files/BLSURFPLUGIN.sh
+++ b/config_files/BLSURFPLUGIN.sh
@@ -123,7 +123,7 @@ check_jb tar xfz ${SRC_DIR}/BLSURFPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_R
 
 # modify all *.la files
 export BLSURFPLUGIN_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/CALCULATOR.sh b/config_files/CALCULATOR.sh
index 43fbbbdea2c425475f85714b1d91828bb4673b05..82f0bea54ad20d1e52d1d2b1168695aac9c566af 100755 (executable)
--- a/config_files/CALCULATOR.sh
+++ b/config_files/CALCULATOR.sh
@@ -124,7 +124,7 @@ check_jb tar xfz ${SRC_DIR}/CALCULATORsourcesV${VERSION}.tar.gz -C ${INSTALL_ROO
 
 # modify all *.la files
 export CALCULATOR_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 cd ${PRODUCT_DIR}/bin/salome
 sed -e "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g"             runAppli > _runAppli

diff --git a/config_files/COMPONENT.sh b/config_files/COMPONENT.sh
index fa70e685ff3242c301f09a386a2278d5671bfb7c..54f7c93b2f35147f0d5604361d06fdd8fa38d20b 100755 (executable)
--- a/config_files/COMPONENT.sh
+++ b/config_files/COMPONENT.sh
@@ -124,7 +124,7 @@ check_jb tar xfz ${SRC_DIR}/COMPONENTsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT
 
 # modify all *.la files
 export COMPONENT_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/FILTER.sh b/config_files/FILTER.sh
index 08bd6dd013e214f8da9e13eee89df4cba6b699b1..d04fb03510026da748f584f4163987488600bb2b 100755 (executable)
--- a/config_files/FILTER.sh
+++ b/config_files/FILTER.sh
@@ -120,7 +120,7 @@ check_jb tar xfz ${SRC_DIR}/FILTERsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
 export FILTER_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/GEOM.sh b/config_files/GEOM.sh
index 07d0a9eabe9c6d310549bc6d653e0036992663ce..c2687d5034e85d66c0c9bb59c4cf35cdfd0f0f38 100755 (executable)
--- a/config_files/GEOM.sh
+++ b/config_files/GEOM.sh
@@ -122,7 +122,7 @@ check_jb tar xfz ${SRC_DIR}/GEOMsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
 export GEOM_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/GHS3DPLUGIN.sh b/config_files/GHS3DPLUGIN.sh
index d12a13e223283e9c2357bceac8c2be6177d61b8d..da670a79805abcfe53cfd2df71b2528c93ba24c6 100755 (executable)
--- a/config_files/GHS3DPLUGIN.sh
+++ b/config_files/GHS3DPLUGIN.sh
@@ -124,7 +124,7 @@ check_jb tar xfz ${SRC_DIR}/GHS3DPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_RO
 
 # modify all *.la files
 export GHS3DPLUGIN_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/GHS3DPRLPLUGIN.sh b/config_files/GHS3DPRLPLUGIN.sh
index 88bb10112574401660f60680dd7a7d6997e827fd..df5926b8e8fa780b7bf228043b6071ec7598c6a4 100755 (executable)
--- a/config_files/GHS3DPRLPLUGIN.sh
+++ b/config_files/GHS3DPRLPLUGIN.sh
@@ -120,7 +120,7 @@ check_jb tar xfz ${SRC_DIR}/GHS3DPRLPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL
 
 # modify all *.la files
 export GHS3DPRLPLUGIN_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/GUI.sh b/config_files/GUI.sh
index f63604d3bd1b1f0a2c8e2ef41d7ddc806a872674..930114b2b7a05e1f8cb723d946859b8cb78e87d3 100755 (executable)
--- a/config_files/GUI.sh
+++ b/config_files/GUI.sh
@@ -122,7 +122,7 @@ check_jb tar xfz ${SRC_DIR}/GUIsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
 export GUI_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/HELLO.sh b/config_files/HELLO.sh
index 48befd4a8eebeb045cd2ba677b97c60a04d31907..933aa21e1cc204c2a2c79386a81cb0fa62c6ebae 100755 (executable)
--- a/config_files/HELLO.sh
+++ b/config_files/HELLO.sh
@@ -121,7 +121,7 @@ check_jb tar xfz ${SRC_DIR}/HELLOsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
 export HELLO_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 cd ${PRODUCT_DIR}/bin/salome
 sed -e "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g" runAppli > _runAppli

diff --git a/config_files/HexoticPLUGIN.sh b/config_files/HexoticPLUGIN.sh
index 8565d8179c1fc4e96ac32403e254b577224af022..3fa3321ccee22e8dc5d18561e122ae48815da86f 100755 (executable)
--- a/config_files/HexoticPLUGIN.sh
+++ b/config_files/HexoticPLUGIN.sh
@@ -120,7 +120,7 @@ check_jb tar xfz ${SRC_DIR}/HexoticPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_
 
 # modify all *.la files
 export HexoticPLUGIN_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/KERNEL.sh b/config_files/KERNEL.sh
index e6ee3e22fdc3eac7dc37922c0854197d2fb024d2..79157cdd5aa5dee5314a4db1cc6c343552d704ff 100755 (executable)
--- a/config_files/KERNEL.sh
+++ b/config_files/KERNEL.sh
@@ -131,7 +131,7 @@ fi
 
 # modify all *.la files
 export KERNEL_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/LIGHT.sh b/config_files/LIGHT.sh
index f4b2199ca2be381d7ac1fb2155e351ad5bfe5472..c54225b8dc0533dd17f61292afd9a2868595c7c0 100755 (executable)
--- a/config_files/LIGHT.sh
+++ b/config_files/LIGHT.sh
@@ -119,7 +119,7 @@ check_jb tar xfz ${SRC_DIR}/LIGHTsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
 export LIGHT_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/MED.sh b/config_files/MED.sh
index bfe8b6f70cb260326f654d97785289fb743fc90c..c7181c1b09b98e9ae8473914c819cd76a2ad8c11 100755 (executable)
--- a/config_files/MED.sh
+++ b/config_files/MED.sh
@@ -130,7 +130,7 @@ check_jb tar xfz ${SRC_DIR}/MEDsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
 export MED_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/MULTIPR.sh b/config_files/MULTIPR.sh
index 1d5bbbb9696e7cb62ed994d3a6113bad20b0ff0b..e3134a69bd248ea3f9d927a07a108192ad8de08a 100755 (executable)
--- a/config_files/MULTIPR.sh
+++ b/config_files/MULTIPR.sh
@@ -120,7 +120,7 @@ check_jb tar xfz ${SRC_DIR}/MULTIPRsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
 export MULTIPR_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/NETGENPLUGIN.sh b/config_files/NETGENPLUGIN.sh
index 889283074229bc8608b1de1809577b34918f87bc..71ec528db2373abd3cc3852994f80d18adc715c0 100755 (executable)
--- a/config_files/NETGENPLUGIN.sh
+++ b/config_files/NETGENPLUGIN.sh
@@ -122,7 +122,7 @@ check_jb tar xfz ${SRC_DIR}/NETGENPLUGINsourcesV${VERSION}.tar.gz -C ${INSTALL_R
 
 # modify all *.la files
 export NETGENPLUGIN_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/PYCALCULATOR.sh b/config_files/PYCALCULATOR.sh
index ae00b0797dde50a8b05b2e9f9ce955f2bb7c51f6..68b667ef063656e02b823e39b9fe8113b9732a06 100755 (executable)
--- a/config_files/PYCALCULATOR.sh
+++ b/config_files/PYCALCULATOR.sh
@@ -121,7 +121,7 @@ check_jb tar xfz ${SRC_DIR}/PYCALCULATORsourcesV${VERSION}.tar.gz -C ${INSTALL_R
 
 # modify all *.la files
 export PYCALCULATOR_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/PYHELLO.sh b/config_files/PYHELLO.sh
index 365b959d781dc674aee949a7e22567020ce24621..83d634575a29cbf803b91257889167bb4817f0fd 100755 (executable)
--- a/config_files/PYHELLO.sh
+++ b/config_files/PYHELLO.sh
@@ -120,7 +120,7 @@ check_jb tar xfz ${SRC_DIR}/PYHELLOsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
 export PYHELLO_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 cd ${PRODUCT_DIR}/bin/salome
 sed -e "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g"    runAppli > _runAppli

diff --git a/config_files/RANDOMIZER.sh b/config_files/RANDOMIZER.sh
index 4c6c55f811acfb54624415c946f721cd546c03f3..4480a2957d6f5c449ee11f990698692e07837dab 100755 (executable)
--- a/config_files/RANDOMIZER.sh
+++ b/config_files/RANDOMIZER.sh
@@ -120,7 +120,7 @@ check_jb tar xfz ${SRC_DIR}/RANDOMIZERsourcesV${VERSION}.tar.gz -C ${INSTALL_ROO
 
 # modify all *.la files
 export RANDOMIZER_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/SIERPINSKY.sh b/config_files/SIERPINSKY.sh
index 1c3a5d0b46db16a80ce7062e22e9410f061984d1..11fadbfe3f0b8caf38803707db74edc62fa86684 100755 (executable)
--- a/config_files/SIERPINSKY.sh
+++ b/config_files/SIERPINSKY.sh
@@ -121,7 +121,7 @@ check_jb tar xfz ${SRC_DIR}/SIERPINSKYsourcesV${VERSION}.tar.gz -C ${INSTALL_ROO
 
 # modify all *.la files
 export SIERPINSKY_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/SMESH.sh b/config_files/SMESH.sh
index d4dd7747b83e67cead4338c1f7255a2b6a41cb43..c03f02e19fe6546637c2dd772478f40ff1cc5254 100755 (executable)
--- a/config_files/SMESH.sh
+++ b/config_files/SMESH.sh
@@ -122,7 +122,7 @@ check_jb tar xfz ${SRC_DIR}/SMESHsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
 export SMESH_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/SUPERV.sh b/config_files/SUPERV.sh
index d48193ddda6c1dae0bd110b3b04922791588f198..fa09e4dab20020d64e50b59f12c4c9a27a4b759b 100755 (executable)
--- a/config_files/SUPERV.sh
+++ b/config_files/SUPERV.sh
@@ -122,7 +122,7 @@ check_jb tar xfz ${SRC_DIR}/SUPERVsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
 export SUPERV_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/VISU.sh b/config_files/VISU.sh
index 7d986e5b32427b1fd4afd6eb04edd41d6f00fbde..620771b476650174ae009f3839fa5aa397778311 100755 (executable)
--- a/config_files/VISU.sh
+++ b/config_files/VISU.sh
@@ -122,7 +122,7 @@ check_jb tar xfz ${SRC_DIR}/VISUsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
 export VISU_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/YACS.sh b/config_files/YACS.sh
index 251c7df2adf0dca827559697b97363e508df362b..a8cb5a6f66374798080c524695f6d31e579cecc9 100755 (executable)
--- a/config_files/YACS.sh
+++ b/config_files/YACS.sh
@@ -120,7 +120,7 @@ check_jb tar xfz ${SRC_DIR}/YACSsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
 export YACS_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled

diff --git a/config_files/modifyLaFiles.sh b/config_files/modifyLaFiles.sh
new file mode 100755 (executable)
index 0000000..04d066c
--- /dev/null
+++ b/config_files/modifyLaFiles.sh
@@ -0,0 +1,31 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : modifyLaFiles.sh
+#  Created   : Mon Feb 19 11:09:00 2008
+#  Author    : Alexander KOVALEV, Open CASCADE SAS (alexander.kovalev@opencascade.com)
+#  Project   : SALOME
+#  Module    : Installation Wizard
+#  Copyright : 2002-2008 CEA
+#
+#  This script is the part of the SALOME installation procedure.
+#
+#  The script to call modif_la_files() function in the 'common.sh' script.
+#
+####################################################################################
+
+modify_la_files(){
+
+modif_la_files ${INST_DIR}/$SINGLE_PATH
+
+test $? -eq 0 && exit 1 || exit 0
+}
+
+PROCEDURE=$1
+INST_DIR=$2
+SINGLE_PATH=$3
+
+source ${INST_DIR}/env_products.sh
+source ./common.sh
+
+$PROCEDURE