From: vsr <vsr@opencascade.com>
Date: Tue, 17 Dec 2013 16:01:53 +0000 (+0000)
Subject: SALOME 7.3.0 preparation
X-Git-Tag: V7_3_0rc1~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5951e75f041a397f26b674e3a5bb8591d131d240;p=tools%2Finstall.git

SALOME 7.3.0 preparation
---

diff --git a/config_files/build.sh b/config_files/build.sh
index 4fc0b14..99e7c7c 100755
--- a/config_files/build.sh
+++ b/config_files/build.sh
@@ -14,8 +14,6 @@
 #  Try build.sh -h for more details about usage.
 #
 #  Last update: 13/12/2013: porting SALOME build procedure to CMake
-#  TODO:
-#  - get back verbosity option which is currently switched off
 #
 ####################################################################################
 
@@ -26,8 +24,6 @@ fi
 
 # default installation directory
 def_install_dir="$(pwd)/INSTALL"
-# default verbosity level
-def_verbosity_level=0
 # default modules list
 def_modules=""
 def_modules="${def_modules} KERNEL GUI GEOM MED SMESH PARAVIS YACS HOMARD HEXABLOCK JOBMANAGER"
@@ -67,11 +63,6 @@ usage(){
     echo ""
     echo "-p <PREFIX>    Specify installation directory."
     echo "               Default: ${def_install_dir}."
-#    echo ""
-#    echo "-v <LEVEL>     Specify verbosity level:"
-#    echo "               0 - show only errors;"
-#    echo "               1 - show errors and warnings."
-#    echo "               Default: ${def_verbosity_level}."
     echo ""
     echo "-D<OPT>=<VAL>  Specify additional options to be passed to CMake command."
     echo ""
@@ -151,7 +142,6 @@ supports_build_tui()
 is_delete=0
 build_devdocs=0
 prefix=
-verbosity=${def_verbosity_level}
 nbjobs=
 cmake_options=
 
@@ -185,13 +175,6 @@ for o in "$@" ; do
 			fi
 			break
 			;;
-		    v ) verbosity=${ov}
-			if [ "${verbosity}" = "" ] ; then
-			    wait_arg=1
-			    wait_opt=v
-			fi
-			break
-			;;
 		    j ) nbjobs=${ov}
 			if [ "${nbjobs}" = "" ] ; then
 			    wait_arg=1
@@ -216,7 +199,6 @@ for o in "$@" ; do
 	    elif [ "${wait_opt}" != "" ] ; then
 		case ${wait_opt} in
 		    p ) prefix=${o} ;;
-		    v ) verbosity=${o} ;;
 		    j ) nbjobs=${o} ;;
 		    * ) error_exit "unknown option -- ${wait_opt}" ;;
 		esac
@@ -276,7 +258,6 @@ if [ "${DEBUG_SCRIPT}" = "1" ] ; then
     echo
     echo "====== debug script: options: begin ====="
     echo "prefix=$prefix"
-    echo "verbosity=$verbosity"
     echo "nbjobs=$nbjobs"
     echo "cmake_options=$cmake_options"
     echo "modules=$modules"
@@ -461,16 +442,9 @@ for module in ${modules} ; do
     ( cd ${module_build} && cmake ${module_src} -DCMAKE_INSTALL_PREFIX=${px} ${module_cmake_options} >> ${LOG_DIR}/${module}_cmake.log 2>&1 )
     sts=$?
 
-    # print errors/warnings
-    if [ ${verbosity} -gt 0 ] ; then
-	cat ${LOG_DIR}/${module}_cmake.log | grep -iE ": (warning|error):" >&2
-    else
-	cat ${LOG_DIR}/${module}_cmake.log | grep ": error:" >&2
-    fi
-    
     # stop if there were any errors
     if [ "${sts}" != "0" ] ; then
-	echo "Error: cmake failed."
+	echo "Error: cmake failed; see ${LOG_DIR}/${module}_cmake.log for more details."
 	continue
     fi
 
@@ -487,21 +461,9 @@ for module in ${modules} ; do
     ( cd ${module_build} && make ${nbjobs} >> ${LOG_DIR}/${module}_make.log 2>&1 )
     sts=$?
 
-    # print errors/warnings
-    #-------------------------------------------------------------------------
-    # print compiler errors and warnings
-    # Note: here awk is used to concatenate together several lines of single
-    #       error or warning message produced by stupid gnu compiler
-    # Actually, instead of that we could use 'fmessage length=n' option of g++...
-    #-------------------------------------------------------------------------
-    cat ${LOG_DIR}/${module}_make.log | grep -Ei '[*][*][*].*error' >&2
-    if [ ${verbosity} -gt 0 ] ; then
-	cat ${LOG_DIR}/${module}_make.log | awk 'substr($0,0,1)!=" " {print ""} {print $0} END {print ""}' | grep -E ": warning|* Warning|${module_src}/[A-Za-z_0-9./]*:" | sed s@"^${module_src}/src/"@@ >&2
-    fi
-
     # stop if there were any errors
     if [ "${sts}" != "0" ] ; then
-	echo "Error: make failed."
+	echo "Error: make failed; see ${LOG_DIR}/${module}_make.log for more details."
 	continue
     fi
 
@@ -517,7 +479,11 @@ for module in ${modules} ; do
 	    echo "make dev_docs"                                                            >> ${LOG_DIR}/${module}_make_devdocs.log
 	    echo "========================================================================" >> ${LOG_DIR}/${module}_make_devdocs.log
 	    ( cd ${module_build} && make dev_docs >> ${LOG_DIR}/${module}_make_devdocs.log 2>&1 )
-	    cat ${LOG_DIR}/${module}_make_devdocs.log | grep '[*][*][*]' >&2
+	    sts=$?
+	    
+	    if [ "${sts}" != "0" ] ; then
+		echo "Warning: make dev_docs failed; see ${LOG_DIR}/${module}_make_devdocs.log for more details."
+	    fi
 	fi
     fi
 
@@ -545,7 +511,7 @@ for module in ${modules} ; do
     sts=$?
 	  
     if [ "${sts}" != "0" ] ; then
-	echo "Error: make install failed."
+	echo "Error: make install failed; see ${LOG_DIR}/${module}_make_install.log for more details."
 	continue
     fi