win32: Enable dotnet on windows

configure.bat

@@ -122,6 +122,7 @@ exit /B 0
             -Dsystemd=false^
             -Dgstreamer=false^
             -Ddbus=false^
+            -Ddotnet=true^
             -Daudio=false^
             -Davahi=false^
             -Dv4l2=false^
@@ -140,7 +141,8 @@ exit /B 0
             "-Devas-loaders-disabler=gst,pdf,ps,raw,svg,rsvg,xcf,bmp,dds,generic,gif,ico,jp2k,pmaps,psd,tga,tgv,tiff,wbmp,webp,xpm,json"^
             -Dopengl=none^
             "-Demotion-loaders-disabler=gstreamer1,libvlc,xine"^
-            -Dbindings=^
+            --prefix=%cd%\_install^
+            -Dbindings=mono^
             --buildtype=debug^
             --native-file native-file-windows.txt
 

src/bin/efl_mono_msbuild_gen/main.cc

@@ -18,9 +18,13 @@
 #include <fstream>
 
 #include <stdlib.h>
-#include <unistd.h>
+#ifndef _MSC_VER
+# include <unistd.h>
+# include <libgen.h>
+#else
+# include <evil_private.h>
+#endif
 #include <getopt.h>
-#include <libgen.h>
 
 #include <string>
 #include <algorithm>

src/bin/eolian_cxx/eolian_cxx.cc

@@ -18,9 +18,13 @@
 #include <fstream>
 
 #include <stdlib.h>
-#include <unistd.h>
+#ifndef _MSC_VER
+# include <unistd.h>
+# include <libgen.h>
+#else
+# include <evil_private.h>
+#endif
 #include <getopt.h>
-#include <libgen.h>
 
 #include <string>
 #include <algorithm>

src/bin/eolian_mono/eolian/mono/type_impl.hh

@@ -125,7 +125,11 @@ struct visitor_generate
            , {"bool", nullptr, [&] { return replace_base_type(regular, "bool?"); }}
            , {"short", nullptr, [&] { return replace_base_opt_integer<short>(regular); }}
            , {"int", nullptr, [&] { return replace_base_opt_integer<int>(regular); }}
+#ifdef _MSC_VER
+           //, {"long", nullptr, [&] { return replace_base_type(regular, "long?"); }}
+#else
            , {"long", nullptr, [&] { return replace_base_opt_integer<long>(regular); }}
+#endif
            , {"llong", nullptr, [&] { return replace_base_opt_integer<long long>(regular); }}
            , {"int8", nullptr, [&] { return replace_base_type(regular, "sbyte?"); }}
            , {"int16", nullptr, [&] { return replace_base_type(regular, "short?"); }}
@@ -136,7 +140,11 @@ struct visitor_generate
            , {"ubyte", nullptr, [&] { return replace_base_type(regular, "byte?"); }}
            , {"ushort", nullptr, [&] { return replace_base_opt_integer<unsigned short>(regular); }}
            , {"uint", nullptr, [&] { return replace_base_opt_integer<unsigned int>(regular); }}
+#ifdef _MSC_VER
+           //, {"ulong", nullptr, [&] { return replace_base_type(regular, "ulong?"); }}
+#else
            , {"ulong", nullptr, [&] { return replace_base_opt_integer<unsigned long>(regular); }}
+#endif
            , {"ullong", nullptr, [&] { return replace_base_opt_integer<unsigned long long>(regular); }}
            , {"uint8", nullptr, [&] { return replace_base_type(regular, "byte?"); }}
            , {"uint16", nullptr, [&] { return replace_base_type(regular, "ushort?"); }}
@@ -156,7 +164,11 @@ struct visitor_generate
              {"byte", nullptr, [&] { return replace_base_type(regular, "sbyte"); }}
            , {"short", nullptr, [&] { return replace_base_integer<short>(regular); }}
            , {"int", nullptr, [&] { return replace_base_integer<int>(regular); }}
+#ifdef _MSC_VER
+           //, {"long", nullptr, [&] { return replace_base_type(regular, "long"); }}
+#else
            , {"long", nullptr, [&] { return replace_base_integer<long>(regular); }}
+#endif
            , {"llong", nullptr, [&] { return replace_base_integer<long long>(regular); }}
            , {"int8", nullptr, [&] { return replace_base_type(regular, "sbyte"); }}
            , {"int16", nullptr, [&] { return replace_base_type(regular, "short"); }}
@@ -167,7 +179,11 @@ struct visitor_generate
            , {"ubyte", nullptr, [&] { return replace_base_type(regular, "byte"); }}
            , {"ushort", nullptr, [&] { return replace_base_integer<unsigned short>(regular); }}
            , {"uint", nullptr, [&] { return replace_base_integer<unsigned int>(regular); }}
