banshee r3739 - in trunk/banshee: . build build/m4/banshee data/icon-theme-hicolor

[abock svn gnome org]

Author: abock
Date: Thu Apr 10 00:08:43 2008
New Revision: 3739
URL: http://svn.gnome.org/viewvc/banshee?rev=3739&view=rev

Log:
2008-04-09  Aaron Bockover  <abock gnome org>

    * configure.ac:
    * build/build.rules.mk: Added a DEVEL_BUILD variable - if set, compiler
    warnings will be treated as errors. We'll always keep it on except for
    when we distcheck for a release

    * build/m4/banshee/gtk-sharp.m4: Require Gtk# 2.10

    * data/icon-theme-hicolor/Makefile.am: Copy the app icons to the local
    uninstalled icon theme



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/build/build.rules.mk
   trunk/banshee/build/m4/banshee/gtk-sharp.m4
   trunk/banshee/configure.ac
   trunk/banshee/data/icon-theme-hicolor/Makefile.am

Modified: trunk/banshee/build/build.rules.mk
==============================================================================
--- trunk/banshee/build/build.rules.mk	(original)
+++ trunk/banshee/build/build.rules.mk	Thu Apr 10 00:08:43 2008
@@ -46,7 +46,7 @@
 	test "x$$colors" = "xyes" && \
 		echo -e "\033[1mCompiling $(notdir $@)...\033[0m" || \
 		echo "Compiling $(notdir $@)...";
-	@test "x$(HAVE_MONO_1_2_4)" = "xyes" && warn="-warnaserror"; test "x$(HAVE_GTK_2_10)" = "xyes" && gtk_210="-define:HAVE_GTK_2_10"; $(BUILD) -target:$(TARGET) -out:$@ $$warn $$gtk_210 $(FILTERED_LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD) 
+	@test "x$(DEVEL_BUILD)" = "xyes" && warn="-warnaserror"; $(BUILD) -target:$(TARGET) -out:$@ $$warn -define:HAVE_GTK_2_10 $(FILTERED_LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD) 
 	@if [ -e $(notdir $  config) ]; then \
 		cp $(notdir $  config) $(top_builddir)/bin; \
 	fi;
@@ -60,7 +60,7 @@
 uninstall-local: $(THEME_ICONS_SOURCE)
 	@$(INSTALL_ICONS) -u "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
 
-EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) $(CONFIG_FILES_IN)
+EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE)
 
 CLEANFILES = $(OUTPUT_FILES)
 DISTCLEANFILES = *.pidb

Modified: trunk/banshee/build/m4/banshee/gtk-sharp.m4
==============================================================================
--- trunk/banshee/build/m4/banshee/gtk-sharp.m4	(original)
+++ trunk/banshee/build/m4/banshee/gtk-sharp.m4	Thu Apr 10 00:08:43 2008
@@ -1,6 +1,6 @@
 AC_DEFUN([BANSHEE_CHECK_GTK_SHARP],
 [
-	GTKSHARP_REQUIRED=2.8
+	GTKSHARP_REQUIRED=2.10
 
 	PKG_CHECK_MODULES(GTKSHARP,
 		gtk-sharp-2.0 >= $GTKSHARP_REQUIRED \
@@ -11,10 +11,6 @@
 		glib-sharp-2.0 >= $GTKSHARP_REQUIRED)
 	AC_SUBST(GLIBSHARP_LIBS)
 
-	PKG_CHECK_MODULES(GTKSHARP_VERSION, gtk-sharp-2.0 >= 2.10, 
-        HAVE_GTK_2_10=yes, HAVE_GTK_2_10=no)
-	AC_SUBST(HAVE_GTK_2_10)
-
 	PKG_CHECK_MODULES(GCONFSHARP,
 		gconf-sharp-2.0 >= $GTKSHARP_REQUIRED)
 	AC_SUBST(GCONFSHARP_LIBS)

Modified: trunk/banshee/configure.ac
==============================================================================
--- trunk/banshee/configure.ac	(original)
+++ trunk/banshee/configure.ac	Thu Apr 10 00:08:43 2008
@@ -4,6 +4,7 @@
 # 0.99.* = Beta *
 AC_INIT([banshee-1], [0.98.3]) 
 ASM_DISPLAY_VERSION="1.0 Alpha 3"
+DEVEL_BUILD=yes
 
 AC_CANONICAL_SYSTEM
 AC_PREREQ(2.13)
@@ -16,6 +17,7 @@
 ASM_VERSION="$VERSION.*"
 AC_SUBST(ASM_VERSION)
 AC_SUBST(ASM_DISPLAY_VERSION)
+AC_SUBST(DEVEL_BUILD)
 
 dnl Pieces needed by autogen; can't be parsed from macros
 AM_CONFIG_HEADER(config.h)
@@ -34,7 +36,6 @@
 BANSHEE_CHECK_GSTREAMER
 
 dnl Mono and gmcs
-SHAMROCK_CHECK_MONO_MODULE_NOBAIL(1.2.4)
 SHAMROCK_CHECK_MONO_MODULE(1.2.2)
 SHAMROCK_FIND_MONO_2_0_COMPILER
 SHAMROCK_FIND_MONO_RUNTIME
@@ -48,9 +49,6 @@
 	ICSharpCode.SharpZipLib
 ])
 
-HAVE_MONO_1_2_4=$HAVE_MONO_MODULE
-AC_SUBST(HAVE_MONO_1_2_4)
-
 dnl NDesk DBus libraries
 BANSHEE_CHECK_NDESK_DBUS
 
@@ -178,8 +176,6 @@
     C Compiler:        ${CC}
     Mono C# Compiler:  ${MCS}
     Mono Runtime:      ${MONO}
-    Mono >= 1.2.4:     ${HAVE_MONO_1_2_4}
-    Gtk# >= 2.10:      ${HAVE_GTK_2_10}
 
     Digital Audio Player (DAP) Support:
       Mass Storage:    yes	(unstable)

Modified: trunk/banshee/data/icon-theme-hicolor/Makefile.am
==============================================================================
--- trunk/banshee/data/icon-theme-hicolor/Makefile.am	(original)
+++ trunk/banshee/data/icon-theme-hicolor/Makefile.am	Thu Apr 10 00:08:43 2008
@@ -8,6 +8,16 @@
 	apps,media-player-banshee-48.png \
 	apps,media-player-banshee-192.png
 
+all:
+	(for icon_desc in $(theme_icons); do \
+		category=$$(echo $$icon_desc | cut -f1 -d,); \
+		src_file="$(srcdir)/$$(echo $$icon_desc | cut -f2 -d,)"; \
+		dest_file=$$(echo $$src_file | sed -r 's,\-[0-9]+,,'); \
+		size=$$(echo $$src_file | sed 's,[^0-9],,g'); \
+		dest_dir="$(top_builddir)/bin/share/$(PACKAGE)/icons/hicolor/$${size}x$${size}/$${category}"; \
+		mkdir -p "$${dest_dir}" && cp -f "$${src_file}" "$${dest_dir}/$${dest_file}"; \
+	done;) &>/dev/null || true
+
 install_icon_exec = $(top_srcdir)/build/icon-theme-installer \
 	-t "$(theme)" \
 	-s "$(srcdir)" \