Split out FuncLoader into multiple files

This commit is contained in:
cra0zy 2018-01-18 17:50:12 +01:00
parent 44646c3144
commit 3f0810c93a
11 changed files with 98 additions and 89 deletions

View File

@ -20,6 +20,8 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Shared\*.cs" />
<Compile Include="..\Shared\*.cs">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
</Compile>
</ItemGroup>
</Project>

View File

@ -15,6 +15,8 @@
<OutputPath>..\..\..\BuildOutput\Release</OutputPath>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Shared\*.cs" />
<Compile Include="..\Shared\*.cs">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
</Compile>
</ItemGroup>
</Project>

View File

@ -15,6 +15,8 @@
<OutputPath>..\..\..\BuildOutput\Release</OutputPath>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Shared\*.cs" />
<Compile Include="..\Shared\*.cs">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
</Compile>
</ItemGroup>
</Project>

View File

@ -29,6 +29,8 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Shared\*.cs" />
<Compile Include="..\Shared\*.cs">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
</Compile>
</ItemGroup>
</Project>

View File

@ -20,6 +20,8 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Shared\*.cs" />
<Compile Include="..\Shared\*.cs">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
</Compile>
</ItemGroup>
</Project>

View File

@ -37,6 +37,8 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Shared\*.cs" />
<Compile Include="..\Shared\*.cs">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
</Compile>
</ItemGroup>
</Project>

View File

@ -23,6 +23,8 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Shared\FuncLoader.cs" />
<Compile Include="..\Shared\*.cs">
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
</Compile>
</ItemGroup>
</Project>

View File

@ -1,82 +1,5 @@
using System;
using System.Runtime.InteropServices;
using System.Collections.Generic;
using System.Linq;
enum Library
{
GLib,
GObject,
Cairo,
Gio,
Atk,
Pango,
Gdk,
GdkPixbuf,
Gtk
}
class GLibrary
{
private static Dictionary<Library, IntPtr> _libraries;
private static Dictionary<string, IntPtr> _customlibraries;
private static List<(Library Library, string WindowsLib, string LinuxLib, string OSXLib)> _libdict;
static GLibrary()
{
_customlibraries = new Dictionary<string, IntPtr>();
_libraries = new Dictionary<Library, IntPtr>();
_libdict = new List<(Library, string, string, string)>();
_libdict.Add((Library.GLib, "libglib-2.0-0.dll", "libglib-2.0.so.0", "libglib-2.0.0.dylib"));
_libdict.Add((Library.GObject, "libgobject-2.0-0.dll", "libgobject-2.0.so.0", "libgobject-2.0.0.dylib"));
_libdict.Add((Library.Cairo, "libcairo-2.dll", "libcairo.so.2", "libcairo.2.dylib"));
_libdict.Add((Library.Gio, "libgio-2.0-0.dll", "libgio-2.0.so.0", "libgio-2.0.0.dylib"));
_libdict.Add((Library.Atk, "libatk-1.0-0.dll", "libatk-1.0.so.0", "libatk-1.0.0.dylib"));
_libdict.Add((Library.Pango, "libpango-1.0-0.dll", "libpango-1.0.so.0", "libpango-1.0.0.dylib"));
_libdict.Add((Library.Gdk, "libgdk-3-0.dll", "libgdk-3.so.0", "libgdk-3.0.dylib"));
_libdict.Add((Library.GdkPixbuf, "libgdk_pixbuf-2.0-0.dll", "libgdk_pixbuf-2.0.so.0", "libgdk_pixbuf-2.0.dylib"));
_libdict.Add((Library.Gtk, "libgtk-3-0.dll", "libgtk-3.so.0", "libgtk-3.0.dylib"));
}
public static IntPtr Load(string libname)
{
var index = _libdict.FindIndex((e) => (e.WindowsLib == libname || e.LinuxLib == libname || e.OSXLib == libname));
if (index != -1)
return Load(_libdict[index].Library);
var ret = IntPtr.Zero;
if (!_customlibraries.TryGetValue(libname, out ret))
_customlibraries[libname] = ret = FuncLoader.LoadLibrary(libname);
return ret;
}
public static IntPtr Load(Library library)
{
IntPtr ret = IntPtr.Zero;
if (!_libraries.TryGetValue(library, out ret))
{
var i = _libdict.Find((e) => e.Library == library);
var s = i.LinuxLib;
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
s = i.WindowsLib;
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
s = i.OSXLib;
_libraries[library] = ret = FuncLoader.LoadLibrary(s);
}
if (ret == IntPtr.Zero)
{
Console.WriteLine("Error: " + library);
throw new Exception();
}
return ret;
}
}
class FuncLoader
{
@ -138,10 +61,7 @@ class FuncLoader
ret = Linux.dlsym(library, function);
if (ret == IntPtr.Zero)
{
Console.WriteLine("Error: " + function);
throw new Exception();
}
throw new EntryPointNotFoundException(function);
return ret;
}

