GNOME.org
 

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

commit 357034cee626d345dc3f931847aa3414cec2bb8a
Author: Vincent Untz <vuntz gnome org>
Date:   Fri Apr 24 04:02:48 2009 +0200

    Use shave to improve build log readability
    
    See http://git.lespiau.name/cgit/shave/tree/README for more details.
---
 compat/Makefile.am        |    4 ++-
 configure.in              |    5 +++
 doc/dbus/Makefile.am      |   11 +++---
 gnome-session/Makefile.am |   15 ++++----
 m4/shave.m4               |   77 +++++++++++++++++++++++++++++++++++++++++++
 shave-libtool.in          |   69 +++++++++++++++++++++++++++++++++++++++
 shave.in                  |   79 +++++++++++++++++++++++++++++++++++++++++++++
 splash/Makefile.am        |    3 +-
 8 files changed, 249 insertions(+), 14 deletions(-)

diff --git a/compat/Makefile.am b/compat/Makefile.am
index 990abe1..171efe0 100644
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@@ -1,3 +1,5 @@
+QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
+
 INCLUDES =					\
 	$(WARN_CFLAGS)				\
 	$(DISABLE_DEPRECATED_CFLAGS)		\
@@ -35,7 +37,7 @@ gnome_settings_daemon_helper_LDADD =		\
 @INTLTOOL_DESKTOP_RULE@
 
 %.desktop.in: %.desktop.in.in Makefile.am
-	sed -e 's,\ helperdir\@,$(helperdir),' \
+	$(QUIET_GEN)sed -e 's,\ helperdir\@,$(helperdir),' \
 		< $< > $@
 
 EXTRA_DIST =					\
diff --git a/configure.in b/configure.in
index a269769..9ef742a 100644
--- a/configure.in
+++ b/configure.in
@@ -2,6 +2,7 @@ AC_INIT([gnome-session], [2.26.2],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session])
 AC_CONFIG_SRCDIR([gnome-session])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2])
 
@@ -324,8 +325,12 @@ if test "x$enable_rebuilds" = "xyes" && \
 fi
 AC_SUBST(REBUILD)
 
