banshee r4695 - in trunk/banshee: . build src/Backends/Banshee.Gnome src/Core/Banshee.Core/Resources

[abock svn gnome org]

Author: abock
Date: Mon Oct 13 17:20:12 2008
New Revision: 4695
URL: http://svn.gnome.org/viewvc/banshee?rev=4695&view=rev

Log:
2008-10-13  Aaron Bockover  <abock gnome org>

    * configure.ac: Support --disable-gnome, should make building on OS X
    a lot nicer; also support --enable-release, which sets the RELEASE
    define in gmcs and also turns off -warnaserror; pass --enable-release
    when we run distcheck

    * build/build.rules.mk: Use the new GMCS_FLAGS generated by configure

    * src/Backends/Banshee.Gnome/Makefile.am:
    * build/Makefile.am: Respect GCONF_SCHEMAS_INSTALL and ENABLE_GNOME

    * src/Core/Banshee.Core/Resources/translators.xml: Updated



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/build/Makefile.am
   trunk/banshee/build/build.rules.mk
   trunk/banshee/configure.ac
   trunk/banshee/src/Backends/Banshee.Gnome/Makefile.am
   trunk/banshee/src/Core/Banshee.Core/Resources/translators.xml

Modified: trunk/banshee/build/Makefile.am
==============================================================================
--- trunk/banshee/build/Makefile.am	(original)
+++ trunk/banshee/build/Makefile.am	Mon Oct 13 17:20:12 2008
@@ -3,6 +3,7 @@
 GCONF_SCHEMA_EXTRACTOR_ASSEMBLY = gconf-schema-extractor.exe
 TRANSLATOR_EXTRACTOR_ASSEMBLY = translator-extractor.exe
 
+if GCONF_SCHEMAS_INSTALL
 bansheedir = $(pkglibdir)
 banshee_SCRIPTS = $(GCONF_SCHEMA_EXTRACTOR_ASSEMBLY)
 
@@ -10,6 +11,7 @@
 
 $(GCONF_SCHEMA_EXTRACTOR_ASSEMBLY): GConfSchemaExtractor.cs
 	$(MCS) -out:$@ $<
+endif
 
 $(TRANSLATOR_EXTRACTOR_ASSEMBLY): TranslatorExtractor.cs
 	if [ "x$(top_srcdir)" = "x$(top_builddir)" ]; then \

Modified: trunk/banshee/build/build.rules.mk
==============================================================================
--- trunk/banshee/build/build.rules.mk	(original)
+++ trunk/banshee/build/build.rules.mk	Mon Oct 13 17:20:12 2008
@@ -53,7 +53,7 @@
 	test "x$$colors" = "xyes" && \
 		echo -e "\033[1mCompiling $(notdir $@)...\033[0m" || \
 		echo "Compiling $(notdir $@)...";
-	@test "x$(DEVEL_BUILD)" = "xyes" && warn="-warnaserror"; $(BUILD) -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) 
+	@$(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) 
 	@if [ -e $(notdir $  config) ]; then \
 		cp $(notdir $  config) $(top_builddir)/bin; \
 	fi;

Modified: trunk/banshee/configure.ac
==============================================================================
--- trunk/banshee/configure.ac	(original)
+++ trunk/banshee/configure.ac	Mon Oct 13 17:20:12 2008
@@ -1,21 +1,18 @@
 dnl Automake setup
+AC_INIT([banshee-1], [1.3.3])
+ASM_DISPLAY_VERSION="1.3.3"
 
-AC_INIT([banshee-1], [1.3.2])
-ASM_DISPLAY_VERSION="1.3.2"
-DEVEL_BUILD=no
+DISTCHECK_CONFIGURE_FLAGS="--disable-docs --enable-mtp --enable-daap --enable-podcast --enable-release"
+AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
 
 AC_CANONICAL_SYSTEM
 AC_PREREQ(2.13)
 AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar])
 AM_MAINTAINER_MODE
 
-DISTCHECK_CONFIGURE_FLAGS="--disable-docs --enable-mtp --enable-daap --enable-podcast"
-AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
-
 ASM_VERSION="$VERSION.0"
 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)
@@ -30,7 +27,6 @@
 
 dnl libbanshee/native dependencies (required)
 BANSHEE_CHECK_LIBBANSHEE
