From: vsr <vsr@opencascade.com>
Date: Thu, 8 May 2008 10:02:51 +0000 (+0000)
Subject: 1. Prepeare for version 3.2.10
X-Git-Tag: V_3_2_10~36
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6213862b91210dc373a130efb1bd5ad156e4b21e;p=tools%2Finstall.git

1. Prepeare for version 3.2.10
2. Add 'install to single dir' option
---

diff --git a/config_files/CALCULATOR_BIN.sh b/config_files/CALCULATOR_BIN.sh
index 3cc2764..739b22f 100755
--- a/config_files/CALCULATOR_BIN.sh
+++ b/config_files/CALCULATOR_BIN.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${CALCULATOR_ROOT_DIR}" ]; then
@@ -28,14 +28,25 @@ return 1
 }
 
 print_env(){
-
 if test `uname -m` = "x86_64" ; then
 export LIB_PREFIX=64
 else
 export LIB_PREFIX=""
 fi
-
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+if [ "$SINGLE_DIR" == "1" ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM SALOME $DELIM $SDIR_DELIM
+export SALOME_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT} $SDIR_DELIM
+export PATH=\${SALOME_ROOT_DIR}/bin/salome:\${PATH} $SDIR_DELIM
+export LD_LIBRARY_PATH=\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH} $SDIR_DELIM
+export PYTHONPATH=\${SALOME_ROOT_DIR}/bin/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH} $SDIR_DELIM
+## $SDIR_DELIM
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export CALCULATOR_ROOT_DIR=\${SALOME_ROOT_DIR}
+##
+EOF
+else
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export CALCULATOR_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
@@ -47,6 +58,7 @@ if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
 fi
 ##
 EOF
+fi
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 }
@@ -93,7 +105,10 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/CALCULATORbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+# create a module directory
+mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/CALCULATORbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
 
 # modify all *.la files
 export CALCULATOR_ROOT_DIR=${PRODUCT_DIR}
@@ -113,8 +128,13 @@ 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="CALCULATORbin" ; fi
-export PRODUCT="CALCULATOR_${VERSION}"
+export PRODUCT_TYPE=$6;
+SINGLE_DIR=$7
+if [ "$SINGLE_DIR" == "1" ] ; then
+    export PRODUCT=SALOME_${VERSION}
+else
+    export PRODUCT=CALCULATOR_${VERSION}
+fi
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
diff --git a/config_files/CALCULATOR_SRC.sh b/config_files/CALCULATOR_SRC.sh
index 73e4ebc..25abd88 100755
--- a/config_files/CALCULATOR_SRC.sh
+++ b/config_files/CALCULATOR_SRC.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${CALCULATOR_SRC_DIR}" ]; then
diff --git a/config_files/COMPONENT_BIN.sh b/config_files/COMPONENT_BIN.sh
index 2338892..1e81391 100755
--- a/config_files/COMPONENT_BIN.sh
+++ b/config_files/COMPONENT_BIN.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${COMPONENT_ROOT_DIR}" ]; then
@@ -28,14 +28,25 @@ return 1
 }
 
 print_env(){
-
 if test `uname -m` = "x86_64" ; then
 export LIB_PREFIX=64
 else
 export LIB_PREFIX=""
 fi
-
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+if [ "$SINGLE_DIR" == "1" ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM SALOME $DELIM $SDIR_DELIM
+export SALOME_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT} $SDIR_DELIM
+export PATH=\${SALOME_ROOT_DIR}/bin/salome:\${PATH} $SDIR_DELIM
+export LD_LIBRARY_PATH=\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH} $SDIR_DELIM
+export PYTHONPATH=\${SALOME_ROOT_DIR}/bin/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH} $SDIR_DELIM
+## $SDIR_DELIM
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export COMPONENT_ROOT_DIR=\${SALOME_ROOT_DIR}
+##
+EOF
+else
+    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
@@ -47,6 +58,7 @@ if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
 fi
 ##
 EOF
+fi
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 }
@@ -93,7 +105,10 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/COMPONENTbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+# create a module directory
+mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/COMPONENTbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
 
 # modify all *.la files
 export COMPONENT_ROOT_DIR=${PRODUCT_DIR}
@@ -107,8 +122,13 @@ 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="COMPONENTbin" ; fi
-export PRODUCT="COMPONENT_${VERSION}"
+export PRODUCT_TYPE=$6;
+SINGLE_DIR=$7
+if [ "$SINGLE_DIR" == "1" ] ; then
+    export PRODUCT=SALOME_${VERSION}
+else
+    export PRODUCT=COMPONENT_${VERSION}
+fi
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
diff --git a/config_files/COMPONENT_SRC.sh b/config_files/COMPONENT_SRC.sh
index 65f24f5..74e12ee 100755
--- a/config_files/COMPONENT_SRC.sh
+++ b/config_files/COMPONENT_SRC.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${COMPONENT_SRC_DIR}" ]; then
diff --git a/config_files/DOCUMENTATION.sh b/config_files/DOCUMENTATION.sh
index b5f5cf3..bca6ee3 100755
--- a/config_files/DOCUMENTATION.sh
+++ b/config_files/DOCUMENTATION.sh
@@ -42,7 +42,7 @@ install_source()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/DOCUMENTATION-V3.2.9.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/DOCUMENTATION-V3.2.10.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
diff --git a/config_files/GEOM_BIN.sh b/config_files/GEOM_BIN.sh
index 4385998..91b0fd8 100755
--- a/config_files/GEOM_BIN.sh
+++ b/config_files/GEOM_BIN.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${GEOM_ROOT_DIR}" ]; then
@@ -33,7 +33,20 @@ export LIB_PREFIX=64
 else
 export LIB_PREFIX=""
 fi
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+if [ "$SINGLE_DIR" == "1" ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM SALOME $DELIM $SDIR_DELIM
+export SALOME_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT} $SDIR_DELIM
+export PATH=\${SALOME_ROOT_DIR}/bin/salome:\${PATH} $SDIR_DELIM
+export LD_LIBRARY_PATH=\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH} $SDIR_DELIM
+export PYTHONPATH=\${SALOME_ROOT_DIR}/bin/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH} $SDIR_DELIM
+## $SDIR_DELIM
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export GEOM_ROOT_DIR=\${SALOME_ROOT_DIR}
+##
+EOF
+else
+    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
@@ -45,6 +58,7 @@ if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
 fi
 ##
 EOF