+#ifdef _MSC_VER
+           //, {"ulong", nullptr, [&] { return replace_base_type(regular, "ulong"); }}
+#else
            , {"ulong", nullptr, [&] { return replace_base_integer<unsigned long>(regular); }}
+#endif
            , {"ullong", nullptr, [&] { return replace_base_integer<unsigned long long>(regular); }}
            , {"uint8", nullptr, [&] { return replace_base_type(regular, "byte"); }}
            , {"uint16", nullptr, [&] { return replace_base_type(regular, "ushort"); }}

src/bin/eolian_mono/eolian_mono.cc

@@ -18,9 +18,13 @@
 #include <fstream>
 
 #include <stdlib.h>
-#include <unistd.h>
+#ifndef _MSC_VER
+# include <unistd.h>
+# include <libgen.h>
+#else
+# include <evil_private.h>
+#endif
 #include <getopt.h>
-#include <libgen.h>
 
 #include <string>
 #include <map>

src/bin/ethumb_client/meson.build

@@ -1,7 +1,12 @@
+ethumbd_deps = [ecore, ethumb, ethumb_client, ecore]
+if not sys_windows
+  ethumbd_deps += eldbus
+endif
+
 ethumbd = executable('ethumbd',
         'ethumbd.c',
         install: true,
-        dependencies : [ecore, ethumb, ethumb_client, ecore, eldbus],
+        dependencies : ethumbd_deps,
         include_directories : config_dir,
         c_args : package_c_args,
 )

src/bindings/mono/efl_mono/efl_all.cs

