From d0d5f7ed5c2f0086deb3cf7f8477563ff8e4e2c3 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Fri, 8 Apr 2005 12:08:43 +0000
Subject: [PATCH] Remove environment settings for SALOME binaries for PATH,
 LD_LIBRARY_PATH, PYTHONPATH variables according to the fix for PAL8562 and
 KERNEL7695.

---
 config_files/COMPONENT_BIN.sh    | 6 ------
 config_files/GEOM_BIN.sh         | 6 ------
 config_files/GHS3DPLUGIN_BIN.sh  | 4 ----
 config_files/KERNEL_BIN.sh       | 6 ------
 config_files/MED_BIN.sh          | 6 ------
 config_files/NETGENPLUGIN_BIN.sh | 4 ----
 config_files/PYCALCULATOR_BIN.sh | 4 ----
 config_files/SMESH_BIN.sh        | 6 ------
 config_files/SUPERV_BIN.sh       | 6 ------
 config_files/VISU_BIN.sh         | 6 ------
 10 files changed, 54 deletions(-)

diff --git a/config_files/COMPONENT_BIN.sh b/config_files/COMPONENT_BIN.sh
index 05c6c2f..9d6922c 100755
--- a/config_files/COMPONENT_BIN.sh
+++ b/config_files/COMPONENT_BIN.sh
@@ -17,9 +17,6 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export COMPONENT_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export PATH=\${COMPONENT_ROOT_DIR}/bin/salome:\${PATH}
-export LD_LIBRARY_PATH=\${COMPONENT_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${COMPONENT_ROOT_DIR}/bin/salome:\${COMPONENT_ROOT_DIR}/lib/salome:\${COMPONENT_ROOT_DIR}/lib/python2.2/site-packages/salome:\${COMPONENT_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -33,9 +30,6 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export COMPONENT_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export PATH=\${COMPONENT_ROOT_DIR}/bin/salome:\${PATH}
-export LD_LIBRARY_PATH=\${COMPONENT_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${COMPONENT_ROOT_DIR}/bin/salome:\${COMPONENT_ROOT_DIR}/lib/salome:\${COMPONENT_ROOT_DIR}/lib/python2.2/site-packages/salome:\${COMPONENT_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
diff --git a/config_files/GEOM_BIN.sh b/config_files/GEOM_BIN.sh
index c48a19a..32f6e5f 100755
--- a/config_files/GEOM_BIN.sh
+++ b/config_files/GEOM_BIN.sh
@@ -17,9 +17,6 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export GEOM_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export PATH=\${GEOM_ROOT_DIR}/bin/salome:\${PATH}
-export LD_LIBRARY_PATH=\${GEOM_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${GEOM_ROOT_DIR}/bin/salome:\${GEOM_ROOT_DIR}/lib/salome:\${GEOM_ROOT_DIR}/lib/python2.2/site-packages/salome:\${GEOM_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -33,9 +30,6 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export GEOM_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export PATH=\${GEOM_ROOT_DIR}/bin/salome:\${PATH}
-export LD_LIBRARY_PATH=\${GEOM_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${GEOM_ROOT_DIR}/bin/salome:\${GEOM_ROOT_DIR}/lib/salome:\${GEOM_ROOT_DIR}/lib/python2.2/site-packages/salome:\${GEOM_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
diff --git a/config_files/GHS3DPLUGIN_BIN.sh b/config_files/GHS3DPLUGIN_BIN.sh
index a0227c8..6604911 100755
--- a/config_files/GHS3DPLUGIN_BIN.sh
+++ b/config_files/GHS3DPLUGIN_BIN.sh
@@ -18,8 +18,6 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export GHS3DPLUGIN_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export LD_LIBRARY_PATH=\${GHS3DPLUGIN_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${GHS3DPLUGIN_ROOT_DIR}/lib/salome:\${GHS3DPLUGIN_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -33,8 +31,6 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export GHS3DPLUGIN_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export LD_LIBRARY_PATH=\${GHS3DPLUGIN_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${GHS3DPLUGIN_ROOT_DIR}/lib/salome:\${GHS3DPLUGIN_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
diff --git a/config_files/KERNEL_BIN.sh b/config_files/KERNEL_BIN.sh
index 664c859..651e3b9 100755
--- a/config_files/KERNEL_BIN.sh
+++ b/config_files/KERNEL_BIN.sh
@@ -17,9 +17,6 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export KERNEL_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export PATH=\${KERNEL_ROOT_DIR}/bin/salome:\${PATH}
-export LD_LIBRARY_PATH=\${KERNEL_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${KERNEL_ROOT_DIR}/bin/salome:\${KERNEL_ROOT_DIR}/lib/salome:\${KERNEL_ROOT_DIR}/lib/python2.2/site-packages/salome:\${KERNEL_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -33,9 +30,6 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export KERNEL_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export PATH=\${KERNEL_ROOT_DIR}/bin/salome:\${PATH}
-export LD_LIBRARY_PATH=\${KERNEL_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${KERNEL_ROOT_DIR}/bin/salome:\${KERNEL_ROOT_DIR}/lib/salome:\${KERNEL_ROOT_DIR}/lib/python2.2/site-packages/salome:\${KERNEL_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
diff --git a/config_files/MED_BIN.sh b/config_files/MED_BIN.sh
index 8e99a5f..c72c85f 100755
--- a/config_files/MED_BIN.sh
+++ b/config_files/MED_BIN.sh
@@ -17,9 +17,6 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export MED_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export PATH=\${MED_ROOT_DIR}/bin/salome:\${PATH}
-export LD_LIBRARY_PATH=\${MED_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${MED_ROOT_DIR}/bin/salome:\${MED_ROOT_DIR}/lib/salome:\${MED_ROOT_DIR}/lib/python2.2/site-packages/salome:\${MED_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -33,9 +30,6 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export MED_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export PATH=\${MED_ROOT_DIR}/bin/salome:\${PATH}
-export LD_LIBRARY_PATH=\${MED_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${MED_ROOT_DIR}/bin/salome:\${MED_ROOT_DIR}/lib/salome:\${MED_ROOT_DIR}/lib/python2.2/site-packages/salome:\${MED_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
diff --git a/config_files/NETGENPLUGIN_BIN.sh b/config_files/NETGENPLUGIN_BIN.sh
index 331ee96..89f7de0 100755
--- a/config_files/NETGENPLUGIN_BIN.sh
+++ b/config_files/NETGENPLUGIN_BIN.sh
@@ -18,8 +18,6 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export NETGENPLUGIN_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export LD_LIBRARY_PATH=\${NETGENPLUGIN_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${NETGENPLUGIN_ROOT_DIR}/lib/salome:\${NETGENPLUGIN_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -33,8 +31,6 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export NETGENPLUGIN_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export LD_LIBRARY_PATH=\${NETGENPLUGIN_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${NETGENPLUGIN_ROOT_DIR}/lib/salome:\${NETGENPLUGIN_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
diff --git a/config_files/PYCALCULATOR_BIN.sh b/config_files/PYCALCULATOR_BIN.sh
index beaeaa7..86c86d3 100755
--- a/config_files/PYCALCULATOR_BIN.sh
+++ b/config_files/PYCALCULATOR_BIN.sh
@@ -17,8 +17,6 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYCALCULATOR_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export PATH=\${PYCALCULATOR_ROOT_DIR}/bin/salome:\${PATH}
-export PYTHONPATH=\${PYCALCULATOR_ROOT_DIR}/bin/salome:\${PYCALCULATOR_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -32,8 +30,6 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYCALCULATOR_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export PATH=\${PYCALCULATOR_ROOT_DIR}/bin/salome:\${PATH}
-export PYTHONPATH=\${PYCALCULATOR_ROOT_DIR}/bin/salome:\${PYCALCULATOR_ROOT_DIR}/lib/python2.2/site-packages/salome:\${PYTHONPATH}
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
diff --git a/config_files/SMESH_BIN.sh b/config_files/SMESH_BIN.sh
index f7d35b5..9a0dca9 100755
--- a/config_files/SMESH_BIN.sh
+++ b/config_files/SMESH_BIN.sh
@@ -17,9 +17,6 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export SMESH_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export PATH=\${SMESH_ROOT_DIR}/bin/salome:\${PATH}
-export LD_LIBRARY_PATH=\${SMESH_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${SMESH_ROOT_DIR}/bin/salome:\${SMESH_ROOT_DIR}/lib/salome:\${SMESH_ROOT_DIR}/lib/python2.2/site-packages/salome:\${SMESH_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -33,9 +30,6 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export SMESH_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export PATH=\${SMESH_ROOT_DIR}/bin/salome:\${PATH}
-export LD_LIBRARY_PATH=\${SMESH_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${SMESH_ROOT_DIR}/bin/salome:\${SMESH_ROOT_DIR}/lib/salome:\${SMESH_ROOT_DIR}/lib/python2.2/site-packages/salome:\${SMESH_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
diff --git a/config_files/SUPERV_BIN.sh b/config_files/SUPERV_BIN.sh
index 2fbbcc4..8d76f11 100755
--- a/config_files/SUPERV_BIN.sh
+++ b/config_files/SUPERV_BIN.sh
@@ -17,9 +17,6 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export SUPERV_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export PATH=\${SUPERV_ROOT_DIR}/bin/salome:\${PATH}
-export LD_LIBRARY_PATH=\${SUPERV_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${SUPERV_ROOT_DIR}/bin/salome:\${SUPERV_ROOT_DIR}/lib/salome:\${SUPERV_ROOT_DIR}/lib/python2.2/site-packages/salome:\${SUPERV_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -33,9 +30,6 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export SUPERV_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export PATH=\${SUPERV_ROOT_DIR}/bin/salome:\${PATH}
-export LD_LIBRARY_PATH=\${SUPERV_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${SUPERV_ROOT_DIR}/bin/salome:\${SUPERV_ROOT_DIR}/lib/salome:\${SUPERV_ROOT_DIR}/lib/python2.2/site-packages/salome:\${SUPERV_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
diff --git a/config_files/VISU_BIN.sh b/config_files/VISU_BIN.sh
index 404dc26..8629555 100755
--- a/config_files/VISU_BIN.sh
+++ b/config_files/VISU_BIN.sh
@@ -17,9 +17,6 @@ print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export VISU_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export PATH=\${VISU_ROOT_DIR}/bin/salome:\${PATH}
-export LD_LIBRARY_PATH=\${VISU_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${VISU_ROOT_DIR}/bin/salome:\${VISU_ROOT_DIR}/lib/salome:\${VISU_ROOT_DIR}/lib/python2.2/site-packages/salome:\${VISU_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -33,9 +30,6 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export VISU_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export PATH=\${VISU_ROOT_DIR}/bin/salome:\${PATH}
-export LD_LIBRARY_PATH=\${VISU_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
-export PYTHONPATH=\${VISU_ROOT_DIR}/bin/salome:\${VISU_ROOT_DIR}/lib/salome:\${VISU_ROOT_DIR}/lib/python2.2/site-packages/salome:\${VISU_ROOT_DIR}/lib/python2.2/site-packages/salome/shared_modules:\${PYTHONPATH}
 ##
 EOF
     make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
-- 
2.39.2