+fi
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 }
@@ -91,7 +105,10 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/GEOMbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+# create a module directory
+mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/GEOMbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
 
 # modify all *.la files
 export GEOM_ROOT_DIR=${PRODUCT_DIR}
@@ -105,8 +122,13 @@ 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="GEOMbin" ; fi
-export PRODUCT="GEOM_${VERSION}"
+export PRODUCT_TYPE=$6;
+SINGLE_DIR=$7
+if [ "$SINGLE_DIR" == "1" ] ; then
+    export PRODUCT=SALOME_${VERSION}
+else
+    export PRODUCT=GEOM_${VERSION}
+fi
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
diff --git a/config_files/GEOM_SRC.sh b/config_files/GEOM_SRC.sh
index 003e030..9df1444 100755
--- a/config_files/GEOM_SRC.sh
+++ b/config_files/GEOM_SRC.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${GEOM_SRC_DIR}" ]; then
diff --git a/config_files/GHS3DPLUGIN_BIN.sh b/config_files/GHS3DPLUGIN_BIN.sh
index c21e6c6..4b119fa 100755
--- a/config_files/GHS3DPLUGIN_BIN.sh
+++ b/config_files/GHS3DPLUGIN_BIN.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${GHS3DPLUGIN_ROOT_DIR}" ]; then
@@ -23,20 +23,30 @@ if [ -n "${GHS3DPLUGIN_ROOT_DIR}" ]; then
 	    return 0
 	fi
     fi
-  return 0
 fi
 return 1
 }
 
 print_env(){
-
 if test `uname -m` = "x86_64" ; then
 export LIB_PREFIX=64
 else
 export LIB_PREFIX=""
 fi
-
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+if [ "$SINGLE_DIR" == "1" ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM SALOME $DELIM $SDIR_DELIM
+export SALOME_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT} $SDIR_DELIM
+export PATH=\${SALOME_ROOT_DIR}/bin/salome:\${PATH} $SDIR_DELIM
+export LD_LIBRARY_PATH=\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH} $SDIR_DELIM
+export PYTHONPATH=\${SALOME_ROOT_DIR}/bin/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH} $SDIR_DELIM
+## $SDIR_DELIM
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export GHS3DPLUGIN_ROOT_DIR=\${SALOME_ROOT_DIR}
+##
+EOF
+else
+    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
@@ -47,6 +57,7 @@ if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
 fi
 ##
 EOF
+fi
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 }
@@ -92,7 +103,10 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+# create a module directory
+mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
 
 # modify all *.la files
 export GHS3DPLUGIN_ROOT_DIR=${PRODUCT_DIR}
@@ -106,8 +120,13 @@ 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="GHS3DPLUGINbin" ; fi
-export PRODUCT="GHS3DPLUGIN_${VERSION}"
+export PRODUCT_TYPE=$6;
+SINGLE_DIR=$7
+if [ "$SINGLE_DIR" == "1" ] ; then
+    export PRODUCT=SALOME_${VERSION}
+else
+    export PRODUCT=GHS3DPLUGIN_${VERSION}
+fi
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
diff --git a/config_files/GHS3DPLUGIN_SRC.sh b/config_files/GHS3DPLUGIN_SRC.sh
index ac8374c..ff4b1ff 100755
--- a/config_files/GHS3DPLUGIN_SRC.sh
+++ b/config_files/GHS3DPLUGIN_SRC.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${GHS3DPLUGIN_SRC_DIR}" ]; then
diff --git a/config_files/GUI_BIN.sh b/config_files/GUI_BIN.sh
index bf7558a..0c4fdda 100755
--- a/config_files/GUI_BIN.sh
+++ b/config_files/GUI_BIN.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${GUI_ROOT_DIR}" ]; then
@@ -33,7 +33,20 @@ export LIB_PREFIX=64
 else
 export LIB_PREFIX=""
 fi
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+if [ "$SINGLE_DIR" == "1" ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM SALOME $DELIM $SDIR_DELIM
+export SALOME_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT} $SDIR_DELIM
+export PATH=\${SALOME_ROOT_DIR}/bin/salome:\${PATH} $SDIR_DELIM
+export LD_LIBRARY_PATH=\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH} $SDIR_DELIM
+export PYTHONPATH=\${SALOME_ROOT_DIR}/bin/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH} $SDIR_DELIM
+## $SDIR_DELIM
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export GUI_ROOT_DIR=\${SALOME_ROOT_DIR}
+##
+EOF
+else
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export GUI_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
@@ -45,6 +58,7 @@ if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
 fi
 ##
 EOF
+fi
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 }
@@ -91,7 +105,10 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/GUIbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+# create a module directory
+mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/GUIbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
 
 # modify all *.la files
 export GUI_ROOT_DIR=${PRODUCT_DIR}