@@ -94,7 +94,9 @@ public static void Init(Efl.Csharp.Components components = Efl.Csharp.Components
             ecore_init();
             ecore_init_ex(0, IntPtr.Zero);
             evas_init();
+#if ELDBUS_ENABLED
             eldbus.Config.Init();
+#endif
         }
 
         if ((initComponents & Efl.Csharp.Components.Ui)
@@ -140,8 +142,10 @@ public static void Shutdown()
         if ((initComponents & Efl.Csharp.Components.Basic)
             == Efl.Csharp.Components.Basic)
         {
+#if ELDBUS_ENABLED
             Eina.Log.Debug("Shutting down Eldbus");
             eldbus.Config.Shutdown();
+#endif
             Eina.Log.Debug("Shutting down Evas");
             evas_shutdown();
             Eina.Log.Debug("Shutting down Ecore");

src/bindings/mono/efl_mono/efl_csharp_application.cs

@@ -97,7 +97,9 @@ private static void Init(Efl.Csharp.Components components = Components.All)
             ecore_init();
             ecore_init_ex(0, IntPtr.Zero);
             evas_init();
+#if ELDBUS_ENABLED
             eldbus.Config.Init();
+#endif
         }
 
         if ((initComponents & Components.Ui) == Components.Ui)
@@ -136,7 +138,9 @@ private static void Shutdown()
 
         if ((initComponents & Components.Basic) == Components.Basic)
         {
+#if ELDBUS_ENABLED
             eldbus.Config.Shutdown();
+#endif
             evas_shutdown();
             ecore_shutdown();
             Efl.Eo.Config.Shutdown();

src/bindings/mono/efl_mono/efl_libs.cs.in

@@ -33,8 +33,11 @@ internal class Libs {
 
     internal const string CustomExports = "@CUSTOM_EXPORTS_MONO_DL_MONO@";
 
-    internal const string Libdl = "libdl.so";
-    internal const string Kernel32 = "kernel32.dll";
+#if sys_windows
+    internal const string Kernel32 = "@KERNEL32_DL_MONO@";
+#else
+    internal const string Libdl = "@LIBDL_DL_MONO@";
+#endif
 
     internal static readonly Efl.Eo.NativeModule EflModule = new Efl.Eo.NativeModule(Efl);
     internal static readonly Efl.Eo.NativeModule CoreModule = new Efl.Eo.NativeModule(Ecore);
@@ -46,8 +49,11 @@ internal class Libs {
     internal static readonly Efl.Eo.NativeModule ElementaryModule = new Efl.Eo.NativeModule(Elementary);
     internal static readonly Efl.Eo.NativeModule EldbusModule = new Efl.Eo.NativeModule(Eldbus);
     internal static readonly Efl.Eo.NativeModule CustomExportsModule = new Efl.Eo.NativeModule(CustomExports);
-    internal static readonly Efl.Eo.NativeModule LibdlModule = new Efl.Eo.NativeModule(Libdl);
+#if sys_windows
     internal static readonly Efl.Eo.NativeModule Kernel32Module = new Efl.Eo.NativeModule(Kernel32);
+#else
+    internal static readonly Efl.Eo.NativeModule LibdlModule = new Efl.Eo.NativeModule(Libdl);
+#endif
 }
 
 }

src/bindings/mono/efl_mono/meson.build

@@ -9,17 +9,38 @@ mono_files += files(
 
 bash = find_program('bash')
 
-map = run_command('map_generate.sh').stdout()
+if not sys_windows
+  map = run_command('map_generate.sh').stdout()
+else
+  map = ''
+endif
 
 
 efl_libs = configuration_data()
 efl_libs.set('EFL_MONO_LIBRARY_MAP', map)
-efl_libs.set('CUSTOM_EXPORTS_MONO_DL_MONO', 'eflcustomexportsmono')
+
+if sys_windows
+  eflcustomexportsmono_name = 'eflcustomexportsmono-1'
+else
+  eflcustomexportsmono_name = 'eflcustomexportsmono'
+endif
+efl_libs.set('CUSTOM_EXPORTS_MONO_DL_MONO', eflcustomexportsmono_name)
 efl_libs.set('EVIL_DL_MONO', 'dl')
+if sys_osx
+  efl_libs.set('LIBDL_DL_MONO', 'dl.dylib')
+elif sys_windows
+  efl_libs.set('KERNEL32_DL_MONO', 'kernel32.dll')
+else
+  efl_libs.set('LIBDL_DL_MONO', 'libdl.so')
+endif
 
 foreach mono_libs : mono_sublibs
   key = mono_libs[0].to_upper()+'_DL_MONO'
-  efl_libs.set(key, mono_libs[0].to_lower())
+  if sys_windows
+    efl_libs.set(key, mono_libs[0].to_lower() + '-1')
+  else
+    efl_libs.set(key, mono_libs[0].to_lower())
+  endif
 endforeach
 
 configure_file(
@@ -97,13 +118,17 @@ efl_mono_lib = library('eflcustomexportsmono',
 
 foreach eo_file : mono_eo_files
   if not blacklisted_files.contains(eo_file)
+    examples_param = []
+    if get_option('mono-examples-dir') != ''
+       examples_param = ['-e', get_option('mono-examples-dir')]
+    endif
     mono_generator_target += custom_target('eolian_mono_gen_'+eo_file.underscorify()+'',
       input : join_paths('..', '..', '..', 'lib', 'efl_mono', eo_file),
       output : [eo_file + '.cs'],
       command : [eolian_mono_gen, beta_option, '-I', meson.current_source_dir(), eolian_include_directories,
-                                 '--dllimport', 'eflcustomexportsmono',
+                                 '--dllimport', eflcustomexportsmono_name,
                                  '-o', join_paths(meson.current_build_dir(), eo_file + '.cs'),
-                                 '-e', get_option('mono-examples-dir'),
+                                 examples_param,
                                  '@INPUT@'])
 
   endif

src/bindings/mono/efl_sharp.csproj.in

@@ -19,13 +19,22 @@
     <DefineConstants>@EFL_BETA@</DefineConstants>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(OS)' == 'UNIX' ">
+    <DefineConstants>ELDBUS_ENABLED;$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
+    <DefineConstants>sys_windows;$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <Compile Include="@BINDING_SRC@/efl_mono/*.cs" />
     <!-- FIXME Windows support -->
-    <Compile Include="@BINDING_SRC@/eo_mono/*.cs" Exclude="@BINDING_SRC@/eo_mono/*Windows.cs" />
+    <Compile Include="@BINDING_SRC@/eo_mono/*.cs" />
+    <Compile Remove="@BINDING_SRC@/eo_mono/*Windows.cs" Condition=" '$(OS)' != 'Windows_NT' "/>
+    <Compile Remove="@BINDING_SRC@/eo_mono/*Unix.cs" Condition=" '$(OS)' != 'UNIX' "/>
     <Compile Include="@BINDING_SRC@/eina_mono/*.cs" />
     <Compile Include="@BINDING_SRC@/eolian_mono/*.cs" />
-    <Compile Include="@BINDING_SRC@/eldbus_mono/*.cs" />
+    <Compile Include="@BINDING_SRC@/eldbus_mono/*.cs" Condition=" '$(OS)' == 'UNIX' "/>
   </ItemGroup>
 
   <!-- Calling `dotnet build` from a different folder seems to mess up the automatic source file discovery.

src/bindings/mono/eo_mono/EoWrapper.cs

@@ -411,9 +411,9 @@ private void AddWrapperSupervisor()
     /// <summary>Register handlers to ownership events, in order to control the object lifetime. For internal use only.</summary>
     private void AddOwnershipEventHandlers()
     {
-        AddNativeEventHandler("eo", "_EFL_EVENT_INVALIDATE", ownershipUniqueDelegate, ownershipUniqueDelegate);
-        AddNativeEventHandler("eo", "_EFL_EVENT_OWNERSHIP_UNIQUE", ownershipUniqueDelegate, ownershipUniqueDelegate);
-        AddNativeEventHandler("eo", "_EFL_EVENT_OWNERSHIP_SHARED", ownershipSharedDelegate, ownershipSharedDelegate);
+        AddNativeEventHandler(efl.Libs.Eo, "_EFL_EVENT_INVALIDATE", ownershipUniqueDelegate, ownershipUniqueDelegate);
+        AddNativeEventHandler(efl.Libs.Eo, "_EFL_EVENT_OWNERSHIP_UNIQUE", ownershipUniqueDelegate, ownershipUniqueDelegate);
+        AddNativeEventHandler(efl.Libs.Eo, "_EFL_EVENT_OWNERSHIP_SHARED", ownershipSharedDelegate, ownershipSharedDelegate);
         Eina.Error.RaiseIfUnhandledException();
     }
 

src/bindings/mono/eo_mono/FunctionWrapper.cs

@@ -38,7 +38,7 @@ internal static IntPtr LoadFunctionPointer(string moduleName, string functionNam
     {
         IntPtr module = NativeModule.LoadLibrary(moduleName);
         Eina.Log.Debug($"searching {module} for {functionName}");
-        var s = FunctionInterop.dlsym(module, functionName);
+        var s = FunctionInterop.LoadFunctionPointer(module, functionName);
         Eina.Log.Debug($"searching {module} for{functionName}, result {s}");
         return s;
     }
@@ -51,7 +51,7 @@ internal static IntPtr LoadFunctionPointer(string moduleName, string functionNam
     internal static IntPtr LoadFunctionPointer(string functionName)
     {
         Eina.Log.Debug($"searching {null} for {functionName}");
-        var s = FunctionInterop.dlsym(IntPtr.Zero, functionName);
+        var s = FunctionInterop.LoadFunctionPointer(IntPtr.Zero, functionName);
         Eina.Log.Debug($"searching {null} for {functionName}, result {s}");
         return s;
     }

src/bindings/mono/eo_mono/FunctionWrapper_Windows.cs

@@ -19,13 +19,24 @@
 namespace Efl.Eo
 {
 
-static partial class FunctionInterop
+internal static partial class FunctionInterop
 {
-    [DllImport(efl.Libs.Libdl)]
-    internal static extern IntPtr GetProcAddress(IntPtr handle, string symbol);
+    [DllImport(efl.Libs.Kernel32)]
+    private static extern IntPtr GetProcAddress(IntPtr handle, string symbol);
 
-    private static IntPtr LoadFunctionPointer(IntPtr nativeLibraryHandle, string functionName)
-        => FunctionInterop.GetProcAddress(nativeLibraryHandle, functionName);
+    /// <summary>Loads a function pointer from the given module.
+    /// <para>Since EFL 1.23.</para>
+    /// </summary>
+    /// <param name="nativeLibraryHandle">The module containing the function.</param>
+    /// <param name="functionName">The name of the function to search for.</param>
+    /// <returns>A function pointer that can be used with delegates.</returns>
+    internal static IntPtr LoadFunctionPointer(IntPtr nativeLibraryHandle, string functionName)
+    {
+        Eina.Log.Debug($"searching {nativeLibraryHandle} for {functionName}");
+        var s = FunctionInterop.GetProcAddress(nativeLibraryHandle, functionName);
+        Eina.Log.Debug($"searching {nativeLibraryHandle} for {functionName}, result {s}");
+        return s;
+    }
 }
 
 }

src/bindings/mono/eo_mono/NativeModule_Unix.cs

@@ -56,6 +56,12 @@ internal static void UnloadLibrary(IntPtr handle)
     ///<item>
     ///<description><c>libfilename.so</c></description>
     ///</item>
+    ///<item>
+    ///<description><c>filename.dylib</c></description>
+    ///</item>
+    ///<item>
+    ///<description><c>libfilename.dylib</c></description>
+    ///</item>
     ///</list>
     ///</summary>
     ///<param name="filename">The name to search for.</param>
@@ -73,12 +79,27 @@ internal static IntPtr LoadLibrary(string filename)
                 if (r == IntPtr.Zero)
                 {
                     r = dlopen("lib" + filename + ".so", RTLD_NOW | RTLD_GLOBAL);
+                    if (r == IntPtr.Zero)
+                    {
+                        r = dlopen(filename + ".dylib", RTLD_NOW | RTLD_GLOBAL);
+                        if (r == IntPtr.Zero)
+                        {
+                            r = dlopen("lib" + filename + ".dylib", RTLD_NOW | RTLD_GLOBAL);
+                        }
+                    }
+
+
                 }
             }
         }
 
         return r;
     }
+
+    internal static string GetError()
+    {
+        return Eina.StringConversion.NativeUtf8ToManagedString(Efl.Eo.Globals.dlerror());
+    }
 }
 
 }