Commit c2b506e2 authored by Bertrand Lorentz's avatar Bertrand Lorentz

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.
parent 563408f9
......@@ -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
......
......@@ -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:$@ \
......
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)
......
......@@ -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}
......
......@@ -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>
......
......@@ -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 = \
......
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
......
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
......
......@@ -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
Hyena @ 229d3e81
Subproject commit d20342107425e71e77541aea16558f146322e570
Subproject commit 229d3e81aa7b6aff3b6426f8a589590101a9b8cf
......@@ -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;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment