Update check products version number procedures

diff --git a/config_files/CAS-5.2.3.sh b/config_files/CAS-5.2.3.sh
index 9e412217321ee33b0dfc3eb6e72dbe9caa73420e..ccca9895475b9177b94c8fa78ff23c03f362ba96 100755 (executable)
--- a/config_files/CAS-5.2.3.sh
+++ b/config_files/CAS-5.2.3.sh
@@ -12,8 +12,8 @@ fi
 ver_major=`grep "!define OCC_VERSION_MAJOR" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'`
 ver_minor=`grep "!define OCC_VERSION_MINOR" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'`
 ver="$ver_major.$ver_minor"
-if [ "$ver" == "5.2" ] ; then
-    return 0
+if [ "$ver" != "5.2" ] ; then
+    return 1
 fi
 # above check if only for major and minor version numbers
 # we need also the check for the release version number

diff --git a/config_files/CAS-5.2.sh b/config_files/CAS-5.2.sh
index 5e3a6333adf843c84c8b6fe81523bf14ce2b2cce..819bff14d94b3f4db8622234b205a9c98de2271f 100755 (executable)
--- a/config_files/CAS-5.2.sh
+++ b/config_files/CAS-5.2.sh
@@ -2,12 +2,17 @@
 
 check_version()
 {
-#check existence of Open CASCADE 5.2
-#unfortunately we can't say nothing exactly about Open CASCADE 5.2
-#and we only check CASROOT env.variable
-if [ -n "$CASROOT" ]; then
-    #echo "You have installed version of Open CASCADE in a $CASROOT"
-    #echo "Please check version number (You need 5.2)"
+if [ -z "$CASROOT" ]; then
+    return 1
+fi
+check_lib_version ${CASROOT}/inc/Standard_Version.hxx
+if [ "$?" -ne "0" ] ; then
+    return 1
+fi
+ver_major=`grep "!define OCC_VERSION_MAJOR" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'`
+ver_minor=`grep "!define OCC_VERSION_MINOR" ${CASROOT}/inc/Standard_Version.hxx | awk '{print $3}'`
+ver="$ver_major.$ver_minor"
+if [ "$ver" == "5.2" ] ; then
     return 0
 fi
 return 1
@@ -18,7 +23,7 @@ print_env()
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export CASROOT=\${INSTALL_ROOT}/${PRODUCT}
-export LD_LIBRARY_PATH=\${CASROOT}/Linux/lib:\${CASROOT}/lin/lib:\${CASROOT}/`uname`/lib:\${LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH=\${CASROOT}/lin/lib:\${CASROOT}/`uname`/lib:\${LD_LIBRARY_PATH}
 # Variable for Foundation Classes : 
 export CSF_UnitsLexicon=\${CASROOT}/src/UnitsAPI/Lexi_Expr.dat 
 export CSF_UnitsDefinition=\${CASROOT}/src/UnitsAPI/Units.dat 
@@ -41,7 +46,7 @@ if [ $? -eq 0 ] ; then
     cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export CASROOT=${CASROOT}
-export LD_LIBRARY_PATH=\${CASROOT}/Linux/lib:\${CASROOT}/lin/lib:\${CASROOT}/`uname`/lib:\${LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH=\${CASROOT}/lin/lib:\${CASROOT}/`uname`/lib:\${LD_LIBRARY_PATH}
 # Variable for Foundation Classes : 
 export CSF_UnitsLexicon=\${CASROOT}/src/UnitsAPI/Lexi_Expr.dat 
 export CSF_UnitsDefinition=\${CASROOT}/src/UnitsAPI/Units.dat 

diff --git a/config_files/HappyDoc-r2_1.sh b/config_files/HappyDoc-r2_1.sh
index cfa7513d23141d8d7a391baa3523ebfdb9d8b624..a7d18c221803e92fd24e2b4ab65422113c062372 100755 (executable)
--- a/config_files/HappyDoc-r2_1.sh
+++ b/config_files/HappyDoc-r2_1.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 check_version(){
-check_lib_version happydoc ${PYTHONHOME}/bin
+check_lib_version happydoc $PATH
 if [ "$?" -ne "0" ]; then
    return 1
 fi

diff --git a/config_files/doxygen-1.3-rc2.sh b/config_files/doxygen-1.3-rc2.sh
index 0fe4380e0b76adf6109b881d30d433aaf7f5f692..2aaf2f329cedaf5e04577cd029b2b48cfc85ab4f 100755 (executable)
--- a/config_files/doxygen-1.3-rc2.sh
+++ b/config_files/doxygen-1.3-rc2.sh
@@ -15,9 +15,12 @@ if [ "$?" -ne "0" ]; then
    return 1
 fi
 check_lib_version doxywizard $PATH
-if [ "$?" -eq "0" ]; then
-   #echo "The product ${PRODUCT} has been already installed on yours system"
-   return 0
+if [ "$?" -ne "0" ]; then
+   return 1
+fi
+ver=`doxygen --version`
+if [ "$ver" == "1.3-rc2" ]; then
+    return 0
 fi
 return 1
 }

diff --git a/config_files/graphviz-1.9.sh b/config_files/graphviz-1.9.sh
index ef4a872227725c4735be070f7bb331b095ec25b8..b047817e79375857cd2897f6f34a2c1bec26dc3e 100755 (executable)
--- a/config_files/graphviz-1.9.sh
+++ b/config_files/graphviz-1.9.sh
@@ -2,10 +2,12 @@
 
 check_version()
 {
-check_lib_version dot ${PATH}
-if [ "$?" -eq "0" ]; then
-   #echo "The product ${PRODUCT} has been already installed on yours system"
-   return 0
+isdot=`which dot 2>/dev/null`
+if [ -n isdot ]; then
+  ver=`dot -V 2>&1 | awk '{print $3}'`
+  if [ "$ver" == "1.9" ]; then
+    return 0
+  fi
 fi
 return 1
 }

diff --git a/config_files/graphviz-2.2.1.sh b/config_files/graphviz-2.2.1.sh
index f4f1a5cdd1f2a553bacfd1c18cd4c03d9a9eba61..a3880fb69d6a2ec792a02dec237bd5dfca0f679b 100755 (executable)
--- a/config_files/graphviz-2.2.1.sh
+++ b/config_files/graphviz-2.2.1.sh
@@ -2,9 +2,12 @@
 
 check_version()
 {
-ver=`dot -V 2>&1 | awk '{print $3}'`
-if [ "$ver" == "2.2.1" ]; then
-   return 0
+isdot=`which dot 2>/dev/null`
+if [ -n isdot ]; then
+  ver=`dot -V 2>&1 | awk '{print $3}'`
+  if [ "$ver" == "2.2.1" ]; then
+    return 0
+  fi
 fi
 return 1
 }