@@ -105,8 +122,13 @@ 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="GUIbin" ; fi
-export PRODUCT="GUI_${VERSION}"
+export PRODUCT_TYPE=$6;
+SINGLE_DIR=$7
+if [ "$SINGLE_DIR" == "1" ] ; then
+    export PRODUCT=SALOME_${VERSION}
+else
+    export PRODUCT=GUI_${VERSION}
+fi
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
diff --git a/config_files/GUI_SRC.sh b/config_files/GUI_SRC.sh
index 38b6bb0..51904c9 100755
--- a/config_files/GUI_SRC.sh
+++ b/config_files/GUI_SRC.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${GUI_SRC_DIR}" ]; then
diff --git a/config_files/HELLO_BIN.sh b/config_files/HELLO_BIN.sh
index 5db57d5..23ddea8 100755
--- a/config_files/HELLO_BIN.sh
+++ b/config_files/HELLO_BIN.sh
@@ -12,11 +12,12 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${HELLO_ROOT_DIR}" ]; then
-    if [ -f ${HELLO_ROOT_DIR}/bin/salome/VERSION ]; then
+    check_lib_version VERSION ${HELLO_ROOT_DIR}/bin/salome
+    if [ "$?" -eq "0" ]; then
 	ver=`cat ${HELLO_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $NF}' | tr -d '[:space:]' ` 
 	if [ "$ver" = "${VERSION}" ]; then
 	    return 0
@@ -32,7 +33,20 @@ export LIB_PREFIX=64
 else
 export LIB_PREFIX=""
 fi
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+if [ "$SINGLE_DIR" == "1" ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM SALOME $DELIM $SDIR_DELIM
+export SALOME_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT} $SDIR_DELIM
+export PATH=\${SALOME_ROOT_DIR}/bin/salome:\${PATH} $SDIR_DELIM
+export LD_LIBRARY_PATH=\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH} $SDIR_DELIM
+export PYTHONPATH=\${SALOME_ROOT_DIR}/bin/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH} $SDIR_DELIM
+## $SDIR_DELIM
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export HELLO_ROOT_DIR=\${SALOME_ROOT_DIR}
+##
+EOF
+else
+    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
@@ -44,6 +58,7 @@ if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
 fi
 ##
 EOF
+fi
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 }
@@ -90,7 +105,10 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/HELLObinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+# create a module directory
+mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/HELLObinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
 
 # modify all *.la files
 export HELLO_ROOT_DIR=${PRODUCT_DIR}
@@ -110,8 +128,13 @@ 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="HELLObin" ; fi
-export PRODUCT="HELLO_${VERSION}"
+export PRODUCT_TYPE=$6;
+SINGLE_DIR=$7
+if [ "$SINGLE_DIR" == "1" ] ; then
+    export PRODUCT=SALOME_${VERSION}
+else
+    export PRODUCT=HELLO_${VERSION}
+fi
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
diff --git a/config_files/HELLO_SRC.sh b/config_files/HELLO_SRC.sh
index 4a5382d..a59865a 100755
--- a/config_files/HELLO_SRC.sh
+++ b/config_files/HELLO_SRC.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${HELLO_SRC_DIR}" ]; then
diff --git a/config_files/HXX2SALOME.sh b/config_files/HXX2SALOME.sh
index aafd3b9..16f2fbf 100755
--- a/config_files/HXX2SALOME.sh
+++ b/config_files/HXX2SALOME.sh
@@ -56,7 +56,7 @@ source ${INSTALL_WORK}/$SHRC
 
 makedir ${PRODUCT_DIR}
 
-check_jb tar xfz ${SOURCE_DIR}/HXX2SALOMEsourcesV3.2.9.tar.gz -C ${INSTALL_WORK}
+check_jb tar xfz ${SOURCE_DIR}/HXX2SALOMEsourcesV3.2.10.tar.gz -C ${INSTALL_WORK}
 cd ${PRODUCT_WORK}
 cat >> ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF
 -------------------
@@ -90,7 +90,7 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/HXX2SALOMEbinariesV3.2.9.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/HXX2SALOMEbinariesV3.2.10.tar.gz -C ${INSTALL_ROOT}
 
 print_env
 }
@@ -101,7 +101,7 @@ export SOURCE_DIR=$3;
 export INSTALL_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 if [ $# == 6 ] ; then export PRODUCT_TYPE=$6 ; else export PRODUCT_TYPE="HXX2SALOME" ; fi
-export PRODUCT="HXX2SALOME_3.2.9"
+export PRODUCT="HXX2SALOME_3.2.10"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
diff --git a/config_files/HXX2SALOMEDOC.sh b/config_files/HXX2SALOMEDOC.sh
index 8af9d42..a97e406 100755
--- a/config_files/HXX2SALOMEDOC.sh
+++ b/config_files/HXX2SALOMEDOC.sh
@@ -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}/HXX2SALOMEDOCsourcesV3.2.9.tar.gz -C ${INSTALL_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/HXX2SALOMEDOCsourcesV3.2.10.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="HXX2SALOMEDOC" ; fi
-export PRODUCT="HXX2SALOMEDOC_3.2.9"
+export PRODUCT="HXX2SALOMEDOC_3.2.10"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
diff --git a/config_files/KERNEL_BIN.sh b/config_files/KERNEL_BIN.sh
index a2a2849..6b5b6fa 100755
--- a/config_files/KERNEL_BIN.sh
+++ b/config_files/KERNEL_BIN.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${KERNEL_ROOT_DIR}" ]; then
@@ -33,7 +33,20 @@ export LIB_PREFIX=64
 else
 export LIB_PREFIX=""
 fi
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+if [ "$SINGLE_DIR" == "1" ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM SALOME $DELIM $SDIR_DELIM
+export SALOME_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT} $SDIR_DELIM
+export PATH=\${SALOME_ROOT_DIR}/bin/salome:\${PATH} $SDIR_DELIM
+export LD_LIBRARY_PATH=\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH} $SDIR_DELIM
+export PYTHONPATH=\${SALOME_ROOT_DIR}/bin/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH} $SDIR_DELIM
+## $SDIR_DELIM
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export KERNEL_ROOT_DIR=\${SALOME_ROOT_DIR}
+##
+EOF
+else
+    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
@@ -45,6 +58,7 @@ if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
 fi
 ##
 EOF
