Modify installation scripts for HXX2SALOME products

diff --git a/config_files/HXX2SALOME.sh b/config_files/HXX2SALOME.sh
index dfa907b4608a13ad147ddebf4be8feb1dc6827d6..c9c1e6c8e25d193f7272896dded8434821d5288f 100755 (executable)
--- a/config_files/HXX2SALOME.sh
+++ b/config_files/HXX2SALOME.sh
@@ -83,11 +83,6 @@ check_jb tar xfz ${SOURCE_DIR}/HXX2SALOMEbinariesV3.2.0b1.tar.gz -C ${INSTALL_RO
 print_env
 }
 
-pickup_env()
-{
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${PRODUCT_DIR}
-}
-
 export PROCEDURE=$1;
 export INSTALL_WORK=$2;
 export SOURCE_DIR=$3;

diff --git a/config_files/HXX2SALOMEDOC.sh b/config_files/HXX2SALOMEDOC.sh
index e1fe2e8e331c36d8fcf430adb3580fad5a1a6e8b..9d6dbf8375ce0a55ba0417312fa2d740f9481806 100755 (executable)
--- a/config_files/HXX2SALOMEDOC.sh
+++ b/config_files/HXX2SALOMEDOC.sh
@@ -8,16 +8,23 @@ return 0
 print_env(){
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
-export HXX2SALOMEDOC_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export PATH=\${HXX2SALOMEDOC_ROOT_DIR}:\${PATH}
+#nothing to do
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
 }
 
-install_source()
-{
+try_native(){
+return 0
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+return $?
+}
+
+install_source(){
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
@@ -26,9 +33,9 @@ check_jb tar xfz ${SOURCE_DIR}/HXX2SALOMEDOCsourcesV3.2.0b1.tar.gz -C ${INSTALL_
 print_env
 }
 
-pickup_env()
-{
-make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE} ${PRODUCT_DIR}
+install_binary(){
+echo "Can't install binaries for ${PRODUCT}"
+return 1
 }
 
 export PROCEDURE=$1;