X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fnd_build;h=baf77a8d84cbac2765b172332af47609cacfb038;hb=fc539535d6d41bc671bb24e72f7608550d9ffadf;hp=9f2ca6ee77913b49edfff6c267c522cd05250b41;hpb=0db6932a2654f4172b0e2f5c4d5d84005435ac75;p=neurodebian.git

diff --git a/tools/nd_build b/tools/nd_build
index 9f2ca6e..baf77a8 100755
--- a/tools/nd_build
+++ b/tools/nd_build
@@ -46,7 +46,7 @@ if [ -z "$dist" ]; then
   exit 1
 fi
 
-. /home/neurodebian/neurodebian.git/tools/nd_cmdsettings.sh
+. /etc/neurodebian/cmdsettings.sh
 
 # common options
 opts="--distribution $dist --aptcache $aptcache --buildplace $buildplace"
@@ -77,7 +77,11 @@ else
   shift; shift; shift; shift
 fi
 
+# failed will be set to 1 if any build fails
+failed=
 for a in $arch; do
+  # default
+  options="$opts"
   if [ "$a" = "amd64" ]; then
     # only force source into the upload for NeuroDebian
     if [ ! "$family" = "${family#nd+*}" ]; then
@@ -86,10 +90,23 @@ for a in $arch; do
   else
     options="$opts --debbuildopts -B"
   fi
+
   echo "Building for $family $dist $a ..."
+  buildfile="${dscfile%.dsc}_${a}.build"
+  tsfile="${buildfile}.timestamp.`date +%s`" # "unique" timestamp file
+  /usr/bin/time -f "%E real, %U user, %S sys, %O out" -o "${tsfile}" \
   cowbuilder --build $dscfile \
              --basepath ${cowbuilderroot}/cow/${family}-${dist}-${a}.cow \
              --buildresult . \
+             --logfile "${buildfile}" \
              $options \
-             $*
+             "$@" && status='OK' || { status='FAILED'; failed=1; }
+  timeinfo=$(tail -n 1 "${tsfile}")
+  # Update the summary of builds
+  touch summary.build                               # Assure existence
+  sed -i -e "s/\(${buildfile}.*out$\)/\1 OLD/g" summary.build  # Mark previous entry as OLD
+  echo -e "${buildfile}\t$status\t$timeinfo" >> summary.build  # Add current one
+  rm -f "${tsfile}"
 done
+# Exit with failure status if any built failed
+[ -z $failed ] || exit 1