+fi
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 }
@@ -91,7 +105,10 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/KERNELbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+# create a module directory
+mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/KERNELbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
 
 # The next two symbolic links are created only for Red Hat 9 and Scientific Linux 3.0.5
 if [ -f /lib/libcrypto.so.0.9.7a ]; then
@@ -126,8 +143,13 @@ 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="KERNELbin" ; fi
-export PRODUCT="KERNEL_${VERSION}"
+export PRODUCT_TYPE=$6;
+SINGLE_DIR=$7
+if [ "$SINGLE_DIR" == "1" ] ; then
+    export PRODUCT=SALOME_${VERSION}
+else
+    export PRODUCT=KERNEL_${VERSION}
+fi
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
diff --git a/config_files/KERNEL_SRC.sh b/config_files/KERNEL_SRC.sh
index 272712a..76bb5ce 100755
--- a/config_files/KERNEL_SRC.sh
+++ b/config_files/KERNEL_SRC.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${KERNEL_SRC_DIR}" ]; then
diff --git a/config_files/LIGHT_BIN.sh b/config_files/LIGHT_BIN.sh
index 2bba651..0127025 100755
--- a/config_files/LIGHT_BIN.sh
+++ b/config_files/LIGHT_BIN.sh
@@ -12,11 +12,12 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${LIGHT_ROOT_DIR}" ]; then
-    if [ -f ${LIGHT_ROOT_DIR}/bin/salome/VERSION ]; then
+    check_lib_version VERSION ${LIGHT_ROOT_DIR}/bin/salome
+    if [ "$?" -eq "0" ]; then
 	ver=`cat ${LIGHT_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $NF}' | tr -d '[:space:]' ` 
 	if [ "$ver" = "${VERSION}" ]; then
 	    return 0
@@ -32,7 +33,20 @@ export LIB_PREFIX=64
 else
 export LIB_PREFIX=""
 fi
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+if [ "$SINGLE_DIR" == "1" ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM SALOME $DELIM $SDIR_DELIM
+export SALOME_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT} $SDIR_DELIM
+export PATH=\${SALOME_ROOT_DIR}/bin/salome:\${PATH} $SDIR_DELIM
+export LD_LIBRARY_PATH=\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH} $SDIR_DELIM
+export PYTHONPATH=\${SALOME_ROOT_DIR}/bin/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH} $SDIR_DELIM
+## $SDIR_DELIM
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export LIGHT_ROOT_DIR=\${SALOME_ROOT_DIR}
+##
+EOF
+else
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export LIGHT_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
@@ -42,6 +56,7 @@ if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
 fi
 ##
 EOF
+fi
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 }
@@ -86,7 +101,10 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/LIGHTbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+# create a module directory
+mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/LIGHTbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
 
 # modify all *.la files
 export LIGHT_ROOT_DIR=${PRODUCT_DIR}
@@ -100,8 +118,13 @@ 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="LIGHTbin" ; fi
-export PRODUCT="LIGHT_${VERSION}"
+export PRODUCT_TYPE=$6;
+SINGLE_DIR=$7
+if [ "$SINGLE_DIR" == "1" ] ; then
+    export PRODUCT=SALOME_${VERSION}
+else
+    export PRODUCT=LIGHT_${VERSION}
+fi
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
diff --git a/config_files/LIGHT_SRC.sh b/config_files/LIGHT_SRC.sh
index 5cfab89..984d72e 100755
--- a/config_files/LIGHT_SRC.sh
+++ b/config_files/LIGHT_SRC.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${LIGHT_SRC_DIR}" ]; then
diff --git a/config_files/MEDWOGUI_BIN.sh b/config_files/MEDWOGUI_BIN.sh
index 1645cc6..7810ee1 100755
--- a/config_files/MEDWOGUI_BIN.sh
+++ b/config_files/MEDWOGUI_BIN.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${MEDWOGUI_ROOT_DIR}" ]; then
@@ -33,7 +33,20 @@ export LIB_PREFIX=64
 else
 export LIB_PREFIX=""
 fi
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+if [ "$SINGLE_DIR" == "1" ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM SALOME $DELIM $SDIR_DELIM
+export SALOME_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT} $SDIR_DELIM
+export PATH=\${SALOME_ROOT_DIR}/bin/salome:\${PATH} $SDIR_DELIM
+export LD_LIBRARY_PATH=\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH} $SDIR_DELIM
+export PYTHONPATH=\${SALOME_ROOT_DIR}/bin/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH} $SDIR_DELIM
+## $SDIR_DELIM
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export MEDWOGUI_ROOT_DIR=\${SALOME_ROOT_DIR}
+##
+EOF
+else
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export MEDWOGUI_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
@@ -45,6 +58,7 @@ if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
 fi
 ##
 EOF
+fi
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 }
@@ -91,7 +105,10 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/MEDWOGUIbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+# create a module directory
+mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/MEDWOGUIbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
 
 # modify all *.la files
 export MEDWOGUI_ROOT_DIR=${PRODUCT_DIR}
