make all_tcl now quiet, use setup_packages_filt

Makefile

@@ -1,4 +1,4 @@
-# $Id: Makefile 918 2017-06-28 20:04:17Z mueller $
+# $Id: Makefile 1055 2018-10-12 17:53:52Z mueller $
 #
 # 'Meta Makefile' for whole retro project
 #   allows to make all synthesis targets
@@ -6,6 +6,7 @@
 #
 #  Revision History: 
 # Date         Rev Version  Comment
+# 2018-10-12  1055   1.2.9  use setup_package_filt
 # 2017-06-28   918   1.2.8  add cmoda7 port for tst_rlink,tst_sram,w11a
 # 2017-05-01   891   1.2.7  add all_tcl to all; use njobihtm
 # 2016-10-01   810   1.2.6  move component tests to SIM_viv when vivado used
@@ -250,7 +251,7 @@ clean_lib :
 	$(MAKE) -C tools/src distclean
 #
 all_tcl :
-	(cd tools/tcl; setup_packages)
+	(cd tools/tcl; setup_packages 2>&1 | ./setup_packages_filt -quiet)
 #
 all_dox :
 	(cd tools/dox; make_doxy)

doc/CHANGELOG.md

@@ -47,6 +47,7 @@ The full set of tests is only run for tagged releases.
 - add pdp11_dmpcnt: performance counters
 
 ### Changes
+- Makefile: `make all_tcl` now quiet, use setup_packages_filt
 - sys_w11_n4: reduce cache from 64 to 32 kB to keep timing closure
 - changes for DM_STAT_* signals (debug and monitoring)
   - DM_STAT_SE: add elements cpbusy,idec,pcload

tools/tcl/setup_packages

@@ -1,6 +1,13 @@
 #! /usr/bin/env tclshcpp
-# $Id: setup_packages 847 2017-01-29 22:38:42Z mueller $
+# $Id: setup_packages 1053 2018-10-06 20:34:52Z mueller $
 #
+# pkg_mkIndex uses tclLog to write, which by default writes to stderr
+# this is 'make -s' unfriendly, so redefined tclLog to use plain puts
+
+proc tclLog args {
+  puts {*}$args
+}
+
 pkg_mkIndex -verbose ../lib \
             librlinktpp.so \
             librusbtpp.so \

tools/tcl/setup_packages_filt

@@ -0,0 +1,80 @@
+#!/usr/bin/perl -w
+# $Id: setup_packages_filt 1055 2018-10-12 17:53:52Z mueller $
+#
+# Copyright 2018- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
+#
+# This program is free software; you may redistribute and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# for complete details.
+#
+#  Revision History:
+# Date         Rev Version  Comment
+# 2018-10-12  1055   1.0    Initial version
+# 2018-10-06  1054   0.1    First draft
+#
+
+use 5.14.0;                                 # require Perl 5.14 or higher
+use strict;                                 # require strict checking
+
+use Getopt::Long;
+my %opts = ();
+GetOptions(\%opts, "help", "quiet")
+  or exit 1;
+
+
+autoflush STDOUT 1 if (-p STDOUT);          # autoflush if output into pipe
+
+my $mname = '';
+my $obuf = '';
+my $ecode = 0;
+
+sub print_help;
+sub flush_obuf;
+
+if (exists $opts{help}) {
+  print_help;
+  exit 0;
+}
+
+print "setup_packages summary:\n" unless $opts{quiet};
+
+while (<>) {
+  chomp;
+  if (m/^successful\s+(loading|sourcing)\s+of\s+(.*)$/) {
+    flush_obuf unless $opts{quiet};
+    $mname = $2;
+    $obuf = '  ' . $2 . ' :';
+  } elsif ($mname ne '' && m/^packages provided were\s+(.*)$/) {
+    $obuf .= ' ' . $1;
+  } elsif (m/^processed\s+(.*)$/ && $mname eq $1) {
+    flush_obuf unless $opts{quiet};
+  } else {
+    flush_obuf;
+    print "$_\n";
+    $ecode = 1;
+  }
+}
+
+exit $ecode;
+
+#-------------------------------------------------------------------------------
+
+sub flush_obuf {
+  print "$obuf\n" if $obuf ne '';
+  $obuf = '';
+  $mname = '';
+}
+
+#-------------------------------------------------------------------------------
+
+sub print_help {
+  print "usage: setup_packages 2>&1 | setup_packages_filt [OPTIONS]...\n";
+  print "  --quiet       suppress expected output\n";
+  print "  --help        print this text and exit\n";
+  return;
+}