GNOME.org
 

rygel r638 - in trunk: . src/plugins/dvb src/plugins/test src/plugins/tracker src/rygel

Author: zeeshanak
Date: Sat Feb 21 17:52:24 2009
New Revision: 638
URL: http://svn.gnome.org/viewvc/rygel?rev=638&view=rev

Log:
Use shave to get a linux kernel like build output.

Added:
   trunk/acinclude.m4
   trunk/shave-libtool.in
   trunk/shave.in
Modified:
   trunk/configure.ac
   trunk/src/plugins/dvb/Makefile.am
   trunk/src/plugins/test/Makefile.am
   trunk/src/plugins/tracker/Makefile.am
   trunk/src/rygel/Makefile.am

Added: trunk/acinclude.m4
==============================================================================
--- (empty file)
+++ trunk/acinclude.m4	Sat Feb 21 17:52:24 2009
@@ -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)
+])
+

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Feb 21 17:52:24 2009
@@ -137,7 +137,11 @@
 AM_GLIB_GNU_GETTEXT
 AM_GLIB_DEFINE_LOCALEDIR([LOCALEDIR])
 
+SHAVE_INIT
+
 AC_OUTPUT([
+shave
+shave-libtool
 Makefile
 src/Makefile
 src/rygel/Makefile

Added: trunk/shave-libtool.in
==============================================================================
--- (empty file)
+++ trunk/shave-libtool.in	Sat Feb 21 17:52:24 2009
@@ -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

Added: trunk/shave.in
==============================================================================
--- (empty file)
+++ trunk/shave.in	Sat Feb 21 17:52:24 2009
@@ -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

Modified: trunk/src/plugins/dvb/Makefile.am
==============================================================================
--- trunk/src/plugins/dvb/Makefile.am	(original)
+++ trunk/src/plugins/dvb/Makefile.am	Sat Feb 21 17:52:24 2009
@@ -1,3 +1,7 @@
+V         = @
+Q         = $(V:1=)
+QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
+
 plugindir = $(libdir)/rygel-1.0
 
 plugin_LTLIBRARIES = librygel-dvb.la
@@ -38,7 +42,7 @@
                           rygel-dvb-plugin.vala
 
 rygel-dvb.stamp: $(filter %.vala,$(librygel_dvb_la_SOURCES))
-	$(VALAC) -C --vapidir=$(top_srcdir)/src/rygel \
+	$(QUIET_GEN) $(VALAC) -C --vapidir=$(top_srcdir)/src/rygel \
 	--pkg rygel-1.0 --pkg cstuff --pkg gupnp-1.0 --pkg gupnp-av-1.0 \
 	--pkg dbus-glib-1 --pkg gee-1.0 --pkg gstreamer-0.10 $^
 	touch $@

Modified: trunk/src/plugins/test/Makefile.am
==============================================================================
--- trunk/src/plugins/test/Makefile.am	(original)
+++ trunk/src/plugins/test/Makefile.am	Sat Feb 21 17:52:24 2009
@@ -1,3 +1,7 @@
+V         = @
+Q         = $(V:1=)
+QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
+
 plugindir = $(libdir)/rygel-1.0
 
 plugin_LTLIBRARIES = librygel-test.la
@@ -43,7 +47,7 @@
                            rygel-test-plugin.vala
 
 rygel-test.stamp: $(filter %.vala,$(librygel_test_la_SOURCES))
-	$(VALAC) -C --vapidir=$(top_srcdir)/src/rygel \
+	$(QUIET_GEN) $(VALAC) -C --vapidir=$(top_srcdir)/src/rygel \
 	--pkg rygel-1.0 --pkg cstuff \
 	--pkg gupnp-1.0 --pkg gupnp-av-1.0 \
         --pkg dbus-glib-1 --pkg gee-1.0 --pkg gstreamer-0.10 $^

Modified: trunk/src/plugins/tracker/Makefile.am
==============================================================================
--- trunk/src/plugins/tracker/Makefile.am	(original)
+++ trunk/src/plugins/tracker/Makefile.am	Sat Feb 21 17:52:24 2009
@@ -1,3 +1,7 @@
+V         = @
+Q         = $(V:1=)
+QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
+
 plugindir = $(libdir)/rygel-1.0
 
 plugin_LTLIBRARIES = librygel-media-tracker.la
@@ -78,7 +82,7 @@
 				    rygel-tracker-plugin.vala
 
 rygel-media-tracker.stamp: $(filter %.vala,$(librygel_media_tracker_la_SOURCES))
-	$(VALAC) -C --vapidir=$(top_srcdir)/src/rygel \
+	$(QUIET_GEN) $(VALAC) -C --vapidir=$(top_srcdir)/src/rygel \
 	--pkg rygel-1.0 --pkg cstuff \
 	--pkg gupnp-1.0 --pkg gupnp-av-1.0 \
         --pkg dbus-glib-1 --pkg gee-1.0 --pkg gstreamer-0.10 $^

Modified: trunk/src/rygel/Makefile.am
==============================================================================
--- trunk/src/rygel/Makefile.am	(original)
+++ trunk/src/rygel/Makefile.am	Sat Feb 21 17:52:24 2009
@@ -1,3 +1,7 @@
+V         = @
+Q         = $(V:1=)
+QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
+
 if UNINSTALLED
 shareddir = $(abs_top_builddir)/data
 else
@@ -122,7 +126,7 @@
 		rygel-media-item.h
 
 rygel.stamp: $(filter %.vala,$(rygel_SOURCES))
-	$(VALAC) -C --vapidir=$(srcdir) \
+	$(QUIET_GEN) $(VALAC) -C --vapidir=$(srcdir) \
 	--pkg cstuff --pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg dbus-glib-1 \
 	--pkg gconf-2.0 --pkg gstreamer-0.10 --pkg gio-2.0 --pkg gee-1.0 $^
 	touch $@
@@ -158,7 +162,7 @@
 		    rygel-didl-lite-writer.vala
 
 rygel-1.0.vapi: $(VAPI_SOURCE_FILES)
-	$(VALAC) -C --library=rygel-1.0 \
+	$(QUIET_GEN) $(VALAC) -C --library=rygel-1.0 \
 	--pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg gee-1.0 --pkg gstreamer-0.10 \
 	$^
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]