@@ -105,8 +122,13 @@ 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="MEDWOGUIbin" ; fi
-export PRODUCT="MEDWOGUI_${VERSION}"
+export PRODUCT_TYPE=$6;
+SINGLE_DIR=$7
+if [ "$SINGLE_DIR" == "1" ] ; then
+    export PRODUCT=SALOME_${VERSION}
+else
+    export PRODUCT=MEDWOGUI_${VERSION}
+fi
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
diff --git a/config_files/MEDWOGUI_SRC.sh b/config_files/MEDWOGUI_SRC.sh
index 2a0243e..931f989 100755
--- a/config_files/MEDWOGUI_SRC.sh
+++ b/config_files/MEDWOGUI_SRC.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${MEDWOGUI_SRC_DIR}" ]; then
diff --git a/config_files/MED_BIN.sh b/config_files/MED_BIN.sh
index a475230..50425cb 100755
--- a/config_files/MED_BIN.sh
+++ b/config_files/MED_BIN.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${MED_ROOT_DIR}" ]; then
@@ -33,7 +33,20 @@ export LIB_PREFIX=64
 else
 export LIB_PREFIX=""
 fi
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+if [ "$SINGLE_DIR" == "1" ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM SALOME $DELIM $SDIR_DELIM
+export SALOME_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT} $SDIR_DELIM
+export PATH=\${SALOME_ROOT_DIR}/bin/salome:\${PATH} $SDIR_DELIM
+export LD_LIBRARY_PATH=\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH} $SDIR_DELIM
+export PYTHONPATH=\${SALOME_ROOT_DIR}/bin/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH} $SDIR_DELIM
+## $SDIR_DELIM
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export MED_ROOT_DIR=\${SALOME_ROOT_DIR}
+##
+EOF
+else
+    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
@@ -45,6 +58,7 @@ if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
 fi
 ##
 EOF
+fi
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 }
@@ -91,7 +105,10 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/MEDbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+# create a module directory
+mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/MEDbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
 
 # modify all *.la files
 export MED_ROOT_DIR=${PRODUCT_DIR}
@@ -105,8 +122,13 @@ 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="MEDbin" ; fi
-export PRODUCT="MED_${VERSION}"
+export PRODUCT_TYPE=$6;
+SINGLE_DIR=$7
+if [ "$SINGLE_DIR" == "1" ] ; then
+    export PRODUCT=SALOME_${VERSION}
+else
+    export PRODUCT=MED_${VERSION}
+fi
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
diff --git a/config_files/MED_SRC.sh b/config_files/MED_SRC.sh
index 5d0349a..753f43a 100755
--- a/config_files/MED_SRC.sh
+++ b/config_files/MED_SRC.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${MED_SRC_DIR}" ]; then
diff --git a/config_files/NETGENPLUGIN_BIN.sh b/config_files/NETGENPLUGIN_BIN.sh
index b1cfcfe..702c6c1 100755
--- a/config_files/NETGENPLUGIN_BIN.sh
+++ b/config_files/NETGENPLUGIN_BIN.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${NETGENPLUGIN_ROOT_DIR}" ]; then
@@ -23,7 +23,6 @@ if [ -n "${NETGENPLUGIN_ROOT_DIR}" ]; then
 	    return 0
 	fi
     fi
-  return 0
 fi
 return 1
 }
@@ -34,7 +33,20 @@ export LIB_PREFIX=64
 else
 export LIB_PREFIX=""
 fi
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+if [ "$SINGLE_DIR" == "1" ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM SALOME $DELIM $SDIR_DELIM
+export SALOME_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT} $SDIR_DELIM
+export PATH=\${SALOME_ROOT_DIR}/bin/salome:\${PATH} $SDIR_DELIM
+export LD_LIBRARY_PATH=\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH} $SDIR_DELIM
+export PYTHONPATH=\${SALOME_ROOT_DIR}/bin/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH} $SDIR_DELIM
+## $SDIR_DELIM
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export NETGENPLUGIN_ROOT_DIR=\${SALOME_ROOT_DIR}
+##
+EOF
+else
+    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
@@ -45,6 +57,7 @@ if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
 fi
 ##
 EOF
+fi
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 }
@@ -90,7 +103,10 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/NETGENPLUGINbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+# create a module directory
+mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/NETGENPLUGINbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
 
 # modify all *.la files
 export NETGENPLUGIN_ROOT_DIR=${PRODUCT_DIR}
@@ -104,8 +120,13 @@ 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="NETGENPLUGINbin" ; fi
-export PRODUCT="NETGENPLUGIN_${VERSION}"
+export PRODUCT_TYPE=$6;
+SINGLE_DIR=$7
+if [ "$SINGLE_DIR" == "1" ] ; then
+    export PRODUCT=SALOME_${VERSION}
+else
+    export PRODUCT=NETGENPLUGIN_${VERSION}
+fi
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
diff --git a/config_files/NETGENPLUGIN_SRC.sh b/config_files/NETGENPLUGIN_SRC.sh
index 5db07e7..84c8a8b 100755
--- a/config_files/NETGENPLUGIN_SRC.sh
+++ b/config_files/NETGENPLUGIN_SRC.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${NETGENPLUGIN_SRC_DIR}" ]; then
diff --git a/config_files/PYCALCULATOR_BIN.sh b/config_files/PYCALCULATOR_BIN.sh
index 1a3f497..623ce00 100755
--- a/config_files/PYCALCULATOR_BIN.sh
+++ b/config_files/PYCALCULATOR_BIN.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${PYCALCULATOR_ROOT_DIR}" ]; then
@@ -33,7 +33,20 @@ export LIB_PREFIX=64
 else
 export LIB_PREFIX=""
 fi
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+if [ "$SINGLE_DIR" == "1" ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM SALOME $DELIM $SDIR_DELIM
+export SALOME_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT} $SDIR_DELIM
+export PATH=\${SALOME_ROOT_DIR}/bin/salome:\${PATH} $SDIR_DELIM
+export LD_LIBRARY_PATH=\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH} $SDIR_DELIM
+export PYTHONPATH=\${SALOME_ROOT_DIR}/bin/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH} $SDIR_DELIM
+## $SDIR_DELIM
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export PYCALCULATOR_ROOT_DIR=\${SALOME_ROOT_DIR}
+##
+EOF
+else
+    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
@@ -44,6 +57,7 @@ if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
 fi
 ##
 EOF
+fi
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 }
@@ -89,7 +103,10 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/PYCALCULATORbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+# create a module directory
+mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/PYCALCULATORbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
 
 # modify all *.la files
 export PYCALCULATOR_ROOT_DIR=${PRODUCT_DIR}
