Update for different version of solvers

diff --git a/config_files/DISTENE.sh b/config_files/DISTENE.sh
index 5351c1f14bc339e75ac40bc91fdde9735db7ded6..4ab392186ef8a3475722b3b1fdce047f375261e5 100755 (executable)
--- a/config_files/DISTENE.sh
+++ b/config_files/DISTENE.sh
@@ -15,8 +15,16 @@
 #
 # ghs3d &blsurf versions
 #
-GHS3D_VERSION=4.1
-BLSURF_VERSION=2.8
+if test `uname -m` = "x86_64" ; then
+GHS3D41_VERSION=4.1_64
+GHS3D42_VERSION=4.2_64
+BLSURF_VERSION=3.0_64
+else
+GHS3D41_VERSION=4.1_32
+GHS3D42_VERSION=4.2_32
+BLSURF_VERSION=3.0_32
+fi
+
 
 check_version(){
 # No way to check version!
@@ -30,7 +38,7 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 export DISTENE_HOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export BLSURFHOME=\${DISTENE_HOME}/Tools/BLSurf-${BLSURF_VERSION}
 export LD_LIBRARY_PATH=\${BLSURFHOME}/lib:\${LD_LIBRARY_PATH} 
-export PATH=\${DISTENE_HOME}/Tools/TetMesh-GHS3D${GHS3D_VERSION}/bin:\$PATH
+export PATH=\${DISTENE_HOME}/Tools/TetMesh-GHS3D${GHS3D41_VERSION}/bin:\${DISTENE_HOME}/Tools/TetMesh-GHS3D${GHS3D42_VERSION}/bin:\$PATH
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})

diff --git a/config_files/HOMARD.sh b/config_files/HOMARD.sh
new file mode 100755 (executable)
index 0000000..5220e3a
--- /dev/null
+++ b/config_files/HOMARD.sh
@@ -0,0 +1,100 @@
+#!/bin/bash -noprofile
+
+####################################################################################
+#  File      : HOMARD.sh
+#  Created   : Thu Dec 18 12:01:00 2002
+#  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
+#  Project   : SALOME
+#  Module    : Installation Wizard
+#  Copyright : 2002-2008 CEA
+#
+#  This script is the part of the SALOME installation procedure.
+#
+####################################################################################
+
+#
+# ghs3d &blsurf versions
+#
+if test `uname -m` = "x86_64" ; then
+HOMARD_VERSION=10.1_64
+else
+HOMARD_VERSION=10.1_32
+fi
+
+
+check_version(){
+# No way to check version!
+return 0
+}
+
+print_env_bin()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
+#$DELIM ${PRODUCT_TYPE} $DELIM
+export HOMARD_HOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PATH=\${HOMARD_HOME}/HOMARD_V${HOMARD_VERSION}/bin:\$PATH
+##
+EOF
+(test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+print_env_src()
+{
+cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh <<EOF
+#$DELIM ${PRODUCT_TYPE}_src $DELIM
+# nothing to do
+##
+EOF
+(test -w ${PRODUCT_SRC_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}_src.sh ${PRODUCT_SRC_DIR})
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+}
+
+try_preinstalled(){
+try_existing ${PRODUCT_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+try_existing ${PRODUCT_SRC_DIR} ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
+return $?
+}
+
+install_source()
+{
+echo "It's impossible to install ${PRODUCT} from sources"
+}
+
+install_source_and_build()
+{
+install_binary
+}
+
+install_binary()
+{
+make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
+# create a product directory
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${BIN_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
+
+# to generate environment scripts
+try_preinstalled
+}
+
+export PROCEDURE=$1;
+export INSTALL_WORK=$2;
+export SOURCE_DIR=$3;
+export INST_ROOT=$4;
+export PRODUCT_SEQUENCE=$5;
+export PRODUCT_TYPE=$6;
+export INSTALL_PRODUCTS=$7;
+SRC_DIR=$8;
+REMOVE_SRC_TMP=$9;
+shift
+BIN_DIR=$9;
+test $# == 10 && shift && SINGLE_DIR=$9
+export PRODUCT="HOMARD"
+export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
+export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
+source ./common.sh
+$PROCEDURE