[gbrainy] Remove extensions



commit 4f060901efd0803298ba733007cc54f00e791d5e
Author: Jordi Mas <jmas softcatala org>
Date:   Thu May 30 20:58:04 2019 +0200

    Remove extensions

 configure.ac                                       |  23 ----
 .../Calculation/CalculationSample.addin.xml        |  17 ---
 sample_extensions/Calculation/CalculationSample.cs | 114 ------------------
 sample_extensions/Calculation/Makefile             |   7 --
 sample_extensions/Logic/Makefile                   |   7 --
 sample_extensions/Logic/PuzzleSample.addin.xml     |  17 ---
 sample_extensions/Logic/PuzzleSample.cs            |  46 --------
 sample_extensions/Makefile                         |  11 --
 sample_extensions/Memory/Makefile                  |   7 --
 sample_extensions/Memory/MemorySample.addin.xml    |  17 ---
 sample_extensions/Memory/MemorySample.cs           | 129 ---------------------
 sample_extensions/README                           |   5 -
 sample_extensions/calculation_extension.csproj     |  48 --------
 sample_extensions/logic_extension.csproj           |  50 --------
 sample_extensions/memory_extension.csproj          |  50 --------
 src/Clients/Classical/Makefile.am                  |   4 +-
 src/Clients/Classical/MonoAddinsStrings.cs         |  88 --------------
 src/Clients/Classical/gbrainy.cs                   |  17 ---
 src/Core/Makefile.am                               |   7 +-
 19 files changed, 3 insertions(+), 661 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1f19b901..7f367ddb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,34 +75,12 @@ dnl --- Required libraries
 
 GTKSHARP_REQUIRED=2.99.1
 MONO_REQUIRED=4.0.0
-MONO_ADDINS=0.2.0
 CANBERRA_GTK_REQUIRED=0.26
 
 PKG_CHECK_MODULES(GBRAINY_CORE, mono >= $MONO_REQUIRED)
 
 PKG_CHECK_MODULES(GBRAINY, gtk-sharp-3.0 >= $GTKSHARP_REQUIRED)
 PKG_CHECK_MODULES(GBRAINY, libcanberra-gtk-3-0  >= $CANBERRA_GTK_REQUIRED)
-
-AC_ARG_ENABLE(addins, AC_HELP_STRING([--disable-addins], [Disable mono-addins support]), , 
enable_addins="no")
-
-enable_addins_sharp="${enable_addins}"
-
- PKG_CHECK_MODULES(MONO_ADDINS,
-       mono-addins0.2 >= $MONO_ADDINS
-       mono-addins0.2-setup >= $MONO_ADDINS
-       mono-addins0.2-gui >= $MONO_ADDINS,
-       enable_addins_sharp="$enable_addins_sharp", enable_addins_sharp=no)
-
-if test "x$enable_addins" = "xyes" -a "x$enable_addins_sharp" = "xno"; then
-       AC_MSG_ERROR([mono-addins was not found or is not up to date. Please install mono-addins of at least 
version $MONO_ADDINS, or disable mono-addins support by --disable-addins])
-fi
-
-if test "x$enable_addins" = "xyes"; then
-       CSC_DEFINES="$CSC_DEFINES -d:MONO_ADDINS"
-fi
-
-AM_CONDITIONAL(ENABLE_ADDINS, test "x$enable_addins_sharp" = "xyes")
-
 PKG_CHECK_MODULES(GBRAINY_CHECK, librsvg-2.0)
 
 dnl -- Intl
@@ -193,7 +171,6 @@ help/Makefile
 tools/Defines.cs
 ])
 
-echo "Mono-addins:             ${enable_addins_sharp}"
 echo "NUnit:                   ${enable_tests}"
 echo "Debug enabled:           ${enable_debug}"
 
diff --git a/src/Clients/Classical/Makefile.am b/src/Clients/Classical/Makefile.am
index cf7957e7..40b5e8d8 100644
--- a/src/Clients/Classical/Makefile.am
+++ b/src/Clients/Classical/Makefile.am
@@ -1,4 +1,4 @@
-EXTRAFLAGS = -nowarn:0169 $(CSC_DEFINES)
+#EXTRAFLAGS = -nowarn:0169 $(CSC_DEFINES)
 
 WRAPPER = gbrainy
 TARGET_CFG = ../../gbrainy.exe.config
@@ -21,7 +21,6 @@ GBRAINY_CSDISTFILES =                                 \
 
 ASSEMBLIES = \
         $(GBRAINY_LIBS)                \
-        $(MONO_ADDINS_LIBS)            \
        -r:../../gbrainy.Core.dll       \
        -r:Mono.Posix
 
@@ -68,7 +67,6 @@ all: ../../gbrainy.exe $(TARGET_CFG)
 EXTRA_DIST =                                   \
        gbrainy.ui                              \
        $(srcdir)/gbrainy.exe.config.in         \
-       $(srcdir)/MonoAddinsStrings.cs          \
        $(srcdir)/gbrainy.ui                    \
        $(srcdir)/Dialogs/ui/PreferencesDialog.ui \
        $(srcdir)/Dialogs/ui/PlayerHistoryDialog.ui \
diff --git a/src/Clients/Classical/gbrainy.cs b/src/Clients/Classical/gbrainy.cs
index 3951e99f..d4a7c15c 100644
--- a/src/Clients/Classical/gbrainy.cs
+++ b/src/Clients/Classical/gbrainy.cs
@@ -29,10 +29,6 @@ using gbrainy.Core.Libraries;
 using gbrainy.Clients.Classical.Dialogs;
 using gbrainy.Clients.Classical.Widgets;
 
-#if MONO_ADDINS
-using Mono.Addins;
-using Mono.Addins.Setup;
-#endif
 
 namespace gbrainy.Clients.Classical
 {
@@ -190,20 +186,7 @@ namespace gbrainy.Clients.Classical
                        if (show_toolbar == false)
                                showtoolbar_menuitem.Active = false;
 
-               #if MONO_ADDINS
-                       extensions_menuitem.Activated += delegate (object sender, EventArgs ar) 
-                       {
-                               if (pluggins_loaded == false)
-                               {                       
-                                       session.GameManager.LoadPlugins ();
-                               }
-                               Mono.Addins.Gui.AddinManagerWindow.Run (app_window);
-                               GameManagerPreload (session.GameManager);
-                               CustomGameDialog.Clear ();
-                       };
-               #else
                        extensions_menuitem.Visible = false;
-               #endif
                        ActiveInputControls (false);
                }
 
diff --git a/src/Core/Makefile.am b/src/Core/Makefile.am
index aa5c6452..7c7faa71 100644
--- a/src/Core/Makefile.am
+++ b/src/Core/Makefile.am
@@ -86,16 +86,13 @@ RES = \
 $(top_srcdir)/data/app-graphics/logic-games.svg                \
 $(top_srcdir)/data/app-graphics/math-games.svg         \
 $(top_srcdir)/data/app-graphics/memory-games.svg       \
-$(top_srcdir)/data/app-graphics/verbal-games.svg       \
-$(srcdir)/gbrainy.addin.xml
-
+$(top_srcdir)/data/app-graphics/verbal-games.svg
 
 REFS =  \
        -r:System \
        -r:Mono.Posix                   \
        -r:Mono.CSharp.dll              \
-        $(GBRAINY_LIBS)                \
-        $(MONO_ADDINS_LIBS)
+        $(GBRAINY_LIBS)
 
 RES_CSFLAGS = $(foreach res, $(RES), -resource:$(res))
 


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