Salome HOME
projects
/
tools
/
install.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SALOME 6.5.0 preparation: homard 10.3 -> 10.4
[tools/install.git]
/
config_files
/
HXX2SALOME.sh
diff --git
a/config_files/HXX2SALOME.sh
b/config_files/HXX2SALOME.sh
index 1dc1b7b65979f38c77f129ea93e6253b85c2ef32..ce2228e941319b3ab0270657f66c6e6880cd6f26 100755
(executable)
--- a/
config_files/HXX2SALOME.sh
+++ b/
config_files/HXX2SALOME.sh
@@
-6,14
+6,12
@@
# Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
# Project : SALOME
# Module : Installation Wizard
# Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
# Project : SALOME
# Module : Installation Wizard
-# Copyright : 2002-200
7
CEA
+# Copyright : 2002-200
8
CEA
#
# This script is the part of the SALOME installation procedure.
#
####################################################################################
#
# This script is the part of the SALOME installation procedure.
#
####################################################################################
-VERSION="5.0.0"
-
check_version(){
# No way to check version!
return 0
check_version(){
# No way to check version!
return 0
@@
-52,7
+50,7
@@
install_source()
make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
source ${INSTALL_WORK}/$SHRC
# unpack
make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}_src
source ${INSTALL_WORK}/$SHRC
# unpack
-check_jb tar xfz ${SOURCE_DIR}/HXX2SALOMEsourcesV${VERSION}.tar.gz -C ${INST_ROOT}
+check_jb tar xfz ${SOURCE_DIR}/HXX2SALOMEsourcesV${
SALOME_
VERSION}.tar.gz -C ${INST_ROOT}
# to generate environment scripts
try_preinstalled
# to generate environment scripts
try_preinstalled
@@
-107,12
+105,14
@@
source ${INSTALL_WORK}/$SHRC
# create a module directory
test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
# create a module directory
test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-check_jb tar xfz ${SOURCE_DIR}/HXX2SALOMEbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
+check_jb tar xfz ${SOURCE_DIR}/HXX2SALOMEbinariesV${
SALOME_
VERSION}.tar.gz -C ${PRODUCT_DIR}
# to generate environment scripts
try_preinstalled
}
# to generate environment scripts
try_preinstalled
}
+source ./common.sh
+
export PROCEDURE=$1;
export INSTALL_WORK=$2;
export SOURCE_DIR=$3;
export PROCEDURE=$1;
export INSTALL_WORK=$2;
export SOURCE_DIR=$3;
@@
-124,9
+124,9
@@
shift
REMOVE_SRC_TMP=$8;
shift
SINGLE_DIR=$9;
REMOVE_SRC_TMP=$8;
shift
SINGLE_DIR=$9;
-export PRODUCT="HXX2SALOME_${VERSION}"
-export PRODUCT_SRC="HXX2SALOME_SRC_${VERSION}"
+if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi
+export PRODUCT="HXX2SALOME_${SALOME_VERSION}"
+export PRODUCT_SRC="HXX2SALOME_SRC_${SALOME_VERSION}"
export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT_SRC}
export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT_SRC}
-source ./common.sh
$PROCEDURE
$PROCEDURE