View File

@ -0,0 +1,62 @@
using System;
using System.Runtime.InteropServices;
using System.Collections.Generic;
class GLibrary
{
private static Dictionary<Library, IntPtr> _libraries;
private static Dictionary<string, IntPtr> _customlibraries;
private static List<(Library Library, string WindowsLib, string LinuxLib, string OSXLib)> _libdict;
static GLibrary()
{
_customlibraries = new Dictionary<string, IntPtr>();
_libraries = new Dictionary<Library, IntPtr>();
_libdict = new List<(Library, string, string, string)>();
_libdict.Add((Library.GLib, "libglib-2.0-0.dll", "libglib-2.0.so.0", "libglib-2.0.0.dylib"));
_libdict.Add((Library.GObject, "libgobject-2.0-0.dll", "libgobject-2.0.so.0", "libgobject-2.0.0.dylib"));
_libdict.Add((Library.Cairo, "libcairo-2.dll", "libcairo.so.2", "libcairo.2.dylib"));
_libdict.Add((Library.Gio, "libgio-2.0-0.dll", "libgio-2.0.so.0", "libgio-2.0.0.dylib"));
_libdict.Add((Library.Atk, "libatk-1.0-0.dll", "libatk-1.0.so.0", "libatk-1.0.0.dylib"));
_libdict.Add((Library.Pango, "libpango-1.0-0.dll", "libpango-1.0.so.0", "libpango-1.0.0.dylib"));
_libdict.Add((Library.Gdk, "libgdk-3-0.dll", "libgdk-3.so.0", "libgdk-3.0.dylib"));
_libdict.Add((Library.GdkPixbuf, "libgdk_pixbuf-2.0-0.dll", "libgdk_pixbuf-2.0.so.0", "libgdk_pixbuf-2.0.dylib"));
_libdict.Add((Library.Gtk, "libgtk-3-0.dll", "libgtk-3.so.0", "libgtk-3.0.dylib"));
}
public static IntPtr Load(string libname)
{
var index = _libdict.FindIndex((e) => (e.WindowsLib == libname || e.LinuxLib == libname || e.OSXLib == libname));
if (index != -1)
return Load(_libdict[index].Library);
var ret = IntPtr.Zero;
if (!_customlibraries.TryGetValue(libname, out ret))
_customlibraries[libname] = ret = FuncLoader.LoadLibrary(libname);
return ret;
}
public static IntPtr Load(Library library)
{
IntPtr ret = IntPtr.Zero;
if (!_libraries.TryGetValue(library, out ret))
{
var i = _libdict.Find((e) => e.Library == library);
var s = i.LinuxLib;
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
s = i.WindowsLib;
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
s = i.OSXLib;
_libraries[library] = ret = FuncLoader.LoadLibrary(s);
}
if (ret == IntPtr.Zero)
throw new DllNotFoundException(library.ToString());
return ret;
}
}

View File

@ -0,0 +1,13 @@
enum Library
{
GLib,
GObject,
Cairo,
Gio,
Atk,
Pango,
Gdk,
GdkPixbuf,
Gtk
}

View File

@ -6,7 +6,7 @@
// VARS
Settings.Cake = Context;
Settings.Version = "3.22.24.22";
Settings.Version = "3.22.24.23";
Settings.BuildTarget = Argument("BuildTarget", "Default");
Settings.Assembly = Argument("Assembly", "");