From 796028ef614e6cfbdfba67927fe9696efaac1269 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Campos Date: Tue, 12 May 2009 19:12:16 +0200 Subject: [PATCH] [build] Use shave to improve build log readability --- configure.ac | 5 + .../gimpcellrenderertoggle/Makefile.am | 6 +- cut-n-paste/toolbar-editor/Makefile.am | 10 +- libdocument/Makefile.am | 6 +- libview/Makefile.am | 10 +- m4/shave.m4 | 99 ++++++++++++++++ shave-libtool.in | 109 ++++++++++++++++++ shave.in | 102 ++++++++++++++++ shell/Makefile.am | 10 +- 9 files changed, 341 insertions(+), 16 deletions(-) create mode 100644 m4/shave.m4 create mode 100644 shave-libtool.in create mode 100644 shave.in diff --git a/configure.ac b/configure.ac index 6f7460b5..880c57cc 100644 --- a/configure.ac +++ b/configure.ac @@ -44,6 +44,7 @@ AC_INIT([Evince],[ev_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=e AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip]) AM_CONFIG_HEADER(config.h) +AC_CONFIG_MACRO_DIR(m4) AM_MAINTAINER_MODE @@ -576,6 +577,8 @@ AC_SUBST([EV_VIEW_LT_CURRENT_MINUS_AGE],[ev_view_lt_current_minus_age]) # ***************************************************************************** +SHAVE_INIT([.], [enable]) + AC_CONFIG_FILES([ backend/Makefile backend/comics/Makefile @@ -629,6 +632,8 @@ Makefile po/Makefile.in previewer/Makefile properties/Makefile +shave +shave-libtool shell/Makefile test/Makefile thumbnailer/Makefile diff --git a/cut-n-paste/gimpcellrenderertoggle/Makefile.am b/cut-n-paste/gimpcellrenderertoggle/Makefile.am index 1f0b3dea..b88a6eb0 100644 --- a/cut-n-paste/gimpcellrenderertoggle/Makefile.am +++ b/cut-n-paste/gimpcellrenderertoggle/Makefile.am @@ -1,3 +1,5 @@ +QUIET_GEN = $(Q:@=@echo ' GEN '$@;) + noinst_LTLIBRARIES = libgimpcellrenderertoggle.la libgimpcellrenderertoggle_la_sources = \ @@ -20,12 +22,12 @@ libgimpcellrenderertoggle_la_SOURCES = \ libgimpcellrenderertoggle_la_extra_sources = gimpwidgetsmarshal.list gimpwidgetsmarshal.h: $(srcdir)/gimpwidgetsmarshal.list - $(GLIB_GENMARSHAL) --prefix=_gimp_widgets_marshal $(srcdir)/gimpwidgetsmarshal.list --header >> xgen-wmh \ + $(QUIET_GEN)$(GLIB_GENMARSHAL) --prefix=_gimp_widgets_marshal $(srcdir)/gimpwidgetsmarshal.list --header >> xgen-wmh \ && (cmp -s xgen-wmh $(@F) || cp xgen-wmh $(@F)) \ && rm -f xgen-wmh xgen-wmh~ gimpwidgetsmarshal.c: gimpwidgetsmarshal.h - echo "#include \"gimpwidgetsmarshal.h\"" >> xgen-wmc \ + $(QUIET_GEN)echo "#include \"gimpwidgetsmarshal.h\"" >> xgen-wmc \ && $(GLIB_GENMARSHAL) --prefix=_gimp_widgets_marshal $(srcdir)/gimpwidgetsmarshal.list --body >> xgen-wmc \ && cp xgen-wmc $(@F) \ && rm -f xgen-wmc xgen-wmc~ diff --git a/cut-n-paste/toolbar-editor/Makefile.am b/cut-n-paste/toolbar-editor/Makefile.am index a01c155a..fa56a49e 100644 --- a/cut-n-paste/toolbar-editor/Makefile.am +++ b/cut-n-paste/toolbar-editor/Makefile.am @@ -1,3 +1,5 @@ +QUIET_GEN = $(Q:@=@echo ' GEN '$@;) + EGGSOURCES = \ egg-editable-toolbar.c \ egg-toolbars-model.c \ @@ -44,19 +46,19 @@ stamp_files = \ eggmarshalers.h: stamp-eggmarshalers.h @true stamp-eggmarshalers.h: eggmarshalers.list - $(GLIB_GENMARSHAL) --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --header > eggmarshalers.h \ + $(QUIET_GEN)$(GLIB_GENMARSHAL) --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --header > eggmarshalers.h \ && echo timestamp > $(@F) eggmarshalers.c: stamp-eggmarshalers.c @true stamp-eggmarshalers.c: eggmarshalers.list - $(GLIB_GENMARSHAL) --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --header --body > eggmarshalers.c \ + $(QUIET_GEN)$(GLIB_GENMARSHAL) --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --header --body > eggmarshalers.c \ && echo timestamp > $(@F) eggtypebuiltins.c: stamp-eggtypebuiltins.c @true stamp-eggtypebuiltins.c: $(EGGHEADERS) - ( cd $(srcdir) && $(GLIB_MKENUMS) \ + $(QUIET_GEN)( cd $(srcdir) && $(GLIB_MKENUMS) \ --fhead "#include \n\n" \ --fhead "#include \"eggtypebuiltins.h\"\n\n" \ --fprod "\n/* enumerations from \"@filename@\" */" \ @@ -77,7 +79,7 @@ stamp-eggtypebuiltins.c: $(EGGHEADERS) eggtypebuiltins.h: stamp-eggtypebuiltins.h @true stamp-eggtypebuiltins.h: $(EGGHEADERS) - ( cd $(srcdir) && $(GLIB_MKENUMS) \ + $(QUIET_GEN)( cd $(srcdir) && $(GLIB_MKENUMS) \ --fhead "#ifndef __EGGTYPEBUILTINS_H__\n" \ --fhead "#define __EGGTYPEBUILTINS_H__ 1\n\n" \ --fhead "#include \n\n" \ diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am index e6ccb510..1597c72d 100644 --- a/libdocument/Makefile.am +++ b/libdocument/Makefile.am @@ -1,3 +1,5 @@ +QUIET_GEN = $(Q:@=@echo ' GEN '$@;) + lib_LTLIBRARIES = libevdocument.la NOINST_H_FILES = \ @@ -111,13 +113,13 @@ ev-document-type-builtins.h: stamp-ev-document-type-builtins.h @true stamp-ev-document-type-builtins.h: ev-document-type-builtins.h.template $(INST_H_FILES) - $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbh \ + $(QUIET_GEN)$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbh \ && (cmp -s xgen-etbh ev-document-type-builtins.h || cp xgen-etbh ev-document-type-builtins.h ) \ && rm -f xgen-etbh \ && echo timestamp > $(@F) ev-document-type-builtins.c: ev-document-type-builtins.c.template $(INST_H_FILES) - $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbc \ + $(QUIET_GEN)$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbc \ && (cmp -s xgen-etbc ev-document-type-builtins.c || cp xgen-etbc ev-document-type-builtins.c ) \ && rm -f xgen-etbc diff --git a/libview/Makefile.am b/libview/Makefile.am index 3a16b26b..bb563a4e 100644 --- a/libview/Makefile.am +++ b/libview/Makefile.am @@ -1,3 +1,5 @@ +QUIET_GEN = $(Q:@=@echo ' GEN '$@;) + lib_LTLIBRARIES = libevview.la NOINST_H_FILES = \ @@ -71,23 +73,23 @@ BUILT_SOURCES = \ CLEANFILES = $(BUILT_SOURCES) stamp-ev-view-type-builtins.h ev-view-marshal.h: $(srcdir)/ev-view-marshal.list - $(GLIB_GENMARSHAL) --prefix=ev_view_marshal $(srcdir)/ev-view-marshal.list --header --internal > $@ + $(QUIET_GEN)$(GLIB_GENMARSHAL) --prefix=ev_view_marshal $(srcdir)/ev-view-marshal.list --header --internal > $@ ev-view-marshal.c: $(srcdir)/ev-view-marshal.list - echo '#include ' > ev-view-marshal.c + $(QUIET_GEN)echo '#include ' > ev-view-marshal.c $(GLIB_GENMARSHAL) --prefix=ev_view_marshal $(srcdir)/ev-view-marshal.list --header --internal --body >> $@ ev-view-type-builtins.h: stamp-ev-view-type-builtins.h @true stamp-ev-view-type-builtins.h: ev-view-type-builtins.h.template $(INST_H_FILES) - $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbh \ + $(QUIET_GEN)$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbh \ && (cmp -s xgen-etbh ev-view-type-builtins.h || cp xgen-etbh ev-view-type-builtins.h ) \ && rm -f xgen-etbh \ && echo timestamp > $(@F) ev-view-type-builtins.c: ev-view-type-builtins.c.template $(INST_H_FILES) - $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbc \ + $(QUIET_GEN)$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbc \ && (cmp -s xgen-etbc ev-view-type-builtins.c || cp xgen-etbc ev-view-type-builtins.c ) \ && rm -f xgen-etbc diff --git a/m4/shave.m4 b/m4/shave.m4 new file mode 100644 index 00000000..e647e579 --- /dev/null +++ b/m4/shave.m4 @@ -0,0 +1,99 @@ +dnl Make automake/libtool output more friendly to humans +dnl +dnl Copyright (c) 2009, Damien Lespiau +dnl +dnl Permission is hereby granted, free of charge, to any person +dnl obtaining a copy of this software and associated documentation +dnl files (the "Software"), to deal in the Software without +dnl restriction, including without limitation the rights to use, +dnl copy, modify, merge, publish, distribute, sublicense, and/or sell +dnl copies of the Software, and to permit persons to whom the +dnl Software is furnished to do so, subject to the following +dnl conditions: +dnl +dnl The above copyright notice and this permission notice shall be +dnl included in all copies or substantial portions of the Software. +dnl +dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +dnl EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +dnl OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +dnl NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +dnl HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +dnl WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +dnl OTHER DEALINGS IN THE SOFTWARE. +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 00000000..54ebd690 --- /dev/null +++ b/shave-libtool.in @@ -0,0 +1,109 @@ +#!/bin/sh +# +# Copyright (c) 2009, Damien Lespiau +# +# Permission is hereby granted, free of charge, to any person +# obtaining a copy of this software and associated documentation +# files (the "Software"), to deal in the Software without +# restriction, including without limitation the rights to use, +# copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following +# conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. + +# 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= + +# have we seen the --tag option of libtool in the command line ? +tag_seen=0 + +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" + ;; + --tag=*) + tag_seen=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 + +# automake does not add a --tag switch to its libtool invocation when +# assembling a .s file and rely on libtool to infer the right action based +# on the compiler name. As shave is using CC to hook a wrapper, libtool gets +# confused. Let's detect these cases and add a --tag=CC option. +tag="" +if test $tag_seen -eq 0 -a x"$mode" = xcompile; then + tag="--tag=CC" +fi + +if test -z $V; then + if test $pass_though -eq 0; then + echo "$Q$output" + fi + $LIBTOOL --silent $tag $preserved_args +else + echo $LIBTOOL $tag $preserved_args + $LIBTOOL $tag $preserved_args +fi diff --git a/shave.in b/shave.in new file mode 100644 index 00000000..afed42e1 --- /dev/null +++ b/shave.in @@ -0,0 +1,102 @@ +#!/bin/sh +# +# Copyright (c) 2009, Damien Lespiau +# +# Permission is hereby granted, free of charge, to any person +# obtaining a copy of this software and associated documentation +# files (the "Software"), to deal in the Software without +# restriction, including without limitation the rights to use, +# copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following +# conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. + +# 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/shell/Makefile.am b/shell/Makefile.am index 737fccf5..0262c37b 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -1,3 +1,5 @@ +QUIET_GEN = $(Q:@=@echo ' GEN '$@;) + INCLUDES= \ -DDATADIR=\"$(pkgdatadir)\" \ -DGNOMEDATADIR=\"$(datadir)\" \ @@ -110,10 +112,10 @@ EXTRA_DIST = ev-marshal.list \ ev-marshal.h: $(srcdir)/ev-marshal.list - $(GLIB_GENMARSHAL) --prefix=ev_marshal $(srcdir)/ev-marshal.list --header > ev-marshal.h + $(QUIET_GEN)$(GLIB_GENMARSHAL) --prefix=ev_marshal $(srcdir)/ev-marshal.list --header > ev-marshal.h ev-marshal.c: $(srcdir)/ev-marshal.list - echo '#include "ev-marshal.h"' > ev-marshal.c + $(QUIET_GEN)echo '#include "ev-marshal.h"' > ev-marshal.c $(GLIB_GENMARSHAL) --prefix=ev_marshal $(srcdir)/ev-marshal.list --body >> ev-marshal.c DISTCLEANFILES= \ @@ -121,8 +123,8 @@ DISTCLEANFILES= \ if DBUS_TOOL_NO_PREFIX ev-application-service.h: $(srcdir)/ev-application-service.xml - dbus-binding-tool --mode=glib-server --output=ev-application-service.h $(srcdir)/ev-application-service.xml + $(QUIET_GEN)dbus-binding-tool --mode=glib-server --output=ev-application-service.h $(srcdir)/ev-application-service.xml else ev-application-service.h: $(srcdir)/ev-application-service.xml - dbus-binding-tool --prefix=ev_application --mode=glib-server --output=ev-application-service.h $(srcdir)/ev-application-service.xml + $(QUIET_GEN)dbus-binding-tool --prefix=ev_application --mode=glib-server --output=ev-application-service.h $(srcdir)/ev-application-service.xml endif -- 2.43.0