GNOME.org
 

[banshee] build: Bump mono dependency to 3.2.8

commit c2b506e239efbd5e11cbecf77036558016f3785a
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date:   Sat May 9 16:39:36 2015 +0200

    build: Bump mono dependency to 3.2.8
    
    Mono 3.2.8 was released way back in February 2014, and is now available
    in most current distros.
    
    As a first step, this allows us to just use the unified "mcs" compiler,
    which simplifies our configure-time checks.

 README                                             |    2 +-
 build/build.rules.mk                               |    2 +-
 build/m4/shamrock/mono.m4                          |   26 +-------------------
 configure.ac                                       |   17 +++++-------
 extras/create-release-notes                        |    2 +-
 src/Backends/Banshee.Gio/Makefile.am               |    2 +-
 .../Banshee.NotificationArea/Makefile.am           |    2 +-
 src/Extensions/Banshee.SoundMenu/Makefile.am       |    2 +-
 src/Extensions/Banshee.YouTube/Makefile.am         |    2 +-
 src/Hyena                                          |    2 +-
 src/Libraries/Lastfm/Makefile.am                   |    2 +-
 11 files changed, 17 insertions(+), 44 deletions(-)
---
diff --git a/README b/README
index 3cb69d8..329f109 100644
--- a/README
+++ b/README
@@ -22,7 +22,7 @@ on various operating systems/distros.  The listed versions are the minimum
 acceptable; higher versions are fine.
 
 - Required
-  * Mono                2.8.2
+  * Mono                3.2.8
   * SQlite              3.4
   * GStreamerSharp      0.99.0
   * GStreamer           1.0.0
