Beautify output and store logs in install prefix (for later analysis)

1 files changed, 36 insertions, 11 deletions

diff --git a/ci-build.sh b/ci-build.sh
index 89a0b99..bab201f 100755
--- a/ci-build.sh
+++ b/ci-build.sh
@@ -44,13 +44,33 @@ export GI_TYPELIB_PATH="$INSTALLPREFIX/share/gir-1.0":$GI_TYPELIB_PATH
 export PKG_CONFIG_PATH="$INSTALLPREFIX/lib/pkgconfig/":$PKG_CONFIG_PATH
 export GST_REGISTRY="$INSTALLPREFIX/gstreamer-registry.dat"
 
+echo
+echo
 echo "======================================================"
+echo
 echo "Environment variables"
-echo "======================================================"
+echo
 
 env
 
 echo
+echo
+
+echo
+echo
+echo "======================================================"
+echo
+echo "Modules scheduled to be built:"
+echo "  $CORE $MODULES"
+echo
+echo "Modules scheduled to be checked (make check):"
+echo "  $CHECK_MODULES"
+echo
+echo "Modules scheduled to be checked for leaks (make check-valgrind):"
+echo "  $VALGRIND_MODULES"
+echo
+echo
+
 
 tmp=${TMPDIR-/tmp}
 tmp=$tmp/git-update.$BUILD_TAG
@@ -73,32 +93,35 @@ build()
   echo "$1 : autogen.sh"
 
   # FIXME : Configurable options !
-  $WORKSPACE/$1/autogen.sh --prefix=$INSTALLPREFIX --disable-gtk-doc --disable-docbook > $tmp/$1.log 2>&1
+  logname=$INSTALLPREFIX/$1-autogen.log
+  $WORKSPACE/$1/autogen.sh --prefix=$INSTALLPREFIX --disable-gtk-doc --disable-docbook > $logname 2>&1
 
   if test $? -ne 0
   then
      echo "AUTOGEN FAILURE"
-     cat $tmp/$1.log
+     cat $logname
      exit $ERROR_RETURN
   fi
 
   echo "$1 : make"
 
-  make > $tmp/$1.log 2>&1
+  logname=$INSTALLPREFIX/$1-make.log
+  make > $logname 2>&1
   if test $? -ne 0
   then
      echo "MAKE FAILURE"
-     cat $tmp/$1.log
+     cat $logname
      exit $ERROR_RETURN
   fi
 
   echo "$1 : make install"
 
-  make install > $tmp/$1.log 2>&1
+  logname=$INSTALLPREFIX/$1-make-install.log
+  make install > $logname 2>&1
   if test $? -ne 0
   then
      echo "MAKE INSTALL FAILURE"
-     cat $tmp/$1.log
+     cat $logname
      exit $ERROR_RETURN
   fi
 }
@@ -162,12 +185,13 @@ for m in $CHECK_MODULES; do
   cd $BUILDPREFIX/$m
 
   echo "$m : make check"
-  make check > $tmp/$1.log 2>&1
+  logname=$INSTALLPREFIX/$1-make-check.log
+  make check > $logname 2>&1
 
   if test $? -ne 0
   then
      echo "MAKE CHECK FAILURE"
-     cat $tmp/$1.log
+     cat $logname
      exit $ERROR_RETURN
   fi
 done
@@ -177,12 +201,13 @@ for m in $VALGRIND_MODULES; do
   cd $BUILDPREFIX/$m
 
   echo "$m : make check-valgrind"
-  make check-valgrind > $tmp/$1.log 2>&1
+  logname=$INSTALLPREFIX/$1-make-check-valgrind.log
+  make check-valgrind > $logname 2>&1
 
   if test $? -ne 0
   then
      echo "MAKE CHECK-valgrind FAILURE"
-     cat $tmp/$1.log
+     cat $logname
      exit $ERROR_RETURN
   fi
 done