@@ -103,8 +120,13 @@ 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="PYCALCULATORbin" ; fi
-export PRODUCT="PYCALCULATOR_${VERSION}"
+export PRODUCT_TYPE=$6;
+SINGLE_DIR=$7
+if [ "$SINGLE_DIR" == "1" ] ; then
+    export PRODUCT=SALOME_${VERSION}
+else
+    export PRODUCT=PYCALCULATOR_${VERSION}
+fi
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
diff --git a/config_files/PYCALCULATOR_SRC.sh b/config_files/PYCALCULATOR_SRC.sh
index c46cbd9..9d6fb22 100755
--- a/config_files/PYCALCULATOR_SRC.sh
+++ b/config_files/PYCALCULATOR_SRC.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${PYCALCULATOR_SRC_DIR}" ]; then
diff --git a/config_files/PYHELLO_BIN.sh b/config_files/PYHELLO_BIN.sh
index a3b928d..b98a5d4 100755
--- a/config_files/PYHELLO_BIN.sh
+++ b/config_files/PYHELLO_BIN.sh
@@ -12,11 +12,12 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${PYHELLO_ROOT_DIR}" ]; then
-    if [ -f ${PYHELLO_ROOT_DIR}/bin/salome/VERSION ]; then
+    check_lib_version VERSION ${PYHELLO_ROOT_DIR}/bin/salome
+    if [ "$?" -eq "0" ]; then
 	ver=`cat ${PYHELLO_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $NF}' | tr -d '[:space:]' ` 
 	if [ "$ver" = "${VERSION}" ]; then
 	    return 0
@@ -32,7 +33,20 @@ export LIB_PREFIX=64
 else
 export LIB_PREFIX=""
 fi
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+if [ "$SINGLE_DIR" == "1" ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM SALOME $DELIM $SDIR_DELIM
+export SALOME_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT} $SDIR_DELIM
+export PATH=\${SALOME_ROOT_DIR}/bin/salome:\${PATH} $SDIR_DELIM
+export LD_LIBRARY_PATH=\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH} $SDIR_DELIM
+export PYTHONPATH=\${SALOME_ROOT_DIR}/bin/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH} $SDIR_DELIM
+## $SDIR_DELIM
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export PYHELLO_ROOT_DIR=\${SALOME_ROOT_DIR}
+##
+EOF
+else
+    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
@@ -43,6 +57,7 @@ if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
 fi
 ##
 EOF
+fi
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 }
@@ -88,7 +103,10 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/PYHELLObinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+# create a module directory
+mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/PYHELLObinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
 
 # modify all *.la files
 export PYHELLO_ROOT_DIR=${PRODUCT_DIR}
@@ -107,8 +125,13 @@ 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="PYHELLObin" ; fi
-export PRODUCT="PYHELLO_${VERSION}"
+export PRODUCT_TYPE=$6;
+SINGLE_DIR=$7
+if [ "$SINGLE_DIR" == "1" ] ; then
+    export PRODUCT=SALOME_${VERSION}
+else
+    export PRODUCT=PYHELLO_${VERSION}
+fi
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
diff --git a/config_files/PYHELLO_SRC.sh b/config_files/PYHELLO_SRC.sh
index 6b11ec4..e89de61 100755
--- a/config_files/PYHELLO_SRC.sh
+++ b/config_files/PYHELLO_SRC.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${PYHELLO_SRC_DIR}" ]; then
diff --git a/config_files/RANDOMIZER_BIN.sh b/config_files/RANDOMIZER_BIN.sh
index 727127a..3c53786 100755
--- a/config_files/RANDOMIZER_BIN.sh
+++ b/config_files/RANDOMIZER_BIN.sh
@@ -12,11 +12,12 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${RANDOMIZER_ROOT_DIR}" ]; then
-    if [ -f ${RANDOMIZER_ROOT_DIR}/bin/salome/VERSION ]; then
+    check_lib_version VERSION ${RANDOMIZER_ROOT_DIR}/bin/salome
+    if [ "$?" -eq "0" ]; then
 	ver=`cat ${RANDOMIZER_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $NF}' | tr -d '[:space:]' ` 
 	if [ "$ver" = "${VERSION}" ]; then
 	    return 0
@@ -32,7 +33,20 @@ export LIB_PREFIX=64
 else
 export LIB_PREFIX=""
 fi
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+if [ "$SINGLE_DIR" == "1" ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM SALOME $DELIM $SDIR_DELIM
+export SALOME_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT} $SDIR_DELIM
+export PATH=\${SALOME_ROOT_DIR}/bin/salome:\${PATH} $SDIR_DELIM
+export LD_LIBRARY_PATH=\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH} $SDIR_DELIM
+export PYTHONPATH=\${SALOME_ROOT_DIR}/bin/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH} $SDIR_DELIM
+## $SDIR_DELIM
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export RANDOMIZER_ROOT_DIR=\${SALOME_ROOT_DIR}
+##
+EOF
+else
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export RANDOMIZER_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
@@ -43,6 +57,7 @@ if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
 fi
 ##
 EOF
+fi
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 }
@@ -88,7 +103,10 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/RANDOMIZERbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+# create a module directory
+mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/RANDOMIZERbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
 
 # modify all *.la files
 export RANDOMIZER_ROOT_DIR=${PRODUCT_DIR}
