summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Dahlin <jdahlin@litl.com>2009-02-20 23:32:26 -0300
committerJohan Dahlin <johan@gnome.org>2009-02-20 23:32:26 -0300
commitb877e24ced1a2c699e1aa9d37a998e0340d3b3f0 (patch)
tree85e58d3e06037fc8db9bbcbcefdd1914555e6c1d
parent1f024a1a2894448d37e91feb0b5a047f9ce55a96 (diff)
downloadgobject-introspection-b877e24ced1a2c699e1aa9d37a998e0340d3b3f0.tar.gz
Use shave to reduce compiling output
Which let's us focus on the important warnings.
-rw-r--r--.gitignore2
-rw-r--r--configure.ac4
-rw-r--r--gir/Makefile.am10
-rw-r--r--giscanner/dumper.py6
-rw-r--r--m4/shave.m440
-rw-r--r--scripts/shave-libtool.in70
-rw-r--r--scripts/shave.in70
-rw-r--r--tests/everything/Makefile.am2
-rw-r--r--tests/offsets/Makefile.am2
-rw-r--r--tests/scanner/Makefile.am12
10 files changed, 203 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore
index 2b98c866..dbc2d61f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,6 +61,8 @@ m4/ltoptions.m4
m4/ltsugar.m4
m4/ltversion.m4
m4/lt~obsolete.m4
+scripts/shave
+scripts/shave-libtool
tests/everything/Everything-1.0.gir
tests/everything/Everything-1.0.tgir
tests/everything/Everything-1.0.typelib
diff --git a/configure.ac b/configure.ac
index 2996286d..c81b00ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,6 +46,7 @@ if test "$YACC" = :; then
AC_MSG_ERROR([bison not found but required])
fi
+
changequote(,)dnl
ensureflag() {
flag="$1"; shift
@@ -190,6 +191,7 @@ case "$host" in
esac
AM_CHECK_PYTHON_HEADERS(,AC_MSG_ERROR([Python headers not found]))
+SHAVE_INIT([scripts])
AC_CONFIG_FILES([
Makefile
gir/Makefile
@@ -197,6 +199,8 @@ girepository/Makefile
giscanner/Makefile
giscanner/config.py
m4/Makefile
+scripts/shave
+scripts/shave-libtool
tools/Makefile
tests/Makefile
tests/invoke/Makefile
diff --git a/gir/Makefile.am b/gir/Makefile.am
index f2dee100..00e3acc4 100644
--- a/gir/Makefile.am
+++ b/gir/Makefile.am
@@ -31,7 +31,7 @@ GLib-2.0.gir: $(SCANNER_BIN) $(SCANNER_LIBS) Makefile glib-2.0.c
--noclosure \
--output $@ \
--strip-prefix=g \
- --libtool="$(LIBTOOL)" \
+ --libtool="$(SHAVE_SAVED_LIBTOOL)" \
--c-include="glib.h" \
--library=$(GLIB_LIBRARY) \
--pkg glib-2.0 \
@@ -64,7 +64,7 @@ GObject-2.0.gir: GLib-2.0.gir $(SCANNER_BIN) $(SCANNER_LIBS) Makefile
--noclosure \
--output $@ \
--strip-prefix=g \
- --libtool="$(LIBTOOL)" \
+ --libtool="$(SHAVE_SAVED_LIBTOOL)" \
--c-include="glib-object.h" \
--include=GLib-2.0 \
--library=$(GOBJECT_LIBRARY) \
@@ -94,7 +94,7 @@ GModule-2.0.gir: GLib-2.0.gir $(SCANNER_BIN) $(SCANNER_LIBS)
--noclosure \
--output $@ \
--strip-prefix=g \
- --libtool="$(LIBTOOL)" \
+ --libtool="$(SHAVE_SAVED_LIBTOOL)" \
--c-include="gmodule.h" \
--include=GLib-2.0 \
--library=$(GMODULE_LIBRARY) \
@@ -127,7 +127,7 @@ Gio-2.0.gir: GObject-2.0.gir $(SCANNER_BIN) $(SCANNER_LIBS) Makefile $(srcdir)/g
--noclosure \
--output $@ \
--strip-prefix=g \
- --libtool="$(LIBTOOL)" \
+ --libtool="$(SHAVE_SAVED_LIBTOOL)" \
--c-include="gio/gio.h" \
--include=GObject-2.0 \
--library=$(GIO_LIBRARY) \
@@ -152,7 +152,7 @@ GIRepository-2.0.gir: GObject-2.0.gir $(SCANNER_BIN) $(SCANNER_LIBS) $(GIREPOSIT
--noclosure \
--output $@ \
--strip-prefix=g \
- --libtool="$(LIBTOOL)" \
+ --libtool="$(SHAVE_SAVED_LIBTOOL)" \
--c-include="girepository.h" \
--include=GObject-2.0 \
--library=girepository-1.0 \
diff --git a/giscanner/dumper.py b/giscanner/dumper.py
index e487c125..c0a895d0 100644
--- a/giscanner/dumper.py
+++ b/giscanner/dumper.py
@@ -147,12 +147,13 @@ class DumpCompiler(object):
if not libtool_infection:
return None
- if self._options.libtool_path:
+ libtool_path = self._options.libtool_path
+ if libtool_path:
# Automake by default sets:
# LIBTOOL = $(SHELL) $(top_builddir)/libtool
# To be strictly correct we would have to parse shell. For now
# we simply split().
- return self._options.libtool_path.split()
+ return libtool_path.split(' ')
try:
subprocess.check_call(['libtool', '--version'])
@@ -188,6 +189,7 @@ class DumpCompiler(object):
args.extend(libtool)
args.append('--mode=link')
args.append('--tag=CC')
+ args.append('--silent')
args.extend([self._linker_cmd, '-o', output])
diff --git a/m4/shave.m4 b/m4/shave.m4
new file mode 100644
index 00000000..5b1f6756
--- /dev/null
+++ b/m4/shave.m4
@@ -0,0 +1,40 @@
+dnl Make automake/libtool output more friendly to humans
+dnl
+dnl SHAVE_INIT([shavedir])
+dnl
+dnl shavedir: the directory where the shave script is, it defaults to
+dnl $(top_builddir)
+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 rewrite 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_INIT], [
+dnl where can we find the shave scripts?
+m4_if([$1],,
+ [shavedir='$(top_builddir)'],
+ [shavedir='$(top_builddir)'/$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
+AC_SUBST(SHAVE_SAVED_LIBTOOL)
+LIBTOOL="\$(SHELL) \$(shavedir)/shave-libtool '\$(SHAVE_SAVED_LIBTOOL)'"
+AC_SUBST(LIBTOOL)
+dnl substitute cc
+SHAVE_SAVED_CC=$CC
+SHAVE_SAVED_CXX=$CXX
+AC_SUBST(SHAVE_SAVED_CC)
+AC_SUBST(SHAVE_SAVED_CXX)
+CC="\$(SHELL) \$(shavedir)/shave cc '\$(SHAVE_SAVED_CC)'"
+CXX="\$(SHELL) \$(shavedir)/shave cxx '\$(SHAVE_SAVED_CXX)'"
+AC_SUBST(CC)
+AC_SUBST(CXX)
+])
+
diff --git a/scripts/shave-libtool.in b/scripts/shave-libtool.in
new file mode 100644
index 00000000..02de5ade
--- /dev/null
+++ b/scripts/shave-libtool.in
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# we need sed
+SED=@SED@
+if test -z "$SED" ; then
+SED=sed
+fi
+Xsed="$SED -e s/^X//"
+
+lt_unmangle ()
+{
+ last_result=`echo -n X$1 | $Xsed -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 "X$opt" | $Xsed -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/scripts/shave.in b/scripts/shave.in
new file mode 100644
index 00000000..487596e3
--- /dev/null
+++ b/scripts/shave.in
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# we need sed
+SED=@SED@
+if test -z "$SED" ; then
+SED=sed
+fi
+Xsed="$SED -e s/^X//"
+
+lt_unmangle ()
+{
+ last_result=`echo -n X$1 | $Xsed -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 "X$opt" | $Xsed -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
+ ;;
+compile,cxx)
+ Q=" CXX "
+ ;;
+compile,cc|*,*)
+ # no "libtool" mode has been given, we are called by the Makefile:
+ # -> assume compilation
+ mode=compile
+ 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/tests/everything/Makefile.am b/tests/everything/Makefile.am
index adda3224..5632fedf 100644
--- a/tests/everything/Makefile.am
+++ b/tests/everything/Makefile.am
@@ -33,7 +33,7 @@ BUILT_SOURCES = $(TYPELIBS) $(TXMLS) $(GIRS)
Everything-$(TYPELIB_VERSION).gir: libgirepository-everything-1.0.la everything.c everything.h $(SCANNER_BIN) $(SCANNER_LIBS)
$(CHECK_DEBUG) $(SCANNER) \
--include=GObject-2.0 \
- --libtool="$(LIBTOOL)" \
+ --libtool="$(SHAVE_SAVED_LIBTOOL)" \
--library=girepository-everything-1.0 \
--namespace=Everything --nsversion=$(TYPELIB_VERSION) \
--pkg gobject-2.0 \
diff --git a/tests/offsets/Makefile.am b/tests/offsets/Makefile.am
index 400d32a7..75dba3cb 100644
--- a/tests/offsets/Makefile.am
+++ b/tests/offsets/Makefile.am
@@ -21,7 +21,7 @@ liboffsets_la_LDFLAGS = -avoid-version -rpath $(libdir)
offsets-1.0.gir: liboffsets.la offsets.h $(SCANNER_BIN) $(SCANNER_LIBS) Makefile
$(CHECK_DEBUG) $(SCANNER) \
--include=GObject-2.0 \
- --libtool="$(LIBTOOL)" \
+ --libtool="$(SHAVE_SAVED_LIBTOOL)" \
--library=offsets \
--namespace=offsets \
--nsversion=1.0 \
diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am
index e3c03932..4ec15f84 100644
--- a/tests/scanner/Makefile.am
+++ b/tests/scanner/Makefile.am
@@ -42,7 +42,7 @@ annotation-1.0.gir: libannotation.la annotation.c annotation.h utility-1.0.gir $
$(CHECK_DEBUG) $(SCANNER) \
--include=GObject-2.0 \
--include=utility-1.0 \
- --libtool="$(LIBTOOL)" \
+ --libtool="$(SHAVE_SAVED_LIBTOOL)" \
--library=annotation \
--namespace=annotation \
--nsversion=1.0 \
@@ -55,7 +55,7 @@ drawable-1.0.gir: libdrawable.la drawable.c drawable.h utility-1.0.gir $(SCANNER
$(CHECK_DEBUG) $(SCANNER) \
--include=GObject-2.0 \
--include=utility-1.0 \
- --libtool="$(LIBTOOL)" \
+ --libtool="$(SHAVE_SAVED_LIBTOOL)" \
--library=drawable \
--namespace=drawable \
--nsversion=1.0 \
@@ -69,7 +69,7 @@ foo-1.0.gir: libfoo.la foo.c foo.h utility-1.0.gir $(SCANNER_BIN) $(SCANNER_LIBS
--include=GObject-2.0 \
--include=utility-1.0 \
--c-include="foo.h" \
- --libtool="$(LIBTOOL)" \
+ --libtool="$(SHAVE_SAVED_LIBTOOL)" \
--library=foo \
--namespace=foo \
--nsversion=1.0 \
@@ -81,7 +81,7 @@ GIRS += foo-1.0.gir
utility-1.0.gir: libutility.la utility.h $(SCANNER_BIN) $(SCANNER_LIBS) Makefile
$(CHECK_DEBUG) $(SCANNER) \
--include=GObject-2.0 \
- --libtool="$(LIBTOOL)" \
+ --libtool="$(SHAVE_SAVED_LIBTOOL)" \
--library=utility \
--namespace=utility \
--nsversion=1.0 \
@@ -94,7 +94,7 @@ GIRS += utility-1.0.gir
GtkFrob-1.0.gir: libgtkfrob.la gtkfrob.h $(SCANNER_BIN) $(SCANNER_LIBS) Makefile
$(CHECK_DEBUG) $(SCANNER) \
--include=GObject-2.0 \
- --libtool="$(LIBTOOL)" \
+ --libtool="$(SHAVE_SAVED_LIBTOOL)" \
--library=gtkfrob \
--namespace=GtkFrob \
--strip-prefix=Gtk \
@@ -112,7 +112,7 @@ barapp_LDFLAGS = -export-dynamic
BarApp-1.0.gir: barapp $(SCANNER_BIN) $(SCANNER_LIBS) Makefile
LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}:$(top_builddir)/girepository/.libs $(SCANNER) \
--include=GObject-2.0 \
- --libtool="$(LIBTOOL)" \
+ --libtool="$(SHAVE_SAVED_LIBTOOL)" \
--program=./barapp \
--namespace=BarApp \
--strip-prefix=Bar \