From: vsr <vsr@opencascade.com>
Date: Tue, 23 Mar 2004 10:29:10 +0000 (+0000)
Subject: Correct salome.csh, salome.sh files creation
X-Git-Tag: PAL_1_4_1~27
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a2f4c1b2d53b8aa1e142739cdf84873f5c243a26;p=tools%2Finstall.git

Correct salome.csh, salome.sh files creation
---

diff --git a/config_files/GEOM_BIN_1.4.1.sh b/config_files/GEOM_BIN_1.4.1.sh
index 4f71eba..04279f4 100755
--- a/config_files/GEOM_BIN_1.4.1.sh
+++ b/config_files/GEOM_BIN_1.4.1.sh
@@ -20,7 +20,8 @@ export GEOM_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${PRODUCT_DIR})
+(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_SRC_DIR})
+(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_ROOT_DIR})
 }
 
 # looks for the native product and collects it's environment (used by make_env())
diff --git a/config_files/GEOM_SRC_1.4.1.sh b/config_files/GEOM_SRC_1.4.1.sh
index d25b7f9..612daf9 100755
--- a/config_files/GEOM_SRC_1.4.1.sh
+++ b/config_files/GEOM_SRC_1.4.1.sh
@@ -20,7 +20,8 @@ export GEOM_SRC_DIR=\${INSTALL_ROOT}/${PRODUCT}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${PRODUCT_DIR})
+(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_SRC_DIR})
+(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_ROOT_DIR})
 }
 
 # looks for the native product and collects it's environment (used by make_env())
diff --git a/config_files/MED_BIN_1.4.1.sh b/config_files/MED_BIN_1.4.1.sh
index b3013c1..e83da95 100755
--- a/config_files/MED_BIN_1.4.1.sh
+++ b/config_files/MED_BIN_1.4.1.sh
@@ -20,7 +20,8 @@ export MED_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${PRODUCT_DIR})
+(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_SRC_DIR})
+(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_ROOT_DIR})
 }
 
 # looks for the native product and collects it's environment (used by make_env())
diff --git a/config_files/MED_SRC_1.4.1.sh b/config_files/MED_SRC_1.4.1.sh
index fd96d3a..721b8ea 100755
--- a/config_files/MED_SRC_1.4.1.sh
+++ b/config_files/MED_SRC_1.4.1.sh
@@ -20,7 +20,8 @@ export MED_SRC_DIR=\${INSTALL_ROOT}/${PRODUCT}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${PRODUCT_DIR})
+(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_SRC_DIR})
+(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_ROOT_DIR})
 }
 
 # looks for the native product and collects it's environment (used by make_env())
diff --git a/config_files/SMESH_BIN_1.4.1.sh b/config_files/SMESH_BIN_1.4.1.sh
index a91050f..9ccaa6a 100755
--- a/config_files/SMESH_BIN_1.4.1.sh
+++ b/config_files/SMESH_BIN_1.4.1.sh
@@ -20,7 +20,8 @@ export SMESH_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${PRODUCT_DIR})
+(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_SRC_DIR})
+(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_ROOT_DIR})
 }
 
 # looks for the native product and collects it's environment (used by make_env())
diff --git a/config_files/SMESH_SRC_1.4.1.sh b/config_files/SMESH_SRC_1.4.1.sh
index c353f7e..0dd5bdd 100755
--- a/config_files/SMESH_SRC_1.4.1.sh
+++ b/config_files/SMESH_SRC_1.4.1.sh
@@ -20,7 +20,8 @@ export SMESH_SRC_DIR=\${INSTALL_ROOT}/${PRODUCT}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${PRODUCT_DIR})
+(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_SRC_DIR})
+(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_ROOT_DIR})
 }
 
 # looks for the native product and collects it's environment (used by make_env())
diff --git a/config_files/SUPERV_BIN_1.4.1.sh b/config_files/SUPERV_BIN_1.4.1.sh
index 67ac3c6..12c9d24 100755
--- a/config_files/SUPERV_BIN_1.4.1.sh
+++ b/config_files/SUPERV_BIN_1.4.1.sh
@@ -20,7 +20,8 @@ export SUPERV_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${PRODUCT_DIR})
+(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_SRC_DIR})
+(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_ROOT_DIR})
 }
 
 # looks for the native product and collects it's environment (used by make_env())
diff --git a/config_files/SUPERV_SRC_1.4.1.sh b/config_files/SUPERV_SRC_1.4.1.sh
index c6f9689..a14bc07 100755
--- a/config_files/SUPERV_SRC_1.4.1.sh
+++ b/config_files/SUPERV_SRC_1.4.1.sh
@@ -20,7 +20,8 @@ export SUPERV_SRC_DIR=\${INSTALL_ROOT}/${PRODUCT}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${PRODUCT_DIR})
+(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_SRC_DIR})
+(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_ROOT_DIR})
 }
 
 # looks for the native product and collects it's environment (used by make_env())
diff --git a/config_files/VISU_BIN_1.4.1.sh b/config_files/VISU_BIN_1.4.1.sh
index 278c9b5..c23a508 100755
--- a/config_files/VISU_BIN_1.4.1.sh
+++ b/config_files/VISU_BIN_1.4.1.sh
@@ -20,7 +20,8 @@ export VISU_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${PRODUCT_DIR})
+(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_SRC_DIR})
+(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_ROOT_DIR})
 }
 
 # looks for the native product and collects it's environment (used by make_env())
diff --git a/config_files/VISU_SRC_1.4.1.sh b/config_files/VISU_SRC_1.4.1.sh
index 63b2d8e..82ef05e 100755
--- a/config_files/VISU_SRC_1.4.1.sh
+++ b/config_files/VISU_SRC_1.4.1.sh
@@ -20,7 +20,8 @@ export VISU_SRC_DIR=\${INSTALL_ROOT}/${PRODUCT}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
-(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${PRODUCT_DIR})
+(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_SRC_DIR})
+(make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${KERNEL_ROOT_DIR})
 }
 
 # looks for the native product and collects it's environment (used by make_env())
diff --git a/config_files/common.sh b/config_files/common.sh
index 23b1884..2d5415a 100755
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -112,7 +112,9 @@ rm -f ${INSTALL_WORK}/_$CSHRC
 
 if [ $# -eq 4 ] ; then
     product_dir=$4
-    cp -f ${install_work}/$SHRC ${install_work}/$CSHRC ${product_dir}/.
+    if [ -e ${product_dir} ] ; then
+	cp -f ${install_work}/$SHRC ${install_work}/$CSHRC ${product_dir}/.
+    fi
 fi
 cp -f ${install_work}/$CSHRC ${install_root}/env_products.csh
 cp -f ${install_work}/$SHRC ${install_root}/env_products.sh