GNOME.org
 

[banshee] Use shave for prettier build output

commit c403bb4521d4e439de645ea0a90a42ba9cd2ff63
Author: Aaron Bockover <abockover novell com>
Date:   Sun May 17 18:13:58 2009 -0400

    Use shave for prettier build output
    
    This reverts a feature I wrote a while ago to make our mcs
    output nicer, and instead goes back to just calling $(MCS)
    directly.
    
    I then patched shave to support $(MCS), and the result is
    prettier/silent build output for both native and managed
    code.
    
    Additionally I've cleaned up/modernized our configure.ac a bit.
---
 .gitignore                 |    2 +
 autogen.sh                 |    2 +-
 build/build.environment.mk |    7 ------
 build/build.rules.mk       |   21 +++++++-----------
 build/m4/Makefile.am       |    6 ++++-
 configure.ac               |   50 ++++++++++++++++++++++++++++++-------------
 6 files changed, 51 insertions(+), 37 deletions(-)

diff --git a/.gitignore b/.gitignore
index 07a6d29..7eba627 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,5 @@ data/audio-profiles/*.xml
 stamp-h1
 *.userprefs
 Banshee.usertasks
+build/m4/shave/shave
+build/m4/shave/shave-libtool
diff --git a/autogen.sh b/autogen.sh
index 7a829d2..864dd7d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -66,7 +66,7 @@ check_autotool_version pkg-config 0.14.0
 
 run intltoolize --force --copy
 run $LIBTOOLIZE --force --copy --automake
-run aclocal -I build/m4/banshee -I build/m4/shamrock $ACLOCAL_FLAGS
+run aclocal -I build/m4/banshee -I build/m4/shamrock -I build/m4/shave $ACLOCAL_FLAGS
 run autoconf
 run autoheader
 test -f config.h.in && touch config.h.in
diff --git a/build/build.environment.mk b/build/build.environment.mk
index bcc3f6b..6d7d0c0 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -150,13 +150,6 @@ REF_BACKEND_HAL = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_DBUS)
 REF_BACKEND_OSX = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_IGEMACINTEGRATION)
 REF_BACKEND_BNPX11 = $(LINK_EXTENSION_NOWPLAYING_DEPS)
 
-# Build rules
-# Ignoring 0278 due to a bug in gmcs: 
-# http://bugzilla.ximian.com/show_bug.cgi?id=79998
-BUILD_FLAGS = -debug -nowarn:0278 $(ASSEMBLY_BUILD_FLAGS)
-BUILD = $(MCS) $(BUILD_FLAGS)
-BUILD_LIB = $(BUILD) -target:library
-
 # Cute hack to replace a space with something
 colon:= :
 empty:=
diff --git a/build/build.rules.mk b/build/build.rules.mk
index 2fe59e4..baaffc4 100644
--- a/build/build.rules.mk
+++ b/build/build.rules.mk
@@ -46,23 +46,18 @@ $(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
 
 $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
 	@mkdir -p $(top_builddir)/bin
-	@colors=no; \
-	case $$TERM in \
-		"xterm" | "rxvt" | "rxvt-unicode") \
-			test "x$$COLORTERM" != "x" && colors=yes ;; \
-		"xterm-color") colors=yes ;; \
-	esac; \
-	if [ "x$$colors" = "xyes" ]; then \
-		tty -s && true || { colors=no; true; } \
-	fi; \
-	test "x$$colors" = "xyes" && \
-		echo -e "\033[1mCompiling $(notdir $@)...\033[0m" || \
-		echo "Compiling $(notdir $@)...";
 	@if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
 		$(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $  config) && \
 		$(MONO) $(top_builddir)/build/dll-map-verifier.exe $(srcdir)/$(notdir $  config) -iwinmm -ilibbanshee -ilibbnpx11 -ilibc -ilibc.so.6 -iintl -ilibmtp.dll $(SOURCES_BUILD); \
 	fi;
-	@$(BUILD) $(GMCS_FLAGS) -nowarn:0078 -target:$(TARGET) -out:$@ $$warn -define:HAVE_GTK_2_10 -define:NET_2_0 $(BUILD_DEFINES) $(ENABLE_TESTS_FLAG) $(FILTERED_LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD) 
+	$(MCS) \
+		$(GMCS_FLAGS) \
+		$(ASSEMBLY_BUILD_FLAGS) \
+		-nowarn:0278 -nowarn:0078 $$warn \
+		-define:HAVE_GTK_2_10 -define:NET_2_0 \
+		-debug -target:$(TARGET) -out:$@ \
+		$(BUILD_DEFINES) $(ENABLE_TESTS_FLAG) \
+		$(FILTERED_LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD)
 	@if [ -e $(srcdir)/$(notdir $  config) ]; then \
 		cp $(srcdir)/$(notdir $  config) $(top_builddir)/bin; \
 	fi;
diff --git a/build/m4/Makefile.am b/build/m4/Makefile.am
index f885591..871df1f 100644
--- a/build/m4/Makefile.am
+++ b/build/m4/Makefile.am
@@ -1,3 +1,7 @@
-EXTRA_DIST = $(srcdir)/banshee/*.m4 $(srcdir)/shamrock/*.m4
+EXTRA_DIST = \
+	$(srcdir)/banshee/*.m4 \
+	$(srcdir)/shamrock/*.m4 \
+	$(srcdir)/shave/*.m4 \
+	$(srcdir)/shave/*.in
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/configure.ac b/configure.ac
index 9efa612..3c821b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,26 +1,42 @@
-dnl Automake setup
-AC_INIT([banshee-1], [1.5.0])
-DISPLAY_VERSION="1.5.0"
-API_VERSION="1.6"
-ASM_VERSION="$API_VERSION.0.0"
-AC_SUBST(API_VERSION)
-AC_SUBST(ASM_VERSION)
-AC_SUBST(DISPLAY_VERSION)
+m4_define([banshee_version_major], [1])
+m4_define([banshee_version_minor], [5])
+m4_define([banshee_version_micro], [0])
 
-DISTCHECK_CONFIGURE_FLAGS="--disable-docs --enable-mtp --enable-daap --enable-podcast --enable-release"
-AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
-AC_SUBST([ACLOCAL_AMFLAGS], ["-I build/m4/shamrock -I build/m4/banshee \${ACLOCAL_FLAGS}"])
+m4_define([banshee_version],
+	[banshee_version_major.banshee_version_minor.banshee_version_micro])
+
+m4_define([banshee_display_version],
+	[banshee_version])
+
+m4_define([banshee_api_version],
+	[banshee_version_major.banshee_version_minor])
+
+m4_define([banshee_asm_version],
+	[banshee_api_version.0.0])
+
+AC_PREREQ(2.52)
+AC_INIT([banshee-1],
+	[banshee_version],
+	[http://bugzilla.gnome.org/enter_bug.cgi?product=banshee])
 
-AC_PREREQ(2.13)
 AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar])
 AM_MAINTAINER_MODE
+AM_CONFIG_HEADER([config.h])
+AC_SUBST([ACLOCAL_AMFLAGS], ["-I build/m4/shamrock -I build/m4/banshee -I build/m4/shave \${ACLOCAL_FLAGS}"])
 
-dnl Pieces needed by autogen; can't be parsed from macros
-AM_CONFIG_HEADER(config.h)
 IT_PROG_INTLTOOL([0.35.0])
 AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 
+dnl How to configure for distcheck
+DISTCHECK_CONFIGURE_FLAGS="--disable-docs --enable-mtp --enable-daap --enable-podcast --enable-release"
+AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
+
+dnl Export Version Info
+AC_SUBST([API_VERSION], [banshee_api_version])
+AC_SUBST([ASM_VERSION], [banshee_asm_version])
+AC_SUBST([DISPLAY_VERSION], [banshee_display_version])
+
 dnl Expansions
 SHAMROCK_EXPAND_LIBDIR
 SHAMROCK_EXPAND_BINDIR
@@ -150,12 +166,16 @@ AC_SUBST(BUILD_HOST_OS)
 AC_SUBST(BUILD_HOST_CPU)
 AC_SUBST(BUILD_TIME)
 
+SHAVE_INIT([build/m4/shave], [enable])
+
 dnl generated files
 AC_OUTPUT([
 Makefile
 
 build/Makefile
 build/m4/Makefile
+build/m4/shave/shave
+build/m4/shave/shave-libtool
 build/pkg-config/Makefile
 
 data/Makefile
@@ -270,7 +290,7 @@ ${PACKAGE}-${VERSION}
   Video/Graphics:
     Graphics System:   ${GRAPHICS_SUBSYSTEM}
     X11 Video:         ${have_xvidmode}
-    Clutter:           ${enable_clutter} (experimental)
+    Clutter:           ${enable_clutter}
 
   Operating System/Desktop Environment:
     GNOME Support:     ${enable_gnome}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]