Hi, maybe you heard of shave [1] in the last weeks, which is a small project that tries to tame the output of autotools and make them kbuild like.
I toyed around a bit with it and thought I share the patches - The first patch is more generic and simply uses a separate macro directory m4/ (which is in anyways probably a good idea). - The second adds the actual shave support, with default being off (why: the verbose output is still useful for automated build server and the like) - The third one adds --enable-shave to ./autogen.sh arguments, so anyone checking out tracker from svn (usually devs) will get the new behaviour. Let me know what you think. Stupid idea or useful? Cheers, Michael [1] http://damien.lespiau.name/blog/2009/02/18/shave-making-the-autotools-output-sane/ -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
From 22670a271b0b6ff3a21f93f61d72683e14e693bf Mon Sep 17 00:00:00 2001 From: Michael Biebl <[email protected]> Date: Sat, 7 Mar 2009 16:27:22 +0100 Subject: [PATCH 1/3] Move m4 macros into separate m4/ directory. --- Makefile.am | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Makefile.am b/Makefile.am index e505022..b47225e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,3 +41,4 @@ install-data-hook: rm -Rf $(DESTDIR)$(datadir)/tracker/tracker-introspect.xml endif +ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 051f447..77672c7 100644 --- a/configure.ac +++ b/configure.ac @@ -36,6 +36,7 @@ AC_INIT([tracker], [tracker_version], [tracker]) AC_CONFIG_SRCDIR([src/trackerd/tracker-main.c]) +AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([no-define tar-ustar]) AM_CONFIG_HEADER(config.h) -- 1.6.2
From 578a6200d7c4b09fbe6515ea907735c1cb9f1089 Mon Sep 17 00:00:00 2001 From: Michael Biebl <[email protected]> Date: Sat, 7 Mar 2009 16:28:48 +0100 Subject: [PATCH 2/3] Add shave support (default is off) http://damien.lespiau.name/blog/2009/02/18/shave-making-the-autotools-output-sane/ --- configure.ac | 4 +++ m4/shave.m4 | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++ shave-libtool.in | 69 +++++++++++++++++++++++++++++++++++++++++++++++++ shave.in | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 222 insertions(+), 0 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 77672c7..a7e7604 100644 --- a/configure.ac +++ b/configure.ac @@ -1292,7 +1292,11 @@ AM_CONDITIONAL(OLD_DATA_REMOVE_ALL, test -n "$old_data_message") # Write generated files ################################################################## +SHAVE_INIT + AC_CONFIG_FILES([ + shave \ + shave-libtool \ data/db/Makefile data/dbus/Makefile data/icons/16x16/Makefile diff --git a/m4/shave.m4 b/m4/shave.m4 new file mode 100644 index 0000000..0c2c9f5 --- /dev/null +++ b/m4/shave.m4 @@ -0,0 +1,73 @@ +dnl Make automake/libtool output more friendly to humans +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 + 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}" + AC_SUBST(CC) + AC_SUBST(CXX) + AC_SUBST(FC) + AC_SUBST(F77) + + 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 +s...@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..174641e --- /dev/null +++ b/shave.in @@ -0,0 +1,76 @@ +#!/bin/sh + +# we need sed +s...@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 " + ;; +*,*) + # 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 -- 1.6.2
From 3d490abcf59d27c5c704e3066102a431d7d6316f Mon Sep 17 00:00:00 2001 From: Michael Biebl <[email protected]> Date: Sat, 7 Mar 2009 16:29:22 +0100 Subject: [PATCH 3/3] When running ./autogen.sh, enable shave by default. --- autogen.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/autogen.sh b/autogen.sh index 1a738c0..5b1ffe3 100755 --- a/autogen.sh +++ b/autogen.sh @@ -18,4 +18,4 @@ which gnome-autogen.sh || { echo "You need to install gnome-common from the GNOME CVS" exit 1 } -. gnome-autogen.sh +gnome-autogen.sh --enable-shave -- 1.6.2
_______________________________________________ tracker-list mailing list [email protected] http://mail.gnome.org/mailman/listinfo/tracker-list
