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
*** empty log message ***
[tools/install.git]
/
config_files
/
CALCULATOR.sh
diff --git
a/config_files/CALCULATOR.sh
b/config_files/CALCULATOR.sh
index 02bcdb33f15b514f432191943e97baad011d43da..e383046af7463007fe24a6feef8d9169f658be2b 100755
(executable)
--- a/
config_files/CALCULATOR.sh
+++ b/
config_files/CALCULATOR.sh
@@
-12,7
+12,7
@@
#
####################################################################################
#
####################################################################################
-VERSION="
3.2.6
"
+VERSION="
4.0.0
"
check_version(){
if [ -n "${CALCULATOR_ROOT_DIR}" ]; then
check_version(){
if [ -n "${CALCULATOR_ROOT_DIR}" ]; then
@@
-24,12
+24,9
@@
if [ -n "${CALCULATOR_ROOT_DIR}" ]; then
fi
fi
elif [ -n "${CALCULATOR_SRC_DIR}" ]; then
fi
fi
elif [ -n "${CALCULATOR_SRC_DIR}" ]; then
- if [ -f ${CALCULATOR_SRC_DIR}/configure.in.base ]; then
- ver=`grep -E "^VERSION=" ${CALCULATOR_SRC_DIR}/configure.in.base | awk -F= '{print $NF}' | tr -d '[:space:]' `
- if [ "$ver" = "${VERSION}" ]; then
- return 0
- fi
- fi
+ check_salome_src_version CALCULATOR_SRC_DIR $VERSION
+ if [ $? -eq 0 ] ; then return 0 ; fi
+ return 1
fi
return 1
}
fi
return 1
}