[gbrainy] Bump requiered Mono to version 3.0 and remove old static compiler access classes



commit bffd86e7072ad61ce9d5847b74eda6215747a6c1
Author: Jordi Mas <jmas softcatala org>
Date:   Sun Dec 14 10:43:11 2014 -0500

    Bump requiered Mono to version 3.0 and remove old static compiler access classes
    
    Conflicts:
        configure.ac

 configure.ac                                       |   10 +-
 src/Core/Libraries/CSharpCompiler.cs               |    3 -
 src/Core/Libraries/CSharpCompilerStatic.cs         |  169 --------------------
 .../Libraries/CSharpCompilerStaticDomainProxy.cs   |   70 --------
 src/Core/Makefile.am                               |    2 -
 src/Core/Services/DefaultServices.cs               |    5 -
 6 files changed, 1 insertions(+), 258 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5d34134..b3a6a12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,13 +60,6 @@ else
   AC_MSG_RESULT([found])
 fi
 
-if ! pkg-config --atleast-version=2.11 mono; then
-   CSC_DEFINES="$CSC_DEFINES -d:CSHARP_STATIC"
-   csharp_static="yes"
-else
-   csharp_static="no"
-fi
-
 
 dnl -- check for various mono assemblies that we need.
 
@@ -87,7 +80,7 @@ done
 dnl --- Required libraries
 
 GTKSHARP_REQUIRED=2.10
-MONO_REQUIRED=1.1.7
+MONO_REQUIRED=3.0.0
 MONO_ADDINS=0.3
 CANBERRA_GTK_REQUIRED=0.26
 
@@ -226,6 +219,5 @@ tools/Defines.cs
 echo "Mono-addins:             ${enable_addins_sharp}"
 echo "NUnit:                   ${enable_tests}"
 echo "Debug enabled:           ${enable_debug}"
-echo "Mono.CSharp static:      ${csharp_static}"
 
 
diff --git a/src/Core/Libraries/CSharpCompiler.cs b/src/Core/Libraries/CSharpCompiler.cs
index 33686d6..2aef0d2 100644
--- a/src/Core/Libraries/CSharpCompiler.cs
+++ b/src/Core/Libraries/CSharpCompiler.cs
@@ -17,8 +17,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if !CSHARP_STATIC
-
 using System;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -115,4 +113,3 @@ namespace gbrainy.Core.Libraries
        }
 }
 
-#endif
diff --git a/src/Core/Makefile.am b/src/Core/Makefile.am
index 593f36f..f302208 100644
--- a/src/Core/Makefile.am
+++ b/src/Core/Makefile.am
@@ -76,8 +76,6 @@ CSDISTFILES =  \
                $(srcdir)/Services/MemoryConfiguration.cs \
                $(srcdir)/Services/DefaultServices.cs   \
                $(srcdir)/Services/ICSharpCompiler.cs   \
-               $(srcdir)/Libraries/CSharpCompilerStatic.cs     \
-               $(srcdir)/Libraries/CSharpCompilerStaticDomainProxy.cs  \
                $(srcdir)/Libraries/CSharpCompiler.cs
 
 CSFILES = $(CSDISTFILES)       \
diff --git a/src/Core/Services/DefaultServices.cs b/src/Core/Services/DefaultServices.cs
index cf09506..f0c6fe0 100644
--- a/src/Core/Services/DefaultServices.cs
+++ b/src/Core/Services/DefaultServices.cs
@@ -36,12 +36,7 @@ namespace gbrainy.Core.Services
                        // Default services
                        services.Add (typeof (ITranslations), new TranslationsCatalog ());
                        services.Add (typeof (IConfiguration), new MemoryConfiguration ());
-
-#if CSHARP_STATIC
-                       services.Add (typeof (ICSharpCompiler), new CSharpCompilerStatic ());
-#else
                        services.Add (typeof (ICSharpCompiler), new CSharpCompiler ());
-#endif
                }
 
                public void RemoveService <T> () where T : class, IService


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]