GNOME.org
 

[gnome-panel] Use shave to improve build log readability

commit a93f550da6665506d53aa9aa366f906bf9e05e9b
Author: Vincent Untz <vuntz gnome org>
Date:   Mon Apr 27 01:47:06 2009 +0200

    Use shave to improve build log readability
    
    See http://git.lespiau.name/cgit/shave/tree/README for more details.
---
 applets/clock/Makefile.am             |   24 ++++++----
 applets/fish/Makefile.am              |    5 ++-
 applets/notification_area/Makefile.am |    9 +++-
 applets/wncklet/Makefile.am           |    5 ++-
 configure.in                          |    4 ++
 gnome-panel/Makefile.am               |   13 +++--
 libpanel-applet/Makefile.am           |   12 +++--
 m4/shave.m4                           |   77 ++++++++++++++++++++++++++++++++
 shave-libtool.in                      |   69 ++++++++++++++++++++++++++++
 shave.in                              |   79 +++++++++++++++++++++++++++++++++
 10 files changed, 273 insertions(+), 24 deletions(-)

diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index 3dc4989..b4f9126 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -1,5 +1,7 @@
 SUBDIRS = pixmaps
 
+QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
+
 INCLUDES =							\
 	-I$(srcdir)/../../libpanel-applet			\
 	-I$(top_builddir)/libpanel-applet			\
@@ -76,16 +78,17 @@ BUILT_SOURCES =					\
 	clock-typebuiltins.h
 
 clock-marshallers.c: clock-marshallers.list
-	glib-genmarshal --prefix _clock_marshal --header --body --internal $< > $@
+	$(QUIET_GEN)glib-genmarshal --prefix _clock_marshal --header --body --internal $< > $@
 
 clock-marshallers.h: clock-marshallers.list
-	glib-genmarshal --prefix _clock_marshal --header --internal $< > $@
+	$(QUIET_GEN)glib-genmarshal --prefix _clock_marshal --header --internal $< > $@
 
 clock_enum_headers =					\
 	$(top_srcdir)/applets/clock/clock-utils.h
 
 clock-typebuiltins.c: @REBUILD@ $(clock_enum_headers)
-	glib-mkenums    --fhead "#include <glib-object.h>\n" \
+	$(QUIET_GEN)glib-mkenums \
+			--fhead "#include <glib-object.h>\n" \
 			--fhead "#include \"clock-typebuiltins.h\"\n\n" \
 			--fprod "\n/* enumerations from \"@filename \" */" \
 			--fprod "\n#include \"@filename \"\n" \
@@ -100,7 +103,8 @@ clock-typebuiltins.c: @REBUILD@ $(clock_enum_headers)
 		$(clock_enum_headers) > $@
 
 clock-typebuiltins.h: @REBUILD@ $(clock_enum_headers)
-	glib-mkenums    --fhead "#ifndef __CLOCK_TYPEBUILTINS_H__\n" \
+	$(QUIET_GEN)glib-mkenums \
+			--fhead "#ifndef __CLOCK_TYPEBUILTINS_H__\n" \
 			--fhead "#define __CLOCK_TYPEBUILTINS_H__ 1\n\n" \
 			--fhead "G_BEGIN_DECLS\n\n" \
 			--ftail "G_END_DECLS\n\n" \
@@ -111,9 +115,10 @@ clock-typebuiltins.h: @REBUILD@ $(clock_enum_headers)
 		$(clock_enum_headers) >  $@
 
 gnome-clock-applet-mechanism-glue.h: $(srcdir)/gnome-clock-applet-mechanism.xml
-	dbus-binding-tool --prefix=gnome_clock_applet_mechanism --mode=glib-server	\
-			  --output=gnome-clock-applet-mechanism-glue.h			\
-			  $(srcdir)/gnome-clock-applet-mechanism.xml
+	$(QUIET_GEN)dbus-binding-tool \
+			--prefix=gnome_clock_applet_mechanism --mode=glib-server	\
+			--output=gnome-clock-applet-mechanism-glue.h			\
+			$(srcdir)/gnome-clock-applet-mechanism.xml
 
 gnome_clock_applet_mechanism_SOURCES =		\
 	gnome-clock-applet-mechanism.c		\