@@ -102,8 +120,13 @@ 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="RANDOMIZERbin" ; fi
-export PRODUCT="RANDOMIZER_${VERSION}"
+export PRODUCT_TYPE=$6;
+SINGLE_DIR=$7
+if [ "$SINGLE_DIR" == "1" ] ; then
+    export PRODUCT=SALOME_${VERSION}
+else
+    export PRODUCT=RANDOMIZER_${VERSION}
+fi
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
diff --git a/config_files/RANDOMIZER_SRC.sh b/config_files/RANDOMIZER_SRC.sh
index e3548e3..5847ea7 100755
--- a/config_files/RANDOMIZER_SRC.sh
+++ b/config_files/RANDOMIZER_SRC.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${RANDOMIZER_SRC_DIR}" ]; then
diff --git a/config_files/SAMPLES.sh b/config_files/SAMPLES.sh
index 50a8ce4..3421afb 100755
--- a/config_files/SAMPLES.sh
+++ b/config_files/SAMPLES.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 # There is no possibility to check version number
diff --git a/config_files/SIERPINSKY_BIN.sh b/config_files/SIERPINSKY_BIN.sh
index 735bb15..56525be 100755
--- a/config_files/SIERPINSKY_BIN.sh
+++ b/config_files/SIERPINSKY_BIN.sh
@@ -12,11 +12,12 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${SIERPINSKY_ROOT_DIR}" ]; then
-    if [ -f ${SIERPINSKY_ROOT_DIR}/bin/salome/VERSION ]; then
+    check_lib_version VERSION ${SIERPINSKY_ROOT_DIR}/bin/salome
+    if [ "$?" -eq "0" ]; then
 	ver=`cat ${SIERPINSKY_ROOT_DIR}/bin/salome/VERSION | awk -F: '{print $NF}' | tr -d '[:space:]' ` 
 	if [ "$ver" = "${VERSION}" ]; then
 	    return 0
@@ -32,7 +33,20 @@ export LIB_PREFIX=64
 else
 export LIB_PREFIX=""
 fi
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+if [ "$SINGLE_DIR" == "1" ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM SALOME $DELIM $SDIR_DELIM
+export SALOME_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT} $SDIR_DELIM
+export PATH=\${SALOME_ROOT_DIR}/bin/salome:\${PATH} $SDIR_DELIM
+export LD_LIBRARY_PATH=\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH} $SDIR_DELIM
+export PYTHONPATH=\${SALOME_ROOT_DIR}/bin/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH} $SDIR_DELIM
+## $SDIR_DELIM
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export SIERPINSKY_ROOT_DIR=\${SALOME_ROOT_DIR}
+##
+EOF
+else
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export SIERPINSKY_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
@@ -43,6 +57,7 @@ if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
 fi
 ##
 EOF
+fi
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 }
@@ -88,7 +103,10 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/SIERPINSKYbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+# create a module directory
+mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/SIERPINSKYbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
 
 # modify all *.la files
 export SIERPINSKY_ROOT_DIR=${PRODUCT_DIR}
@@ -102,8 +120,13 @@ 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="SIERPINSKYbin" ; fi
-export PRODUCT="SIERPINSKY_${VERSION}"
+export PRODUCT_TYPE=$6;
+SINGLE_DIR=$7
+if [ "$SINGLE_DIR" == "1" ] ; then
+    export PRODUCT=SALOME_${VERSION}
+else
+    export PRODUCT=SIERPINSKY_${VERSION}
+fi
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
diff --git a/config_files/SIERPINSKY_SRC.sh b/config_files/SIERPINSKY_SRC.sh
index 45f5efc..f98fe1f 100755
--- a/config_files/SIERPINSKY_SRC.sh
+++ b/config_files/SIERPINSKY_SRC.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${SIERPINSKY_SRC_DIR}" ]; then
diff --git a/config_files/SMESH_BIN.sh b/config_files/SMESH_BIN.sh
index abc6fa7..64ce811 100755
--- a/config_files/SMESH_BIN.sh
+++ b/config_files/SMESH_BIN.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${SMESH_ROOT_DIR}" ]; then
@@ -33,7 +33,20 @@ export LIB_PREFIX=64
 else
 export LIB_PREFIX=""
 fi
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+if [ "$SINGLE_DIR" == "1" ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM SALOME $DELIM $SDIR_DELIM
+export SALOME_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT} $SDIR_DELIM
+export PATH=\${SALOME_ROOT_DIR}/bin/salome:\${PATH} $SDIR_DELIM
+export LD_LIBRARY_PATH=\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH} $SDIR_DELIM
+export PYTHONPATH=\${SALOME_ROOT_DIR}/bin/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH} $SDIR_DELIM
+## $SDIR_DELIM
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export SMESH_ROOT_DIR=\${SALOME_ROOT_DIR}
+##
+EOF
+else
+    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
@@ -45,6 +58,7 @@ if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
 fi
 ##
 EOF
+fi
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 }
@@ -91,7 +105,10 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/SMESHbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+# create a module directory
+mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/SMESHbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
 
 # modify all *.la files
 export SMESH_ROOT_DIR=${PRODUCT_DIR}
@@ -105,8 +122,13 @@ 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="SMESHbin" ; fi
-export PRODUCT="SMESH_${VERSION}"
+export PRODUCT_TYPE=$6;
+SINGLE_DIR=$7
+if [ "$SINGLE_DIR" == "1" ] ; then
+    export PRODUCT=SALOME_${VERSION}
+else
+    export PRODUCT=SMESH_${VERSION}
+fi
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
diff --git a/config_files/SMESH_SRC.sh b/config_files/SMESH_SRC.sh
index 7a23e5d..8158513 100755
--- a/config_files/SMESH_SRC.sh
+++ b/config_files/SMESH_SRC.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${SMESH_SRC_DIR}" ]; then
diff --git a/config_files/SUPERV_BIN.sh b/config_files/SUPERV_BIN.sh
index c8846c1..05ae29a 100755
--- a/config_files/SUPERV_BIN.sh
+++ b/config_files/SUPERV_BIN.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${SUPERV_ROOT_DIR=}" ]; then
@@ -33,7 +33,20 @@ export LIB_PREFIX=64
 else
 export LIB_PREFIX=""
 fi
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+if [ "$SINGLE_DIR" == "1" ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM SALOME $DELIM $SDIR_DELIM
+export SALOME_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT} $SDIR_DELIM
+export PATH=\${SALOME_ROOT_DIR}/bin/salome:\${PATH} $SDIR_DELIM
+export LD_LIBRARY_PATH=\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH} $SDIR_DELIM
+export PYTHONPATH=\${SALOME_ROOT_DIR}/bin/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH} $SDIR_DELIM
+## $SDIR_DELIM
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export SUPERV_ROOT_DIR=\${SALOME_ROOT_DIR}
+##
+EOF
+else
+    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
@@ -45,6 +58,7 @@ if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
 fi
 ##
 EOF