-#BANSHEE_CHECK_NAUTILUS_BURN
 BANSHEE_CHECK_GSTREAMER
 
 BANSHEE_CHECK_NOW_PLAYING_X11
@@ -78,13 +74,23 @@
 
 dnl Required dependencies (managed/core)
 BANSHEE_CHECK_GTK_SHARP
-BANSHEE_CHECK_GNOME_SHARP
 
 PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.4)
 
-dnl GConf
-AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
-AM_GCONF_SOURCE_2
+dnl GNOME (optional)
+AC_ARG_ENABLE(gnome, 
+	AC_HELP_STRING([--disable-gnome], 
+		[Disable GNOME support]), 
+	, enable_gnome="yes")
+if test "x$enable_gnome" = "xyes"; then
+	BANSHEE_CHECK_GNOME_SHARP
+	AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+	AM_GCONF_SOURCE_2
+	AM_CONDITIONAL(ENABLE_GNOME, true)
+else
+	AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, false)
+	AM_CONDITIONAL(ENABLE_GNOME, false)
+fi
 
 dnl DAP support (each module is optional)
 BANSHEE_CHECK_DAP_MTP
@@ -103,9 +109,26 @@
 dnl i18n
 SHAMROCK_CONFIGURE_I18N($PACKAGE)
 
-AC_ARG_ENABLE(podcast, AC_HELP_STRING([--disable-podcast], [Disable Podcasting support]), , enable_podcast="yes")
+dnl the bird is the word
+AC_ARG_ENABLE(podcast, 
+	AC_HELP_STRING([--disable-podcast], 
+		[Disable Podcasting support]), 
+	, enable_podcast="yes")
 AM_CONDITIONAL(ENABLE_PODCAST, test "x$enable_podcast" = "xyes")
 
+AC_ARG_ENABLE(release,
+	AC_HELP_STRING([--enable-release],
+		[Use release configuration [default=NO]]),
+	enable_release=yes, enable_release=no)
+AM_CONDITIONAL(ENABLE_RELEASE, text "x$enable_release" = "xyes")
+if test "x$enable_release" = "xyes"; then
+	GMCS_FLAGS="-define:RELEASE"
+else
+	GMCS_FLAGS="-warnaserror"
+fi
+AC_SUBST(GMCS_FLAGS)
+
+
 dnl generated files
 AC_OUTPUT([
 Makefile
@@ -209,7 +232,7 @@
     Libdir:            ${expanded_libdir}
 
     C Compiler:        ${CC}
-    Mono C# Compiler:  ${MCS}
+    Mono C# Compiler:  ${MCS} ${GMCS_FLAGS}
     Mono Runtime:      ${MONO}
 
     Digital Audio Player (DAP) Support:
@@ -222,6 +245,7 @@
     Podcast Support:   ${enable_podcast}
     Boo Scripting:     ${enable_boo}
     X11 Video Support: ${have_xvidmode}
+    GNOME Support:     ${enable_gnome}
 
     Unit Tests:        ${do_tests}	(requires nunit >= ${NUNIT_REQUIRED})
 "

Modified: trunk/banshee/src/Backends/Banshee.Gnome/Makefile.am
==============================================================================
--- trunk/banshee/src/Backends/Banshee.Gnome/Makefile.am	(original)
+++ trunk/banshee/src/Backends/Banshee.Gnome/Makefile.am	Mon Oct 13 17:20:12 2008
@@ -15,5 +15,9 @@
 	Banshee.Gnome.addin.xml \
 	Resources/GlobalUI.xml
 
+if ENABLE_GNOME
 include $(top_srcdir)/build/build.mk
+else
+EXTRA_DIST = $(SOURCES) $(RESOURCES)
+endif
 

Modified: trunk/banshee/src/Core/Banshee.Core/Resources/translators.xml
==============================================================================
--- trunk/banshee/src/Core/Banshee.Core/Resources/translators.xml	(original)
+++ trunk/banshee/src/Core/Banshee.Core/Resources/translators.xml	Mon Oct 13 17:20:12 2008
@@ -144,7 +144,7 @@
     <person>Clytie Siddall</person>
   </language>
   <language code="zh_CN" name="Simplified Chinese">
-    <person>çé(Lu Gan)</person>
+    <person>çé(Gan Lu)</person>
   </language>
   <language code="zh_HK" name="Chinese">
     <person>Hsin-lin Cheng</person>