@@ -174,7 +179,8 @@ server_in_files = GNOME_ClockApplet_Factory.server.in
 server_DATA     = $(server_in_files:.server.in=.server)
 
 $(server_in_files): $(server_in_files).in Makefile
-	sed -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
+	$(QUIET_GEN)sed \
+	    -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
 	    -e "s|\ TYPE\@|$(APPLET_TYPE)|" \
 	    -e "s|\ VERSION\@|$(PACKAGE_VERSION)|" \
 	    $< > $@
@@ -210,7 +216,7 @@ if HAVE_POLKIT
 dbus_services_DATA = $(dbus_services_in_files:.service.in=.service)
 
 $(dbus_services_DATA): $(dbus_services_in_files)
-	sed -e "s|\ LIBEXECDIR\@|$(libexecdir)|" $< > $@
+	$(QUIET_GEN)sed -e "s|\ LIBEXECDIR\@|$(libexecdir)|" $< > $@
 
 dbus_conf_DATA = org.gnome.ClockApplet.Mechanism.conf
 
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
index cf14bdb..29f5d83 100644
--- a/applets/fish/Makefile.am
+++ b/applets/fish/Makefile.am
@@ -1,3 +1,5 @@
+QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
+
 INCLUDES =							\
 	-I$(srcdir)						\
 	-I$(srcdir)/../../libpanel-applet			\
@@ -66,7 +68,8 @@ server_in_files = GNOME_FishApplet_Factory.server.in
 server_DATA     = $(server_in_files:.server.in=.server)
 
 $(server_in_files): $(server_in_files).in Makefile
-	sed -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
+	$(QUIET_GEN)sed \
+	    -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
 	    -e "s|\ TYPE\@|$(APPLET_TYPE)|" \
 	    -e "s|\ VERSION\@|$(PACKAGE_VERSION)|" \
 	    $< > $@
diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am
index 5fad6c1..7e7040c 100644
--- a/applets/notification_area/Makefile.am
+++ b/applets/notification_area/Makefile.am
@@ -1,3 +1,5 @@
+QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
+
 INCLUDES =							\
 	-I$(srcdir)						\
 	-I$(srcdir)/../../libpanel-applet			\
@@ -58,7 +60,8 @@ server_in_files = GNOME_NotificationAreaApplet.server.in
 server_DATA     = GNOME_NotificationAreaApplet.server
 
 $(server_in_files): $(server_in_files).in Makefile
-	sed -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
+	$(QUIET_GEN)sed \
+	    -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
 	    -e "s|\ TYPE\@|$(APPLET_TYPE)|" \
 	    -e "s|\ VERSION\@|$(PACKAGE_VERSION)|" \
 	    $< > $@
@@ -80,10 +83,10 @@ CLEANFILES =                                    \
 	GNOME_NotificationAreaApplet.server
 
 na-marshal.h: na-marshal.list $(GLIB_GENMARSHAL)
