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 4f71eba70affad9a0dcb5d2aae9d048974a99a5c..04279f4685afda8f0f2fb86533f8497988e245c4 100755 (executable)
--- 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 d25b7f94501116fc3ce83935ea60fd4756d3c7bc..612daf9904faa99ede6d3e12af3aa220d8e159c9 100755 (executable)
--- 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 b3013c105580f2dccf613dc47af12ed6d63d82d8..e83da95f6c7bfe0dfa39c60f6cf77ae75a9887fb 100755 (executable)
--- 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 fd96d3a2da9ed8e9e9d0a161af0435162d6f5e84..721b8eadeeaf6046fe32006762be0f4576be7682 100755 (executable)
--- 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 a91050fa2e3ac190b54153e9a02ccc0cbfa2e804..9ccaa6a4a17ca6e6d2a405e3be97651140dba6c5 100755 (executable)
--- 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 c353f7e0497403ae4ceaf9b870ec38cdde5fc0d8..0dd5bddcb28be3288645b9a05959a675dc733cd7 100755 (executable)
--- 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 67ac3c6cafc484805ffe1e934908c9d25764a57a..12c9d2406c5f36d46415d5916a820304c96d7d02 100755 (executable)
--- 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 c6f968908daed7723bd348fb49afa3d451879c6f..a14bc072145522be67dca5a77c4f3794587e40f6 100755 (executable)
--- 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 278c9b5b99a95352e28f73fc259c6d5f33eff086..c23a508f58fcdc89ca9921c121d89afc58f11176 100755 (executable)
--- 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 63b2d8e98748cb9b8778635ced3246d05ad0ad4b..82ef05edfa26e1edef983f31f9f7370533ba3325 100755 (executable)
--- 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 23b188473f67682876ba74fee5be6763674a6b0f..2d5415aba6efd9b902104ab9afa18097609c6209 100755 (executable)
--- 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