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
Update for Salome series4x
[tools/install.git]
/
config_files
/
VISU.sh
diff --git
a/config_files/VISU.sh
b/config_files/VISU.sh
index c975df9fc60151876f1eda95ecbe28978385b7fe..99989fe38c5ddc57f6394447976a74cab853dc4c 100755
(executable)
--- a/
config_files/VISU.sh
+++ b/
config_files/VISU.sh
@@
-12,7
+12,7
@@
#
####################################################################################
#
####################################################################################
-VERSION="
3.2.6
"
+VERSION="
4.0.0
"
check_version(){
if [ -n "${VISU_ROOT_DIR}" ]; then
check_version(){
if [ -n "${VISU_ROOT_DIR}" ]; then
@@
-24,12
+24,9
@@
if [ -n "${VISU_ROOT_DIR}" ]; then
fi
fi
elif [ -n "${VISU_SRC_DIR}" ]; then
fi
fi
elif [ -n "${VISU_SRC_DIR}" ]; then
- if [ -f ${VISU_SRC_DIR}/configure.in.base ]; then
- ver=`grep -E "^VERSION=" ${VISU_SRC_DIR}/configure.in.base | awk -F= '{print $NF}' | tr -d '[:space:]' `
- if [ "$ver" = "${VERSION}" ]; then
- return 0
- fi
- fi
+ check_salome_src_version VISU_SRC_DIR $VERSION
+ if [ $? -eq 0 ] ; then return 0 ; fi
+ return 1
fi
return 1
}
fi
return 1
}
@@
-80,10
+77,8
@@
source ${INSTALL_WORK}/$SHRC
check_jb tar xfz ${SOURCE_DIR}/VISUsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
check_jb tar xfz ${SOURCE_DIR}/VISUsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
-if [ $PROCEDURE == "install_source" ]; then
# to generate environment scripts
# to generate environment scripts
- try_preinstalled
-fi
+try_preinstalled
}
install_source_and_build()
}
install_source_and_build()