-	$(GLIB_GENMARSHAL) $< --header --prefix=_na_marshal > $@
+	$(QUIET_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=_na_marshal > $@
 
 na-marshal.c: na-marshal.list $(GLIB_GENMARSHAL)
-	echo "#include \"na-marshal.h\"" > $@ && \
+	$(QUIET_GEN)echo "#include \"na-marshal.h\"" > $@ && \
 	$(GLIB_GENMARSHAL) $< --body --prefix=_na_marshal >> $@
 
 noinst_PROGRAMS = testtray
diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
index 63de3f7..4dbb9d8 100644
--- a/applets/wncklet/Makefile.am
+++ b/applets/wncklet/Makefile.am
@@ -1,3 +1,5 @@
+QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
+
 INCLUDES = \
 	-I$(top_builddir) \
 	-I$(top_builddir)/applets/wncklet \
@@ -65,7 +67,8 @@ server_in_files = GNOME_Wncklet_Factory.server.in
 server_DATA     = $(server_in_files:.server.in=.server)
 
 $(server_in_files): $(server_in_files).in Makefile
-	sed -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
+	$(QUIET_GEN)sed \
+	    -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
 	    -e "s|\ TYPE\@|$(APPLET_TYPE)|" \
 	    -e "s|\ VERSION\@|$(PACKAGE_VERSION)|" \
 	    $< > $@
diff --git a/configure.in b/configure.in
index bc1c580..058e190 100644
--- a/configure.in
+++ b/configure.in
@@ -323,8 +323,12 @@ if test "x$enable_rebuilds" = "xyes" && \
 fi
 AC_SUBST(REBUILD)
 
+SHAVE_INIT([.], [enable])
+
 AC_OUTPUT([
 Makefile
+shave
+shave-libtool
 idl/Makefile
 icons/Makefile
 icons/16x16/Makefile
diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am
index 74bb314..c167c2f 100644
--- a/gnome-panel/Makefile.am
+++ b/gnome-panel/Makefile.am
@@ -3,6 +3,7 @@ AUTOMAKE_OPTIONS = 1.3
 SUBDIRS = libpanel-util
 
 NULL =
+QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
 
 INCLUDES =							\
 	-I.							\
@@ -43,7 +44,7 @@ CORBA_SRCLIST =			\
 	$(NULL)
 
 $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL)
-	$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
+	$(QUIET_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
 
 BUILT_SOURCES = \
 	$(CORBA_SRCLIST)	\
@@ -199,14 +200,15 @@ panel_enum_headers =					\
 	GNOME_Panel.h
 
 panel-marshal.h: panel-marshal.list $(GLIB_GENMARSHAL)
-	$(GLIB_GENMARSHAL) $< --header --prefix=panel_marshal > $@
+	$(QUIET_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=panel_marshal > $@
 
 panel-marshal.c: panel-marshal.list $(GLIB_GENMARSHAL)
-	echo "#include \"panel-marshal.h\"" > $@ && \
+	$(QUIET_GEN)echo "#include \"panel-marshal.h\"" > $@ && \
 	$(GLIB_GENMARSHAL) $< --body --prefix=panel_marshal >> $@
 
 panel-typebuiltins.c: @REBUILD@ $(panel_enum_headers)
-	glib-mkenums    --fhead "#include <glib-object.h>\n" \
+	$(QUIET_GEN)glib-mkenums \
+			--fhead "#include <glib-object.h>\n" \
 			--fhead "#include \"panel-typebuiltins.h\"\n\n" \
 			--fprod "\n/* enumerations from \"@filename \" */" \
 			--fprod "\n#include \"@filename \"\n" \
@@ -221,7 +223,8 @@ panel-typebuiltins.c: @REBUILD@ $(panel_enum_headers)
 		$(panel_enum_headers) > $@
 
 panel-typebuiltins.h: @REBUILD@ $(panel_enum_headers)
-	glib-mkenums    --fhead "#ifndef __PANEL_TYPEBUILTINS_H__\n" \
+	$(QUIET_GEN)glib-mkenums \
+			--fhead "#ifndef __PANEL_TYPEBUILTINS_H__\n" \
 			--fhead "#define __PANEL_TYPEBUILTINS_H__ 1\n\n" \
 			--fhead "G_BEGIN_DECLS\n\n" \
 			--ftail "G_END_DECLS\n\n" \
diff --git a/libpanel-applet/Makefile.am b/libpanel-applet/Makefile.am
index 6c73d64..049686b 100644
--- a/libpanel-applet/Makefile.am
+++ b/libpanel-applet/Makefile.am
@@ -45,7 +45,7 @@ CORBA_SRCLIST =			\
 	GNOME_Panel.h
 
 $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL)
-	$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
+	$(QUIET_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
 
 noinst_PROGRAMS = test-bonobo-applet
 
@@ -77,16 +77,17 @@ EXTRA_DIST =					\
 	panel-test-applets.glade
 
 panel-applet-marshal.h: panel-applet-marshal.list $(GLIB_GENMARSHAL)
-	$(GLIB_GENMARSHAL) $< --header --prefix=panel_applet_marshal > $@
+	$(QUIET_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=panel_applet_marshal > $@
 
 panel-applet-marshal.c: panel-applet-marshal.list $(GLIB_GENMARSHAL)
-	echo "#include \"panel-applet-marshal.h\"" > $@ && \
+	$(QUIET_GEN)echo "#include \"panel-applet-marshal.h\"" > $@ && \
 	$(GLIB_GENMARSHAL) $< --body --prefix=panel_applet_marshal >> $@
 
 panel_applet_enum_headers = $(top_srcdir)/libpanel-applet/panel-applet.h
 
 panel-applet-enums.c: @REBUILD@ $(panel_applet_enum_headers)
-	glib-mkenums --fhead "#include <glib-object.h>\n" \
+	$(QUIET_GEN)glib-mkenums \
+		     --fhead "#include <glib-object.h>\n" \
 		     --fhead "#include \"panel-applet-enums.h\"\n\n" \
 		     --fprod "\n/* enumerations from \"@filename \" */" \
 		     --fprod "\n#include \"@filename \"\n" \
@@ -101,7 +102,8 @@ panel-applet-enums.c: @REBUILD@ $(panel_applet_enum_headers)
 		$(panel_applet_enum_headers) > $@
 
 panel-applet-enums.h: @REBUILD@ $(panel_applet_enum_headers)
-	glib-mkenums --fhead "#ifndef __PANEL_APPLET_ENUMS_H__\n" \
+	$(QUIET_GEN)glib-mkenums \
+		     --fhead "#ifndef __PANEL_APPLET_ENUMS_H__\n" \
 		     --fhead "#define __PANEL_APPLET_ENUMS_H__\n\n" \
 		     --fhead "G_BEGIN_DECLS\n\n" \
 		     --ftail "G_END_DECLS\n\n" \
diff --git a/m4/shave.m4 b/m4/shave.m4
new file mode 100644
index 0000000..0a3509e
--- /dev/null
+++ b/m4/shave.m4
@@ -0,0 +1,77 @@
+dnl Make automake/libtool output more friendly to humans
+dnl  Damien Lespiau <damien lespiau gmail com>
+dnl
+dnl SHAVE_INIT([shavedir],[default_mode])
+dnl
+dnl shavedir: the directory where the shave scripts are, it defaults to
+dnl           $(top_builddir)
+dnl default_mode: (enable|disable) default shave mode.  This parameter
+dnl               controls shave's behaviour when no option has been
+dnl               given to configure.  It defaults to disable.
+dnl
+dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just
+dnl   before AC_CONFIG_FILE/AC_OUTPUT is perfect.  This macro rewrites CC and
+dnl   LIBTOOL, you don't want the configure tests to have these variables
+dnl   re-defined.
+dnl * This macro requires GNU make's -s option.
+
+AC_DEFUN([_SHAVE_ARG_ENABLE],
+[
+  AC_ARG_ENABLE([shave],
+    AS_HELP_STRING(
+      [--enable-shave],
+      [use shave to make the build pretty [[default=$1]]]),,
+      [enable_shave=$1]
+    )
+])
+
+AC_DEFUN([SHAVE_INIT],
+[
+  dnl you can tweak the default value of enable_shave
+  m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)])
+
+  if test x"$enable_shave" = xyes; then
+    dnl where can we find the shave scripts?
+    m4_if([$1],,
+      [shavedir="$ac_pwd"],
+      [shavedir="$ac_pwd/$1"])
+    AC_SUBST(shavedir)
+
+    dnl make is now quiet
+    AC_SUBST([MAKEFLAGS], [-s])
+    AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`'])
+
+    dnl we need sed
+    AC_CHECK_PROG(SED,sed,sed,false)
+
+    dnl substitute libtool
+    SHAVE_SAVED_LIBTOOL=$LIBTOOL
+    LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'"
+    AC_SUBST(LIBTOOL)
+
+    dnl substitute cc/cxx
+    SHAVE_SAVED_CC=$CC
+    SHAVE_SAVED_CXX=$CXX
+    SHAVE_SAVED_FC=$FC
+    SHAVE_SAVED_F77=$F77
+    SHAVE_SAVED_OBJC=$OBJC
+    CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}"
+    CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}"
+    FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}"
+    F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}"
+    OBJC="${SHELL} ${shavedir}/shave objc ${SHAVE_SAVED_OBJC}"
+    AC_SUBST(CC)
+    AC_SUBST(CXX)
+    AC_SUBST(FC)
+    AC_SUBST(F77)
+    AC_SUBST(OBJC)
+
+    V=@
+  else
+    V=1
+  fi
+  Q='$(V:1=)'
+  AC_SUBST(V)
+  AC_SUBST(Q)
+])
+
diff --git a/shave-libtool.in b/shave-libtool.in
new file mode 100644
index 0000000..1f3a720
--- /dev/null
+++ b/shave-libtool.in
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+# we need sed
+SED= SED@
+if test -z "$SED" ; then
+SED=sed
+fi
+
+lt_unmangle ()
+{
+   last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'`
+}
+
+# the real libtool to use
+LIBTOOL="$1"
+shift
+
+# if 1, don't print anything, the underlaying wrapper will do it
+pass_though=0
+
+# scan the arguments, keep the right ones for libtool, and discover the mode
+preserved_args=
+while test "$#" -gt 0; do
+    opt="$1"
+    shift
+
+    case $opt in
+    --mode=*)
+        mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'`
+        preserved_args="$preserved_args $opt"
+        ;;
+    -o)
+        lt_output="$1"
+        preserved_args="$preserved_args $opt"
+	;;
+    *)
+        preserved_args="$preserved_args $opt"
+        ;;
+      esac
+done
+
+case "$mode" in
+compile)
+    # shave will be called and print the actual CC/CXX/LINK line
+    preserved_args="$preserved_args --shave-mode=$mode"
+    pass_though=1
+    ;;
+link)
+    preserved_args="$preserved_args --shave-mode=$mode"
+    Q="  LINK  "
+    ;;
+*)
+    # let's u
+    # echo "*** libtool: Unimplemented mode: $mode, fill a bug report"
+    ;;
+esac
+
+lt_unmangle "$lt_output"
+output=$last_result
+
+if test -z $V; then
+    if test $pass_though -eq 0; then
+        echo "$Q$output"
+    fi
+    $LIBTOOL --silent $preserved_args
+else
+    echo $LIBTOOL $preserved_args
+    $LIBTOOL $preserved_args
+fi
diff --git a/shave.in b/shave.in
new file mode 100644
index 0000000..5c16f27
--- /dev/null
+++ b/shave.in
@@ -0,0 +1,79 @@
+#!/bin/sh
+
+# we need sed
+SED= SED@
+if test -z "$SED" ; then
+SED=sed
+fi
+
+lt_unmangle ()
+{
+   last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'`
+}
+
+# the tool to wrap (cc, cxx, ar, ranlib, ..)
+tool="$1"
+shift
+
+# the reel tool (to call)
+REEL_TOOL="$1"
+shift
+
+pass_through=0
+preserved_args=
+while test "$#" -gt 0; do
+    opt="$1"
+    shift
+
+    case $opt in
+    --shave-mode=*)
+        mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'`
+	;;
+    -o)
+        lt_output="$1"
+        preserved_args="$preserved_args $opt"
+	;;
+    *)
+        preserved_args="$preserved_args $opt"
+        ;;
+      esac
+done
+
+# mode=link is handled in the libtool wrapper
+case "$mode,$tool" in
+link,*)
+    pass_through=1
+    ;;
+*,cxx)
+    Q="  CXX   "
+    ;;
+*,cc)
+    Q="  CC    "
+    ;;
+*,fc)
+    Q="  FC    "
+    ;;
+*,f77)
+    Q="  F77   "
+    ;;
+*,objc)
+    Q="  OBJC   "
+    ;;
+*,*)
+    # should not happen
+    Q="  CC    "
+    ;;
+esac
+
+lt_unmangle "$lt_output"
+output=$last_result
+
+if test -z $V; then
+    if test $pass_through -eq 0; then
+        echo "$Q$output"
+    fi
+    $REEL_TOOL $preserved_args
+else
+    echo $REEL_TOOL $preserved_args
+    $REEL_TOOL $preserved_args
+fi
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]