diff --git a/build/build.rules.mk b/build/build.rules.mk
index 48acbed..1066de3 100644
--- a/build/build.rules.mk
+++ b/build/build.rules.mk
@@ -39,7 +39,7 @@ $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK) $(DLL_MAP_V
                $(MONO) $(top_builddir)/build/dll-map-verifier.exe $(srcdir)/$(notdir $  config) -iwinmm 
-ilibbanshee -ilibbnpx11 -ilibc -ilibc.so.6 -iintl -ilibmtp.dll -ilibgtkmacintegration.dylib -iCFRelease 
$(SOURCES_BUILD); \
        fi;
        $(MCS) \
-               $(GMCS_FLAGS) \
+               $(MCS_FLAGS) \
                $(ASSEMBLY_BUILD_FLAGS) \
                $$warn \
                -debug -target:$(TARGET) -out:$@ \
diff --git a/build/m4/shamrock/mono.m4 b/build/m4/shamrock/mono.m4
index 1338a39..2ab57c8 100644
--- a/build/m4/shamrock/mono.m4
+++ b/build/m4/shamrock/mono.m4
@@ -1,32 +1,8 @@
-AC_DEFUN([SHAMROCK_FIND_MONO_1_0_COMPILER],
+AC_DEFUN([SHAMROCK_FIND_MONO_COMPILER],
 [
        SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, mcs)
 ])
 
-AC_DEFUN([SHAMROCK_FIND_MONO_2_0_COMPILER],
-[
-       SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, gmcs)
-])
-
-AC_DEFUN([SHAMROCK_FIND_MONO_2_0_COMPILER_OR_HIGHER],
-[
-       if pkg-config --atleast-version=2.8 mono; then
-               SHAMROCK_FIND_PROGRAM(MCS, dmcs)
-       fi
-       if test "x$MCS" = "x" ; then
-               SHAMROCK_FIND_PROGRAM(MCS, gmcs)
-       fi
-
-       if test "x$MCS" = "x" ; then
-               AC_MSG_ERROR([You need to install 'gmcs'])
-       fi
-])
-
-AC_DEFUN([SHAMROCK_FIND_MONO_4_0_COMPILER],
-[
-       SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, dmcs)
-])
-
 AC_DEFUN([SHAMROCK_FIND_MONO_RUNTIME],
 [
        SHAMROCK_FIND_PROGRAM_OR_BAIL(MONO, mono)
diff --git a/configure.ac b/configure.ac
index 85561a2..5445980 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,9 +56,9 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.22)
 dnl User help
 SHAMROCK_CHECK_GNOME_DOC_UTILS(0.17.3)
 
-dnl Mono and gmcs
-SHAMROCK_CHECK_MONO_MODULE(2.8.2)
-SHAMROCK_FIND_MONO_2_0_COMPILER_OR_HIGHER
+dnl Mono and mcs
+SHAMROCK_CHECK_MONO_MODULE(3.2.8)
+SHAMROCK_FIND_MONO_COMPILER
 SHAMROCK_FIND_MONO_RUNTIME
 SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([
        Mono.Posix
@@ -161,16 +161,13 @@ AM_CONDITIONAL(ENABLE_RELEASE, test "x$enable_release" = "xyes")
 ENABLE_RELEASE=$enable_release
 AC_SUBST(ENABLE_RELEASE)
 if test "x$enable_release" = "xyes"; then
-       GMCS_FLAGS="-define:RELEASE"
+       MCS_FLAGS="-define:RELEASE"
 else
-       GMCS_FLAGS=""
+       MCS_FLAGS=""
 fi
 #FIXME: add "-warnaserror" back above!
 
-#TODO: for simplicity, just remove langversion and use .NET 4.0 moving forward
-GMCS_FLAGS="$GMC_FLAGS -langversion:3"
-
-AC_SUBST(GMCS_FLAGS)
+AC_SUBST(MCS_FLAGS)
 
 AM_CONDITIONAL(HYENA_PKG_CONFIG, false)
 
@@ -332,7 +329,7 @@ ${PACKAGE}-${VERSION}
     Libdir:                ${expanded_libdir}
 
     C Compiler:            ${CC}
-    Mono C# Compiler:      ${MCS} ${GMCS_FLAGS}
+    Mono C# Compiler:      ${MCS} ${MCS_FLAGS}
     Mono Runtime:          ${MONO}
     Gtk#:                  ${gtk_sharp_version}
 
diff --git a/extras/create-release-notes b/extras/create-release-notes
index ff8ccee..66dbf63 100755
--- a/extras/create-release-notes
+++ b/extras/create-release-notes
@@ -70,7 +70,7 @@ $features
 </ul>
 <h3>Dependencies</h3>
 <ul>
-       <li>Mono 2.8.2 (.NET 2.0 Profile / gmcs)</li>
+       <li>Mono 3.2.8</li>
        <li>SQlite 3.4</li>
        <li>Gtk# 2.99.1</li>
        <li>GStreamer 1.0.0</li>
diff --git a/src/Backends/Banshee.Gio/Makefile.am b/src/Backends/Banshee.Gio/Makefile.am
index f1800f5..692555f 100644
--- a/src/Backends/Banshee.Gio/Makefile.am
+++ b/src/Backends/Banshee.Gio/Makefile.am
@@ -4,7 +4,7 @@ LINK = $(REF_BACKEND_GIO)
 INSTALL_DIR = $(BACKENDS_INSTALL_DIR)
 
 if ENABLE_GIO_HARDWARE
-GMCS_FLAGS += "-define:ENABLE_GIO_HARDWARE"
+MCS_FLAGS += "-define:ENABLE_GIO_HARDWARE"
 endif
 
 SOURCES =  \
diff --git a/src/Extensions/Banshee.NotificationArea/Makefile.am 
b/src/Extensions/Banshee.NotificationArea/Makefile.am
index 5c64a80..ff06a66 100644
--- a/src/Extensions/Banshee.NotificationArea/Makefile.am
+++ b/src/Extensions/Banshee.NotificationArea/Makefile.am
@@ -1,7 +1,7 @@
 if EXTERNAL_NOTIFY_SHARP
 NOTIFY_SHARP_LIBS = $(NOTIFY_SHARP_LIBS)
 else
-GMCS_FLAGS+="-define:INTERNAL_NOTIFY_SHARP"
+MCS_FLAGS+="-define:INTERNAL_NOTIFY_SHARP"
 NOTIFY_SHARP_LIBS = 
 endif
 
diff --git a/src/Extensions/Banshee.SoundMenu/Makefile.am b/src/Extensions/Banshee.SoundMenu/Makefile.am
index 64f899c..b8124a0 100644
--- a/src/Extensions/Banshee.SoundMenu/Makefile.am
+++ b/src/Extensions/Banshee.SoundMenu/Makefile.am
@@ -1,7 +1,7 @@
 if EXTERNAL_NOTIFY_SHARP
 REF_NOTIFY_SHARP_LIBS = $(NOTIFY_SHARP_LIBS)
 else
-GMCS_FLAGS+="-define:INTERNAL_NOTIFY_SHARP"
+MCS_FLAGS+="-define:INTERNAL_NOTIFY_SHARP"
 REF_NOTIFY_SHARP_LIBS = $(LINK_EXTENSION_NOTIFICATIONAREA)
 endif
 
diff --git a/src/Extensions/Banshee.YouTube/Makefile.am b/src/Extensions/Banshee.YouTube/Makefile.am
index 485ed1c..e03a5ed 100644
--- a/src/Extensions/Banshee.YouTube/Makefile.am
+++ b/src/Extensions/Banshee.YouTube/Makefile.am
@@ -20,6 +20,6 @@ include $(top_srcdir)/build/build.dist.mk
 endif
 
 if HAVE_GDATASHARP_1_5
-GMCS_FLAGS += "-define:HAVE_GDATASHARP_1_5"
+MCS_FLAGS += "-define:HAVE_GDATASHARP_1_5"
 endif
 
diff --git a/src/Hyena b/src/Hyena
index d203421..229d3e8 160000
--- a/src/Hyena
+++ b/src/Hyena
@@ -1 +1 @@
-Subproject commit d20342107425e71e77541aea16558f146322e570
+Subproject commit 229d3e81aa7b6aff3b6426f8a589590101a9b8cf
diff --git a/src/Libraries/Lastfm/Makefile.am b/src/Libraries/Lastfm/Makefile.am
index 7b77b5e..7354995 100644
--- a/src/Libraries/Lastfm/Makefile.am
+++ b/src/Libraries/Lastfm/Makefile.am
@@ -23,7 +23,7 @@ SOURCES =  \
 include $(top_srcdir)/build/build.mk
 
 test-lastfm: Test.cs
-       gmcs -r:$(top_builddir)/bin/Lastfm.dll -out:TestLastfm.exe Test.cs && \
+       $(MCS) -r:$(top_builddir)/bin/Lastfm.dll -out:TestLastfm.exe Test.cs && \
        mv TestLastfm.exe $(top_builddir)/bin/
        @pushd $(top_builddir)/bin/; mono --debug TestLastfm.exe; \
        popd;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]