+SHAVE_INIT([.], [enable])
+
 AC_OUTPUT([
 Makefile
+shave
+shave-libtool
 capplet/Makefile
 compat/Makefile
 compat/at-spi-registryd-wrapper.desktop.in.in
diff --git a/doc/dbus/Makefile.am b/doc/dbus/Makefile.am
index 885a672..e826874 100644
--- a/doc/dbus/Makefile.am
+++ b/doc/dbus/Makefile.am
@@ -1,4 +1,5 @@
 NULL =
+QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
 
 SPEC_XML_FILES =			\
 	gnome-session.xml		\
@@ -14,7 +15,7 @@ htmldocdir = $(docdir)/dbus
 htmldoc_DATA = gnome-session.html
 
 gnome-session.html : $(SPEC_XML_FILES)
-	$(XMLTO) xhtml-nochunks -m $(top_srcdir)/doc/dbus/config.xsl gnome-session.xml
+	$(QUIET_GEN)$(XMLTO) xhtml-nochunks -m $(top_srcdir)/doc/dbus/config.xsl gnome-session.xml
 
 endif # DOCBOOK_DOCS_ENABLED
 
@@ -26,13 +27,13 @@ BUILT_SOURCES =	\
 	$(NULL)
 
 org.gnome.SessionManager.ref.xml : $(top_srcdir)/gnome-session/org.gnome.SessionManager.xml spec-to-docbook.xsl
-	$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
+	$(QUIET_GEN)$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
 org.gnome.SessionManager.Client.ref.xml : $(top_srcdir)/gnome-session/org.gnome.SessionManager.Client.xml spec-to-docbook.xsl
-	$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
+	$(QUIET_GEN)$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
 org.gnome.SessionManager.ClientPrivate.ref.xml : $(top_srcdir)/gnome-session/org.gnome.SessionManager.ClientPrivate.xml spec-to-docbook.xsl
-	$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
+	$(QUIET_GEN)$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
 org.gnome.SessionManager.Inhibitor.ref.xml : $(top_srcdir)/gnome-session/org.gnome.SessionManager.Inhibitor.xml spec-to-docbook.xsl
-	$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
+	$(QUIET_GEN)$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
 
 EXTRA_DIST =				\
 	spec-to-docbook.xsl		\
diff --git a/gnome-session/Makefile.am b/gnome-session/Makefile.am
index 971d003..7b0c9a3 100644
--- a/gnome-session/Makefile.am
+++ b/gnome-session/Makefile.am
@@ -1,4 +1,5 @@
 NULL =
+QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
 
 bin_PROGRAMS = gnome-session
 
@@ -108,26 +109,26 @@ libgsmutil_la_SOURCES =				\
 	gsm-util.h
 
 gsm-marshal.c: gsm-marshal.list
-	echo "#include \"gsm-marshal.h\"" > $@ && \
+	$(QUIET_GEN)echo "#include \"gsm-marshal.h\"" > $@ && \
 	@GLIB_GENMARSHAL@ $< --prefix=gsm_marshal --body >> $@
 
 gsm-marshal.h: gsm-marshal.list
-	@GLIB_GENMARSHAL@ $< --prefix=gsm_marshal --header > $@
+	$(QUIET_GEN)@GLIB_GENMARSHAL@ $< --prefix=gsm_marshal --header > $@
 
 gsm-manager-glue.h: org.gnome.SessionManager.xml Makefile.am
-	dbus-binding-tool --prefix=gsm_manager --mode=glib-server --output=gsm-manager-glue.h $(srcdir)/org.gnome.SessionManager.xml
+	$(QUIET_GEN)dbus-binding-tool --prefix=gsm_manager --mode=glib-server --output=gsm-manager-glue.h $(srcdir)/org.gnome.SessionManager.xml
 
 gsm-client-glue.h: org.gnome.SessionManager.Client.xml Makefile.am
-	dbus-binding-tool --prefix=gsm_client --mode=glib-server --output=gsm-client-glue.h $(srcdir)/org.gnome.SessionManager.Client.xml
+	$(QUIET_GEN)dbus-binding-tool --prefix=gsm_client --mode=glib-server --output=gsm-client-glue.h $(srcdir)/org.gnome.SessionManager.Client.xml
 
 gsm-app-glue.h: org.gnome.SessionManager.App.xml Makefile.am
-	dbus-binding-tool --prefix=gsm_app --mode=glib-server --output=gsm-app-glue.h $(srcdir)/org.gnome.SessionManager.App.xml
+	$(QUIET_GEN)dbus-binding-tool --prefix=gsm_app --mode=glib-server --output=gsm-app-glue.h $(srcdir)/org.gnome.SessionManager.App.xml
 
 gsm-inhibitor-glue.h: org.gnome.SessionManager.Inhibitor.xml Makefile.am
-	dbus-binding-tool --prefix=gsm_inhibitor --mode=glib-server --output=gsm-inhibitor-glue.h $(srcdir)/org.gnome.SessionManager.Inhibitor.xml
+	$(QUIET_GEN)dbus-binding-tool --prefix=gsm_inhibitor --mode=glib-server --output=gsm-inhibitor-glue.h $(srcdir)/org.gnome.SessionManager.Inhibitor.xml
 
 gsm-presence-glue.h: org.gnome.SessionManager.Presence.xml Makefile.am
-	dbus-binding-tool --prefix=gsm_presence --mode=glib-server --output=gsm-presence-glue.h $(srcdir)/org.gnome.SessionManager.Presence.xml
+	$(QUIET_GEN)dbus-binding-tool --prefix=gsm_presence --mode=glib-server --output=gsm-presence-glue.h $(srcdir)/org.gnome.SessionManager.Presence.xml
 
 BUILT_SOURCES =			\
 	gsm-marshal.c           \
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
diff --git a/splash/Makefile.am b/splash/Makefile.am
index 8dea2fc..a4a606d 100644
--- a/splash/Makefile.am
+++ b/splash/Makefile.am
@@ -1,4 +1,5 @@
 NULL =
+QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
 
 INCLUDES =					\
 	-I$(top_srcdir)/egg			\
@@ -31,7 +32,7 @@ gnome_session_splash_LDADD =			\
 @INTLTOOL_DESKTOP_RULE@
 
 %.desktop.in: %.desktop.in.in Makefile.am
-	sed -e 's,\ helperdir\@,$(helperdir),' \
+	$(QUIET_GEN)sed -e 's,\ helperdir\@,$(helperdir),' \
 		< $< > $@
 
 EXTRA_DIST =					\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]