From b3e336ff9d7b78399fdc6a717180e4f4c52108bd Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Mon, 15 May 2006 11:07:47 +0000
Subject: [PATCH] Modify installation scripts for HXX2SALOME products

---
 config_files/HXX2SALOME.sh    |  5 -----
 config_files/HXX2SALOMEDOC.sh | 21 ++++++++++++++-------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/config_files/HXX2SALOME.sh b/config_files/HXX2SALOME.sh
index dfa907b..c9c1e6c 100755
--- 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 e1fe2e8..9d6dbf8 100755
--- 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;
-- 
2.39.2