+fi
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 }
@@ -91,7 +105,10 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/SUPERVbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+# create a module directory
+mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/SUPERVbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
 
 # modify all *.la files
 export SUPERV_ROOT_DIR=${PRODUCT_DIR}
@@ -105,8 +122,13 @@ 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="SUPERVbin" ; fi
-export PRODUCT="SUPERV_${VERSION}"
+export PRODUCT_TYPE=$6;
+SINGLE_DIR=$7
+if [ "$SINGLE_DIR" == "1" ] ; then
+    export PRODUCT=SALOME_${VERSION}
+else
+    export PRODUCT=SUPERV_${VERSION}
+fi
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
diff --git a/config_files/SUPERV_SRC.sh b/config_files/SUPERV_SRC.sh
index 682d815..6311769 100755
--- a/config_files/SUPERV_SRC.sh
+++ b/config_files/SUPERV_SRC.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${SUPERV_SRC_DIR}" ]; then
diff --git a/config_files/VISU_BIN.sh b/config_files/VISU_BIN.sh
index b3e37c6..010b165 100755
--- a/config_files/VISU_BIN.sh
+++ b/config_files/VISU_BIN.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${VISU_ROOT_DIR}" ]; then
@@ -33,7 +33,20 @@ export LIB_PREFIX=64
 else
 export LIB_PREFIX=""
 fi
-cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+if [ "$SINGLE_DIR" == "1" ] ; then
+    cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM SALOME $DELIM $SDIR_DELIM
+export SALOME_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT} $SDIR_DELIM
+export PATH=\${SALOME_ROOT_DIR}/bin/salome:\${PATH} $SDIR_DELIM
+export LD_LIBRARY_PATH=\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${LD_LIBRARY_PATH} $SDIR_DELIM
+export PYTHONPATH=\${SALOME_ROOT_DIR}/bin/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/salome:\${SALOME_ROOT_DIR}/lib${LIB_PREFIX}/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH} $SDIR_DELIM
+## $SDIR_DELIM
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export VISU_ROOT_DIR=\${SALOME_ROOT_DIR}
+##
+EOF
+else
+    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
@@ -45,6 +58,7 @@ if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
 fi
 ##
 EOF
+fi
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 }
@@ -91,7 +105,10 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/VISUbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+# create a module directory
+mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/VISUbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
 
 # modify all *.la files
 export VISU_ROOT_DIR=${PRODUCT_DIR}
@@ -105,8 +122,13 @@ 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="VISUbin" ; fi
-export PRODUCT="VISU_${VERSION}"
+export PRODUCT_TYPE=$6;
+SINGLE_DIR=$7
+if [ "$SINGLE_DIR" == "1" ] ; then
+    export PRODUCT=SALOME_${VERSION}
+else
+    export PRODUCT=VISU_${VERSION}
+fi
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
diff --git a/config_files/VISU_SRC.sh b/config_files/VISU_SRC.sh
index bfe21fd..c246fa5 100755
--- a/config_files/VISU_SRC.sh
+++ b/config_files/VISU_SRC.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="3.2.9"
+VERSION="3.2.10"
 
 check_version(){
 if [ -n "${VISU_SRC_DIR}" ]; then
diff --git a/config_files/common.sh b/config_files/common.sh
index 7467024..5523403 100755
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -13,6 +13,7 @@
 ####################################################################################
 
 export DELIM="------"
+export SDIR_DELIM="### to be removed ###"
 export SHRC="salome.sh"
 export CSHRC="salome.csh"
 
@@ -138,7 +139,19 @@ fi
 product_sequence="$2"
 for i in $product_sequence ; do
     env_file=${install_work}/env_${i}.sh
-    ( test -e $env_file && cat $env_file >> ${install_work}/$SHRC 2>/dev/null )
+    if [ -e $env_file ] ; then
+	grep "$SDIR_DELIM" $env_file >& /dev/null
+	if [ $? -eq 0 ] ; then
+	    if [ "$SINGLE_ROOT_DIR" == "1" ] ; then
+		cat $env_file | grep -v "$SDIR_DELIM" >> ${install_work}/$SHRC 2>/dev/null
+	    else
+		cat $env_file | sed -e "s/$SDIR_DELIM//g" >> ${install_work}/$SHRC 2>/dev/null
+	    fi
+	    SINGLE_ROOT_DIR=1
+	else
+	    cat $env_file >> ${install_work}/$SHRC 2>/dev/null
+	fi
+    fi
 done
 
 # 2. writing global functions to _salome.sh file
@@ -339,7 +352,7 @@ cat ${INSTALL_WORK}/_tmp2 >> ${install_work}/_$CSHRC 2>/dev/null
 
 rm -f ${INSTALL_WORK}/_tmp1 ${INSTALL_WORK}/_tmp2
 
-if [ $# -eq 4 ] ; then
+if [ $# -gt 3 ] ; then
     product_dir=$4
     if [ -e ${product_dir} ] ; then
 	cp -f ${install_work}/_$SHRC  ${product_dir}/$SHRC
@@ -370,7 +383,7 @@ for p in `ls ../` ; do
 	fi
     fi
 done
-
+unset SINGLE_ROOT_DIR
 }
 
 #try use already existing product