Bug 1237872 - make verbosity of build.sh nicer, r=ttaubert

2 files changed, 16 insertions, 7 deletions

diff --git a/build.sh b/build.sh
index 76e100e09..ec6901f0e 100755
--- a/build.sh
+++ b/build.sh
@@ -50,6 +50,7 @@ clean=0
 rebuild_gyp=0
 target=Debug
 params=$(echo "$* $CC $CCC" | tr " " "\n")
+verbose=0
 
 cwd=$(cd $(dirname $0); pwd -P)
 dist_dir="$cwd/../dist"
@@ -89,7 +90,7 @@ while [ $# -gt 0 ]; do
         -c) clean=1 ;;
         -g) rebuild_gyp=1 ;;
         -j) ninja_params+=(-j "$2"); shift ;;
-        -v) ninja_params+=(-v) ;;
+        -v) ninja_params+=(-v); verbose=1 ;;
         --test) gyp_params+=(-Dtest_build=1) ;;
         --fuzz) gyp_params+=(-Dtest_build=1 -Dfuzz=1); enable_fuzz ;;
         --scan-build) scanbuild=(scan-build) ;;
@@ -161,13 +162,13 @@ if [ "${#scanbuild[@]}" -gt 0 ]; then
 # These steps can take a while, so don't overdo them.
 # Force a redo with -g.
 if [ "$rebuild_gyp" = 1 -o ! -d "$target_dir" ]; then
-    build_nspr
+    build_nspr $verbose
 
     # Run gyp.
-    set -v -x
+    [ $verbose = 1 ] && set -v -x
     "${scanbuild[@]}" gyp -f ninja "${gyp_params[@]}" --depth="$cwd" \
       --generator-output="." "$cwd/nss.gyp"
-    set +v +x
+    [ $verbose = 1 ] && set +v +x
 
     # Store used parameters for next run.
     echo "$params" > "$cwd/out/config"
diff --git a/coreconf/nspr.sh b/coreconf/nspr.sh
index fdb21cd66..deacb262a 100644
--- a/coreconf/nspr.sh
+++ b/coreconf/nspr.sh
@@ -21,8 +21,16 @@ build_nspr()
 {
     mkdir -p "$cwd/../nspr/$target"
     cd "$cwd/../nspr/$target"
+    if [ "$1" == 1 ]; then
+        out=/dev/stdout
+    else
+        out=/dev/null
+    fi
+    echo "[1/3] configure NSPR ..."
     CFLAGS=$nspr_cflags CXXFLAGS=$nspr_cxxflags LDFLAGS=$nspr_ldflags \
-    CC=$CC CXX=$CCC ../configure "${nspr_opt[@]}" --prefix="$obj_dir"
-    make -C "$cwd/../nspr/$target"
-    make -C "$cwd/../nspr/$target" install
+      CC=$CC CXX=$CCC ../configure "${nspr_opt[@]}" --prefix="$obj_dir" 1> $out
+    echo "[2/3] make NSPR ..."
+    make -C "$cwd/../nspr/$target" 1> $out
+    echo "[3/3] install NSPR ..."
+    make -C "$cwd/../nspr/$target" install 1> $out
 }