From 46951b3f910e06c47ae8cc38de9261fe415026f0 Mon Sep 17 00:00:00 2001 From: cra0zy Date: Thu, 26 Oct 2017 01:42:57 +0200 Subject: [PATCH] NuGet packaging, Dll mapping and general .Net core improvements --- .vscode/settings.json | 3 - CakeScripts/GAssembly.cs | 30 +++---- CakeScripts/Settings.cs | 7 ++ Source/Libs/AssemblyInfo.cs | 3 +- Source/Libs/AssemblyInfo.cs.in | 5 -- Source/Libs/AtkSharp/AtkSharp-api.raw | 2 +- Source/Libs/AtkSharp/AtkSharp.csproj | 5 +- Source/Libs/AtkSharp/Class1.cs | 8 -- Source/Libs/AtkSharp/Global.cs | 2 +- .../Libs/AtkSharp/linux-x64/libatk-1.0-0.so | Bin 0 -> 7240 bytes Source/Libs/CairoSharp/AssemblyInfo.cs.in | 5 -- Source/Libs/CairoSharp/CairoSharp.csproj | 5 +- Source/Libs/CairoSharp/Class1.cs | 8 -- Source/Libs/CairoSharp/NativeMethods.cs | 2 +- .../Libs/CairoSharp/linux-x64/libcairo-2.so | Bin 0 -> 7240 bytes Source/Libs/{GtkSharp.sln => GLibSharp.sln} | 0 Source/Libs/GLibSharp/Class1.cs | 8 -- Source/Libs/GLibSharp/GLibSharp-api.xml | 2 +- Source/Libs/GLibSharp/GLibSharp.csproj | 7 +- Source/Libs/GLibSharp/Global.cs | 4 +- .../Libs/GLibSharp/linux-x64/libglib-2.0-0.so | Bin 0 -> 7240 bytes .../GLibSharp/linux-x64/libgobject-2.0-0.so | Bin 0 -> 7240 bytes .../GLibSharp/linux-x64/libgthread-2.0-0.so | Bin 0 -> 7240 bytes Source/Libs/GdkSharp/Class1.cs | 8 -- Source/Libs/GdkSharp/GdkSharp-api.raw | 4 +- Source/Libs/GdkSharp/GdkSharp.csproj | 4 + Source/Libs/GdkSharp/Global.cs | 2 +- Source/Libs/GdkSharp/PixbufLoader.cs | 2 +- Source/Libs/GdkSharp/Pixdata.cs | 2 +- Source/Libs/GdkSharp/Window.cs | 2 +- Source/Libs/GdkSharp/linux-x64/libgdk-3-0.so | Bin 0 -> 7240 bytes .../GdkSharp/linux-x64/libgdk_pixbuf-2.0-0.so | Bin 0 -> 7240 bytes Source/Libs/GioSharp/Class1.cs | 8 -- Source/Libs/GioSharp/GioGlobal.cs | 2 +- Source/Libs/GioSharp/GioSharp-api.raw | 2 +- Source/Libs/GioSharp/GioSharp.csproj | 3 + .../Libs/GioSharp/linux-x64/libgio-2.0-0.so | Bin 0 -> 7240 bytes Source/Libs/GtkSharp/Class1.cs | 8 -- Source/Libs/GtkSharp/Global.cs | 2 +- Source/Libs/GtkSharp/GtkSharp-api.raw | 2 +- Source/Libs/GtkSharp/GtkSharp.csproj | 6 +- Source/Libs/GtkSharp/linux-x64/libgtk-3-0.so | Bin 0 -> 7240 bytes Source/Libs/PangoSharp/AttrBackground.cs | 2 +- Source/Libs/PangoSharp/AttrFallback.cs | 2 +- Source/Libs/PangoSharp/AttrFamily.cs | 2 +- Source/Libs/PangoSharp/AttrFontDesc.cs | 4 +- Source/Libs/PangoSharp/AttrForeground.cs | 2 +- Source/Libs/PangoSharp/AttrGravity.cs | 2 +- Source/Libs/PangoSharp/AttrGravityHint.cs | 2 +- Source/Libs/PangoSharp/AttrIterator.cs | 4 +- Source/Libs/PangoSharp/AttrLanguage.cs | 2 +- Source/Libs/PangoSharp/AttrLetterSpacing.cs | 2 +- Source/Libs/PangoSharp/AttrList.cs | 6 +- Source/Libs/PangoSharp/AttrRise.cs | 2 +- Source/Libs/PangoSharp/AttrScale.cs | 2 +- Source/Libs/PangoSharp/AttrShape.cs | 2 +- Source/Libs/PangoSharp/AttrSize.cs | 4 +- Source/Libs/PangoSharp/AttrStretch.cs | 2 +- Source/Libs/PangoSharp/AttrStrikethrough.cs | 2 +- .../Libs/PangoSharp/AttrStrikethroughColor.cs | 2 +- Source/Libs/PangoSharp/AttrStyle.cs | 2 +- Source/Libs/PangoSharp/AttrUnderline.cs | 2 +- Source/Libs/PangoSharp/AttrUnderlineColor.cs | 2 +- Source/Libs/PangoSharp/AttrVariant.cs | 2 +- Source/Libs/PangoSharp/AttrWeight.cs | 2 +- Source/Libs/PangoSharp/Attribute.cs | 6 +- Source/Libs/PangoSharp/Class1.cs | 8 -- Source/Libs/PangoSharp/Context.cs | 4 +- Source/Libs/PangoSharp/Coverage.cs | 2 +- Source/Libs/PangoSharp/FontFamily.cs | 4 +- Source/Libs/PangoSharp/FontMap.cs | 4 +- Source/Libs/PangoSharp/Global.cs | 6 +- Source/Libs/PangoSharp/GlyphItem.cs | 2 +- Source/Libs/PangoSharp/Layout.cs | 10 +-- Source/Libs/PangoSharp/LayoutLine.cs | 2 +- Source/Libs/PangoSharp/PangoSharp-api.raw | 2 +- Source/Libs/PangoSharp/PangoSharp.csproj | 5 +- Source/Libs/PangoSharp/PangoSharp.metadata | 2 +- Source/Libs/PangoSharp/ScriptIter.cs | 10 +-- Source/Libs/PangoSharp/TabArray.cs | 2 +- .../PangoSharp/linux-x64/libpango-1.0-0.so | Bin 0 -> 7240 bytes Source/OldStuff/generate.sh | 31 +++++++ build.cake | 83 +++++++++++++++--- 83 files changed, 222 insertions(+), 180 deletions(-) delete mode 100755 .vscode/settings.json create mode 100755 CakeScripts/Settings.cs delete mode 100755 Source/Libs/AssemblyInfo.cs.in delete mode 100755 Source/Libs/AtkSharp/Class1.cs create mode 100755 Source/Libs/AtkSharp/linux-x64/libatk-1.0-0.so delete mode 100755 Source/Libs/CairoSharp/AssemblyInfo.cs.in delete mode 100755 Source/Libs/CairoSharp/Class1.cs create mode 100755 Source/Libs/CairoSharp/linux-x64/libcairo-2.so rename Source/Libs/{GtkSharp.sln => GLibSharp.sln} (100%) delete mode 100755 Source/Libs/GLibSharp/Class1.cs create mode 100755 Source/Libs/GLibSharp/linux-x64/libglib-2.0-0.so create mode 100755 Source/Libs/GLibSharp/linux-x64/libgobject-2.0-0.so create mode 100755 Source/Libs/GLibSharp/linux-x64/libgthread-2.0-0.so delete mode 100755 Source/Libs/GdkSharp/Class1.cs create mode 100755 Source/Libs/GdkSharp/linux-x64/libgdk-3-0.so create mode 100755 Source/Libs/GdkSharp/linux-x64/libgdk_pixbuf-2.0-0.so delete mode 100755 Source/Libs/GioSharp/Class1.cs create mode 100755 Source/Libs/GioSharp/linux-x64/libgio-2.0-0.so delete mode 100755 Source/Libs/GtkSharp/Class1.cs create mode 100755 Source/Libs/GtkSharp/linux-x64/libgtk-3-0.so delete mode 100755 Source/Libs/PangoSharp/Class1.cs create mode 100755 Source/Libs/PangoSharp/linux-x64/libpango-1.0-0.so create mode 100755 Source/OldStuff/generate.sh diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100755 index 3b6641073..000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "git.ignoreLimitWarning": true -} \ No newline at end of file diff --git a/CakeScripts/GAssembly.cs b/CakeScripts/GAssembly.cs index 339947072..158aacddb 100755 --- a/CakeScripts/GAssembly.cs +++ b/CakeScripts/GAssembly.cs @@ -3,7 +3,7 @@ using P = System.IO.Path; public class GAssembly { - public static ICakeContext Cake; + private ICakeContext Cake; public bool Init { get; private set; } public string Name { get; private set; } @@ -13,12 +13,13 @@ public class GAssembly public string RawApi { get; private set; } public string Metadata { get; private set; } - public string[] Includes { get; set; } + public string[] Deps { get; set; } public string ExtraArgs { get; set; } public GAssembly(string name) { - Includes = new string[0]; + Cake = Settings.Cake; + Deps = new string[0]; Name = name; Dir = P.Combine("Source", "Libs", name); @@ -32,20 +33,21 @@ public class GAssembly public void Prepare() { + Cake.CreateDirectory(GDir); + // Raw API file found, time to generate some stuff!!! if (Cake.FileExists(RawApi)) { - Cake.DeleteDirectory(GDir, true); - Cake.CreateDirectory(GDir); - // Fixup API file var tempapi = P.Combine(GDir, Name + "-api.xml"); var symfile = P.Combine(Dir, Name + "-symbols.xml"); Cake.CopyFile(RawApi, tempapi); GapiFixup.Run(tempapi, Metadata, Cake.FileExists(symfile) ? symfile : string.Empty); + var extraargs = ExtraArgs + " "; + // Locate APIs to include - foreach(var dep in Includes) + foreach(var dep in Deps) { var ipath = P.Combine("Source", "Libs", dep, dep + "-api.xml"); @@ -53,17 +55,14 @@ public class GAssembly ipath = P.Combine("Source", "Libs", dep, "Generated", dep + "-api.xml"); if (Cake.FileExists(ipath)) - { - ExtraArgs += "--include=" + ipath + " "; - ExtraArgs += "--include=" + ipath + " "; - } + extraargs += " --include=" + ipath + " "; } // Generate code - GAssembly.Cake.DotNetCoreExecute(P.Combine("BuildOutput", "Generator", "GapiCodegen.dll"), + Cake.DotNetCoreExecute("BuildOutput/Generator/GapiCodegen.dll", "--outdir=" + GDir + " " + - "--schema=" + P.Combine("Source", "Libs", "Gapi.xsd") + " " + - ExtraArgs + " " + + "--schema=Source/Libs/Gapi.xsd " + + extraargs + " " + "--assembly-name=" + Name + " " + "--generate=" + tempapi ); @@ -74,6 +73,7 @@ public class GAssembly public void Clean() { - Cake.DeleteDirectory(GDir, true); + if (Cake.DirectoryExists(GDir)) + Cake.DeleteDirectory(GDir, new DeleteDirectorySettings { Recursive = true, Force = true }); } } diff --git a/CakeScripts/Settings.cs b/CakeScripts/Settings.cs new file mode 100755 index 000000000..972436d03 --- /dev/null +++ b/CakeScripts/Settings.cs @@ -0,0 +1,7 @@ + +class Settings +{ + public static ICakeContext Cake { get; set; } + public static string BuildTarget { get; set; } + public static string Assembly { get; set; } +} \ No newline at end of file diff --git a/Source/Libs/AssemblyInfo.cs b/Source/Libs/AssemblyInfo.cs index c18c06f36..08ed57be6 100755 --- a/Source/Libs/AssemblyInfo.cs +++ b/Source/Libs/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; using System.Runtime.CompilerServices; -[assembly:AssemblyVersion("1.0.0.0")] -[assembly:AssemblyDelaySign(false)] +[assembly:AssemblyVersion("3.22.24.0")] diff --git a/Source/Libs/AssemblyInfo.cs.in b/Source/Libs/AssemblyInfo.cs.in deleted file mode 100755 index 37a374aa1..000000000 --- a/Source/Libs/AssemblyInfo.cs.in +++ /dev/null @@ -1,5 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(false)] diff --git a/Source/Libs/AtkSharp/AtkSharp-api.raw b/Source/Libs/AtkSharp/AtkSharp-api.raw index 4be018fc8..78ab45951 100755 --- a/Source/Libs/AtkSharp/AtkSharp-api.raw +++ b/Source/Libs/AtkSharp/AtkSharp-api.raw @@ -6,7 +6,7 @@ Please DO NOT MODIFY THIS FILE, modify .metadata files instead. --> - + diff --git a/Source/Libs/AtkSharp/AtkSharp.csproj b/Source/Libs/AtkSharp/AtkSharp.csproj index cd6065d0f..fc56a1f8c 100755 --- a/Source/Libs/AtkSharp/AtkSharp.csproj +++ b/Source/Libs/AtkSharp/AtkSharp.csproj @@ -1,5 +1,4 @@ - true netstandard2.0 @@ -16,5 +15,7 @@ GLibSharp - + + + diff --git a/Source/Libs/AtkSharp/Class1.cs b/Source/Libs/AtkSharp/Class1.cs deleted file mode 100755 index d29e2217a..000000000 --- a/Source/Libs/AtkSharp/Class1.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace AtkSharp -{ - public class Class1 - { - } -} diff --git a/Source/Libs/AtkSharp/Global.cs b/Source/Libs/AtkSharp/Global.cs index 0424c87d7..0ea42072a 100755 --- a/Source/Libs/AtkSharp/Global.cs +++ b/Source/Libs/AtkSharp/Global.cs @@ -28,7 +28,7 @@ namespace Atk { public partial class Global { - [DllImport ("libatk-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libatk-1.0-0", CallingConvention = CallingConvention.Cdecl)] static extern uint atk_add_global_event_listener (GLib.Signal.EmissionHookNative hook, IntPtr event_type); public static uint AddGlobalEventListener (GLib.Signal.EmissionHook hook, string event_type) diff --git a/Source/Libs/AtkSharp/linux-x64/libatk-1.0-0.so b/Source/Libs/AtkSharp/linux-x64/libatk-1.0-0.so new file mode 100755 index 0000000000000000000000000000000000000000..3fcc72a74b18e0f7aae0cb2ab11c20987e487933 GIT binary patch literal 7240 zcmeHMYiJx*6h6r&ZTiTgu}#wlbku_FkB+g@M}+7mX_6@>ZH)=EV3*;dZ07PL}Y z2~K1v8yRB>|DrWYWNxSi_>`W~wC3~zw`L&@6I+ioI7{> zuOGfT`xdK|UP3E=GQX3PMj2H^mkG9%f6MsS*75bti$A{c-1VaeH(r>yRrAZWUv<=2 z8KR9W8zD?Y>EDn>h<3AVgfJ0%`FCFt{8`58XcZZCMnL@6vj%PhBr>DY)(YA-v*^Hfcot$giWG6F8m+T>CWbf_kvEzwcVmO(16S=;g_Ea{L z=yL{B2~SsCW5_r zQ&;!iwsw2Fx!v5MC(o>$BaMH8O8Y2toTt(CN#4?OdQ+54cu#P?59oDU`h5Uir}0J| zU*M3ZY7Nz&oFUn3(6kSicMde;!{v;E?)Y&3)>tQQR#~SjpI>2+_41@!KKF%n;!4$J zxREu{@-FN8t%=Il#isd=b?Sz@j$PWcOZC9q)R0-b=_TbeaJhC8`oCxvP~^+$9 z=R{D=2XUCu^0?Ojp=B-VUjI9Wdvkb1+z-0i+aEEu@J)29v5RjkO<}uYa)fUZxL^DA z5x&1*UxIjqupdFZg0OEvypj;VAijhU_aMHsuzx{(;XP9H5#CkQKZ5o}?w87b1&!dK z`5YpA+HsD3F!x_gIKM%>hU*%JA5!fI)e`P$eq}^%hoO73=p%g3#{LEE>lfU=J^Oq7 zW~wdcwSsQ(Ehb3v{+1VsPmRVW{g*$+?$tQ{KCq~07eCAR#*X_v-j7a&FN{x`aTynX zZ&WAz7*qBO^ZcrwP$ZT zqg)DtMOXL!w$^TYe`n{D9es9RYg=~*`~6epNSA%Q5>u%9B=w&_K}b5fi!xI*>aQAk zMJzJ&V`n6EM<<<(aj#kS;)i)8#SK*#Gr25A zCU1C}H!*nl|Ai!Zf_$q{tHSpOd~>MJ(4Q$XS$~_q#qh^>3S8=)LikQ25Aaapia4p< z0si=&6}UE(aru=gK7D%bJj%9o8EJz7_*%uGIxpPLSV! zTpNIYTd?#RsH*}#9`Z*%3NH0@KZVC1XQhmf^&=ku58Gq?=<^kB$Tt-6LEeD>KM31H z27jA|>wq8P_#yks`r(g!WlAQ+WT@x- z1ODLWSmpO84&H{AI3wy265BO@5Hu z@Lv_e;qT`-JATvMdVE6%ehn+{=O5OCxXAg$-2MIs^@|_FKw23RN#<9~|Dp`Y^ts0h H&#?dB4($36 literal 0 HcmV?d00001 diff --git a/Source/Libs/CairoSharp/AssemblyInfo.cs.in b/Source/Libs/CairoSharp/AssemblyInfo.cs.in deleted file mode 100755 index cd085cac2..000000000 --- a/Source/Libs/CairoSharp/AssemblyInfo.cs.in +++ /dev/null @@ -1,5 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly:AssemblyVersion("@CAIRO_API_VERSION@")] -[assembly:AssemblyDelaySign(false)] diff --git a/Source/Libs/CairoSharp/CairoSharp.csproj b/Source/Libs/CairoSharp/CairoSharp.csproj index 4c77bff7b..62f7436b7 100755 --- a/Source/Libs/CairoSharp/CairoSharp.csproj +++ b/Source/Libs/CairoSharp/CairoSharp.csproj @@ -1,5 +1,4 @@ - true netstandard2.0 @@ -11,5 +10,7 @@ ..\..\..\BuildOutput\Release - + + + diff --git a/Source/Libs/CairoSharp/Class1.cs b/Source/Libs/CairoSharp/Class1.cs deleted file mode 100755 index 7cd3f767a..000000000 --- a/Source/Libs/CairoSharp/Class1.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace CairoSharp -{ - public class Class1 - { - } -} diff --git a/Source/Libs/CairoSharp/NativeMethods.cs b/Source/Libs/CairoSharp/NativeMethods.cs index 20fa29998..1037ac589 100755 --- a/Source/Libs/CairoSharp/NativeMethods.cs +++ b/Source/Libs/CairoSharp/NativeMethods.cs @@ -41,7 +41,7 @@ namespace Cairo internal static class NativeMethods { - const string cairo = "libcairo-2.dll"; + const string cairo = "libcairo-2"; [DllImport (cairo, CallingConvention=CallingConvention.Cdecl)] internal static extern void cairo_append_path (IntPtr cr, IntPtr path); diff --git a/Source/Libs/CairoSharp/linux-x64/libcairo-2.so b/Source/Libs/CairoSharp/linux-x64/libcairo-2.so new file mode 100755 index 0000000000000000000000000000000000000000..f828c0df39ec128487d9dcb5b1d0a73c4c78b343 GIT binary patch literal 7240 zcmeHMU1%It6h50x+Vm$sjkZmHpraOSA3Byw|Ago!X_6@|{YS};YFDwy@0JNMhnOg2({5QM#9 z?z!hX=iHxj@9dm=@={lCcTFThC{cQngqy7OkeC*n-JlyxVswC3aJ`W>DBZe6(UMkL z3qgqtr6Xgk;3w9oSf++*fX?bE&1nj|8rBlKer?yU?Lc4G`k?iyS0Y)CJixqy(AKA%-<2q#9BZY!DIz!n6_4FR@ z=(P8kd(6FR;;O1)KjY6sh0Adh=V@Ydinp|eE@&gXCph2zdfk?OAAmP&yjA-bIQZEn zL-iC@OzVsd`@+j{r@*hF{3inH;zlO$f(0m3_KJ7Ti zKA8J&Ae`SI-pF|k!w;!;l$r?lG`}z^x5LoAS>#c^XJh|@`YlWD-=6*hel^vW^IA)H z`4$r_^8VIT@K2-0XZ)8x#val*ejk`sWk1&uzOmzekN2Zn;Y4Y`beVqI8LyPr8D_jvK8E6Xx8P2Uj+${=OtIK*#*Ryp zrND`iM9v;d=SG~gop5vcg6&M4rg$!MGM#jj33K1U{f}2xQpp?J$>*ISXH?vLkw)`Q zCTS-oGMOTq_&AmA38>n3_dt7Jm)&*bkYt1GL?LI7JK2P!d=4Ey(%yHtlTl6uL8GVl zXh(ameYCs#nXW;5u)U+Vi|zg?bEFeLUWzG{eUc1NASEOn-A9@!7W3zgyd)Nxg<{5a zMwq&JkB+02&ACZ)EIVP2Or+9@U8w{qZrmx1lbI-H+0vtK-jke4<_oD@Ho({{%O}&0 z7?7zFXQrDx?UJe1W+ulyUwbmo&7KTxHgqznIQN=kE3V9wX>O>@n8}GTGI_%@yotfX z|1UU+6XaWsTot}QpxZ-zhJL2VWcly>Ervb5Q=pRXl!EUx;s6gN&WIC9>;QXw&&pIQ z%DDW>l;ah|4Kc=~Z`jZ31}NeaR#8Rz@E402i8Wx4?<1(>l%-()&;uP}nZz#O@f`&< z#F$HX{vJw{&@$Lx(F1`ZUc&hBAJ(5`ds!3WvlDuQKsRC_O|`g;$_et@Pih6wZ_Aoq z19?@zXF~RfM?oc@?l0l-Cs`=tWBrH+K*Rc2Kl*%?8}bc>e-Jm|{|8}x@Stz9ZIjO) z@r5Owa)F-5E%LxGu|Rx}@ezmM|15ZqunyS4kMFastRMD>S7v2WTntq&R - + diff --git a/Source/Libs/GLibSharp/GLibSharp.csproj b/Source/Libs/GLibSharp/GLibSharp.csproj index 4c77bff7b..ee7be4555 100755 --- a/Source/Libs/GLibSharp/GLibSharp.csproj +++ b/Source/Libs/GLibSharp/GLibSharp.csproj @@ -1,5 +1,4 @@ - true netstandard2.0 @@ -11,5 +10,9 @@ ..\..\..\BuildOutput\Release - + + + + + diff --git a/Source/Libs/GLibSharp/Global.cs b/Source/Libs/GLibSharp/Global.cs index 46ebeac6e..0e35d776b 100755 --- a/Source/Libs/GLibSharp/Global.cs +++ b/Source/Libs/GLibSharp/Global.cs @@ -31,8 +31,8 @@ namespace GLib { //this is a static class private Global () {} - internal const string GLibNativeDll = "libglib-2.0-0.dll"; - internal const string GObjectNativeDll = "libgobject-2.0-0.dll"; + internal const string GLibNativeDll = "libglib-2.0-0"; + internal const string GObjectNativeDll = "libgobject-2.0-0"; internal static bool IsWindowsPlatform { get { diff --git a/Source/Libs/GLibSharp/linux-x64/libglib-2.0-0.so b/Source/Libs/GLibSharp/linux-x64/libglib-2.0-0.so new file mode 100755 index 0000000000000000000000000000000000000000..8459d1bd0854305575f6acfe40afa5dc356765d6 GIT binary patch literal 7240 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 E8?1Zzp#T5? literal 0 HcmV?d00001 diff --git a/Source/Libs/GLibSharp/linux-x64/libgthread-2.0-0.so b/Source/Libs/GLibSharp/linux-x64/libgthread-2.0-0.so new file mode 100755 index 0000000000000000000000000000000000000000..0245be6fc3e8c177d417235b945b2adb50cbfecb GIT binary patch literal 7240 zcmeHMTWB0*6h6r&ZFi8p<}4@CPZ^-k|`u@jR~}1m`<{jWN|NbcUGFB zHqffACD8W4%cB-l@I~;YrGhCf#TUT~wxS>bDMT%pB1-ik>pB1Y-)3gAk>Z0O>?u3v zKi@g$znuS{%=u4GboO*rR#XruMo*GR6IDLasuic#=mxV^+D%LNxt7)_+v<7Mf>u&1 z!HEoIBV#P#Uu&HbnH#DBKCP!TqdEL4*-HElYQKZp5B!|A2d`1R63KGp2RzC*YddhU z6?*!%7nkwwmm0KTANxrki>+@;&l4QW6rTtA7vo>|{sD4dJJwfwAR~^Kno_*~d_I7i-xkE32StUn1_%F{G&QpGUg15Ai-qhxJPjJ2u>UCTCeE{B|@g^N# z;E<>54b`KZA=zutOaPa64m2CU<&1*v1@Pe3SSRn)SZAwWT49j&%9K}G_`*7Qz2+L+ z$eL_lf2bK6_TF74W-cCau#V%BdurF;gj)o*I0d71qWi{a#sKGn_E zIrg`%&c&=Vv)0v_r>u$_)|Yc$6L(mlJ6tIpF4o^f%Q7~j{A1S1mRrlYH6Zh;wa&Ku z%u-?Xb$-rt7Yc=I^yyM&79ydMzW*m3xa2^uNy) zG9q8n1LHa{t&>>X;KfU7Im-x9mBmjIwI}|-5niI7+d%zy4Bdlx0U9oT`4)nHwoOYgZdcX zU$8G>JVw}$FkVI2w=iB!h+i0ALWp}9Us~M1Fuw2}Df$@iD(W9$`x5s{Wxs;PaL@t{ zF+S}$#{ro8uO*z{FkZ)X4I>Dtc8ux?_q3ogCbz@Ly;<}zzGq|q!uE{|?%%%s13@#@ zmh)Ogclj0*CV77=OT?#6<5R)QA7c+`9Dg5JRJ4nq6?|jI{T}Z}m%<`-O2{Z2oU4`_lVWYQ66%`-SoRSm6uz>l1B{b+M@EGk#W-*smWLHLpUDD^=%M%6O@M)-c|{9?|;B28~DO`RF43v@u?)t~1DZsd@|zXT6-49~m)+X}-i_ zdntQZiYz%UiNrJZXfiY8B<;AD$>wY)e~gARsiR5PbK~aDJ-Z$+ZKR4fwv){|<6KMe zvg0(8byBV!&!=KYvwI^h1+g*Kay`6UF{=HHSvg5goJ?5n2Qu5h*cz;{(z79sY z6aNKNcBl-KcQlfbaWqOrqjwBm)&)uW2$IEuUBM2YCbj{~&4)8T<|Q ztq=Gkzp$iJCfNDXybSzZR!HnIKJpO!KMUR?tOI_C}k>xVz`m1&t2lcApT5BP(B z#Hye_A+ON`;GCcb_<>)J_#^*m(*CfE`a}Md8)Ad`*$JBN*5eyG@T*z*2>-Ai#6`|0<{tDvq+k4D45XD2kz{_Q{IAG>OrQI#_>B7h E4a|%A`2YX_ literal 0 HcmV?d00001 diff --git a/Source/Libs/GdkSharp/Class1.cs b/Source/Libs/GdkSharp/Class1.cs deleted file mode 100755 index d3c0869f4..000000000 --- a/Source/Libs/GdkSharp/Class1.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace GdkSharp -{ - public class Class1 - { - } -} diff --git a/Source/Libs/GdkSharp/GdkSharp-api.raw b/Source/Libs/GdkSharp/GdkSharp-api.raw index 4ba1a40d5..c26e90ab7 100755 --- a/Source/Libs/GdkSharp/GdkSharp-api.raw +++ b/Source/Libs/GdkSharp/GdkSharp-api.raw @@ -6,7 +6,7 @@ Please DO NOT MODIFY THIS FILE, modify .metadata files instead. --> - + @@ -5301,7 +5301,7 @@ - + diff --git a/Source/Libs/GdkSharp/GdkSharp.csproj b/Source/Libs/GdkSharp/GdkSharp.csproj index 04bc7a74d..2b6cad7b0 100755 --- a/Source/Libs/GdkSharp/GdkSharp.csproj +++ b/Source/Libs/GdkSharp/GdkSharp.csproj @@ -25,5 +25,9 @@ PangoSharp + + + + diff --git a/Source/Libs/GdkSharp/Global.cs b/Source/Libs/GdkSharp/Global.cs index 357c799c3..f25b8b822 100755 --- a/Source/Libs/GdkSharp/Global.cs +++ b/Source/Libs/GdkSharp/Global.cs @@ -26,7 +26,7 @@ namespace Gdk { public partial class Global { - internal const string GdkNativeDll = "libgdk-3-0.dll"; + internal const string GdkNativeDll = "libgdk-3-0"; [DllImport (Global.GdkNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gdk_list_visuals (); diff --git a/Source/Libs/GdkSharp/PixbufLoader.cs b/Source/Libs/GdkSharp/PixbufLoader.cs index 8ac99fdee..6817bb213 100755 --- a/Source/Libs/GdkSharp/PixbufLoader.cs +++ b/Source/Libs/GdkSharp/PixbufLoader.cs @@ -28,7 +28,7 @@ namespace Gdk { public partial class PixbufLoader { - [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgobject-2.0-0", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_object_ref (IntPtr handle); internal IntPtr PixbufHandle { diff --git a/Source/Libs/GdkSharp/Pixdata.cs b/Source/Libs/GdkSharp/Pixdata.cs index 266d93651..cb9f31d1b 100755 --- a/Source/Libs/GdkSharp/Pixdata.cs +++ b/Source/Libs/GdkSharp/Pixdata.cs @@ -23,7 +23,7 @@ namespace Gdk { public partial struct Pixdata { - [DllImport ("libgdk_pixbuf-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk_pixbuf-2.0-0", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gdk_pixdata_serialize (ref Gdk.Pixdata raw, out uint len); public byte [] Serialize () { diff --git a/Source/Libs/GdkSharp/Window.cs b/Source/Libs/GdkSharp/Window.cs index 22898d52a..5c5c772ad 100755 --- a/Source/Libs/GdkSharp/Window.cs +++ b/Source/Libs/GdkSharp/Window.cs @@ -77,7 +77,7 @@ namespace Gdk { } } - [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgobject-2.0-0", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_object_ref (IntPtr raw); [DllImport (Global.GdkNativeDll, CallingConvention = CallingConvention.Cdecl)] diff --git a/Source/Libs/GdkSharp/linux-x64/libgdk-3-0.so b/Source/Libs/GdkSharp/linux-x64/libgdk-3-0.so new file mode 100755 index 0000000000000000000000000000000000000000..e3476e74df48fb49c33dec84141ca5b1df3a5e43 GIT binary patch literal 7240 zcmeHMU1%It6h50x+Vm$sjkZmHpi?c_K6ETCZCW9^n>5K3lD5VKS};r}yPITjf9mc; zn&MBO3avF@`ylnf7av6MrQl0T3#POb6$M2^@j(Joh*~g3l&X;RoICg1%uF^?d=P}a zVeYx-JLlY=bMNe&d-6(GZ+A^3LMTysl7ySA^^lkroL#3IOk%X3mT|qF)+yb(1<|5b zMhiiS45cGuEaNBEs92_kYJkq@Da~pMyBgLKyQA9fsI~)rQ|p7)t6qs@Ir0Dx(`{N0 zRCJ|0eaB78cn?~dwPHWpNgqqCZ(7e26w4Hwhxv)}({p%`E^gf(Z~L_Qa{niv{T00) zkGEUHyIG{<;##qj`JJ6MB2*h&A=q+$R`Ao&_4VCrKU{qA+vksMzB+ZU@#n98(OzR= zsBC852w}oX|AsU|Wk2&q2otuSpGPX-6O1*}8Zw%VfbgfbF zhfbJsUoZwmq87=j@{E6kOXTJDp3rWREZ*`_Mq2olF%{qv@iXDh%{>X7ahz zfHRy)d9un9J8{a94xCK-bc!z4 zrrO_T*`PI5cR_Rx+_%o%aW}9@hc;;#D$R_TO)D=CsdT$;hMSS0o7~kwqF*%?^`Rd}Sb<2bJ+RvHva5}%2dW;ZdZ6lost2kb zsCwXk>jA`_h%*sGI(kLmC6<-4+9T!oy+QMc+c#()@$DwfBW~TOdBnMLZ;=A|Z}TNJ z)D=B2t^+eVh{auQPRmz%=JbxHt2AxZRPItzuIOMFYgP{=+BqD@h@q84g}SF z;D--W(ng_k*6!&L@oRd=uSawDFx~S6HtSALW|_?$>^Kl_-rRkDz{q`=!!fMPoQ6eI&TkNJiwPEae`_lEr%~h6{>vX@TQ!c~2WC}i<2u4OcHHmresn8*v466R%eeTxQJrul zd4)&?KQA@^OG>};epOoUdrE(?KR;CX;{Cd=^|3ByRr#3fNQM3So^eBI1gk%pt&}g3 zR9&S!$8yFi^|OxgX0{0DS2k%pJkQ6L=qJv2rM%7%+PK+e;_Gl(Q>}2eun=ce?XZ#c;^4XJ_l$%PL`wq12sjQ@uH?~tKI1`*vaSIbP zQgE^}o$NReMuEPf<8)PSod3(&sB_-u^@c7|)-=R)MITZwr zp57xJ@m~8#clR@01NK0?qqmFg{wZ^$6F**xDU^MZ3{W5?Bpp3Knkg3Z=Z(B17MaC~ ztm_OjbqgLHLo1heQ|4%H+#DWHXOcV9NmAUHQye2RIgw*akGcg<@9z&>IB09s_Br#bs1Zkl%h%D}a7i z*7O?4s{%e9vPV1$D*1GO36DR?LKz?HM?3%;*2ntM=j+^%Zz%kOxB>q^2Z_DI+#Dci^dZ6GFN}O#f)IP{2;eszb1sk z-cNCM{Hpu)_=a};S{6Ra57q;}$oa(F{r1Q7i=V(iS{PzU=2yx7nheP0bB~nku>If7 C#Px&# literal 0 HcmV?d00001 diff --git a/Source/Libs/GdkSharp/linux-x64/libgdk_pixbuf-2.0-0.so b/Source/Libs/GdkSharp/linux-x64/libgdk_pixbuf-2.0-0.so new file mode 100755 index 0000000000000000000000000000000000000000..a9ee0d021a490f3d6f7fa851a920b21b35a6a06a GIT binary patch literal 7240 zcmeHMU1%It6h50x()1@y8f}~YKu0auK6DI~wy6-^Buz4fq^)TJEf|K$?j~8>pSn9M zNf9horL_cqKvAEHhzh<4zE~=l(o%dWR-`IENJI)z3#N!teaL#wo%kc>DDZW7WJ}P z2ufrq9T}sRuf$r#GBs2ObXq^sjHa-wVlA;dqV0}oJJ46OK4_itN+i>f3wW4r*Lt9$ zEA8={Zc4_x+t#QR``J!>EH%F={hXkfrr6xeSDde&Lxc4GyVnP^FFV!U*S^?(H1WgN zqc;jH@#GR(v6JUJGiAi6I4aJ<^F|00wx6&2Bk<=KYov8#G#UZv>k4n89U=Uz#>4s&-zKV~F)Wbw zCfl=#R?!pT&1l=BxkBD9xlYlwZL%}@j7#ghe$(P{5Ccbj|k9Ehqo-uUxC;l{a(eO2C^;iavjx3vx47wq#Rdj6JvFMu~{ zyjjN?IQZ!XLwS_FBx{Z~MoNt+4dG=gVtott0LQf$2xn{-NdRLTD5+tGCg88YpN=sNTijVUN0_SVL zJkIA9tV0A<`>50R2Vupi#*QfY^+~UziH9=+ta_t zucrF4U#sahpJIYd-ruT-_^j3Vl>gAj*nJwu?*p@{?c;llPwY6~BeDQjHs`W81W>x!~@3DyW`krw^X#{V7 zF&kAcky2e$onr;#QGPZs-pCf=`pOoKhoAGoCH%BA9#z*FVmzuIL&>6Ba?2wlW|9_4 zEVi4olTu_UaXlneut&3nVJB;++(NNrJLPdo7IG)DX*ZoR_wL{KaI}&t-q=pD=uB`S z#VtZ>xRom|FZ}01}yABI)DWplWk$)vi6;)A>a|33)pg9m+sZ5w>{ z$S*8$$_;uRx4;8`hXoRQjE_77|7XE_gn7UYar}^NW&W^7zA`Nj#m!Lng&XWaKVp&J zo{-n*0kBWt0d}AlLiWginzcRj!uH@l - + diff --git a/Source/Libs/GioSharp/GioSharp.csproj b/Source/Libs/GioSharp/GioSharp.csproj index cd6065d0f..b7fb87199 100755 --- a/Source/Libs/GioSharp/GioSharp.csproj +++ b/Source/Libs/GioSharp/GioSharp.csproj @@ -16,5 +16,8 @@ GLibSharp + + + diff --git a/Source/Libs/GioSharp/linux-x64/libgio-2.0-0.so b/Source/Libs/GioSharp/linux-x64/libgio-2.0-0.so new file mode 100755 index 0000000000000000000000000000000000000000..15aac75fbb80da8f1970bd98f2a5bbf55dbd9aaa GIT binary patch literal 7240 zcmeHMU1%It6h50x+Vm$)8f}~YKu24!edrik`zJ*6(bOD%+ZQ)q++^ zE5V5jWg}xO;a}@2B{DZu1AJOfX-0GSRk4-$9npSAv>*5z+8(@C^-3hmkst6d->U7v z#a8I)n{HgjyI*S1hJEZOeJr-VNj*<+EK__QI~`j*B!?*7L%6`qWdI_!g$^6bu8WE~)T_)I4{w?EQd*^qzF8}=2i$9z^y6Muy?Nz_s_+3Yh zl_A>1vJt{Wl>QBAglHejMhFwJkADxB!CzpkfmV~zU<9P58F$88>yC# zV}o>Way%PpIX$b-n}&&OdnBFB*m>8+kJI zWiyF>XDF5MbmcX6?35!NIH~061f`NgBgyQJoo2I{&zj95$E3A~>_psg9iG5YKJSgs zP$o{@JqO!6?49OLb9ZT$RK=0TKS8B^k~z*(VMCI)w2I!=E_hFHzK`g2Tl#$f-k|X& z9be#(r|S*XqnshxYtW1jmv;^{>%--Yg6{cn|JGP%Z`E2CYF=7lkoD@MTUESnoxNH+ z1vj!LTHa&bfHhI`rr7MiXPv+4u4k8a?NT>boE|poH@~8M2B+#bx6-`K{>Q{{Vt1eF zX8RobTUX|y*7;fM%FL5ik38I@|L7a&8UCeCn(V zEx)oc1JDQ96;4i~$K%~|lSZ!(9l}053l?YTKP>Db# z0+k3y&}kx%L=XZSSf$6(=zh*^;$-LyHU%?TQ_JKd9K`BgrNUp zu9y}1q8=F6foYw@;x0F<^~=SW>3xsU3eB4|m%EhEMV;(ooR2+N-Ls?#`?;bw{=3?q z6G1f}#9>y;<68fxmbIvR{qGp=&EXMoKj`l0c-+{=H_`3JUcRw3hwaMAQNBswe(l#s z`Tl}^3F1-0egyGq!oCIZ8bbVn_!2_ggZR?Y{sr-c_ejx4c~?>Y2-=sqUn=_*G>U`f zbBOY3$2s=F+Ok+NSH&(9RTaKFCL_E;B-ioWJ&q|AQ(#JHg>f{(vg zELSg)QeC+^$5O`2^|O}o2KEToS2k)qJkLiK>8FkHa&?_S#>>@XD3){cZee)XjM03F z#dgznOo}XdE{nvo_DCu_+>j)EKF%oLu#hZ4oL4*nPQK;X!iFh1gk^=H^$)`a}*xZWV}br?uLD(KL z_&e-d@AF4~VM(V<76G z|J5NJ{(g?L<2T)>$2WA~*RXO6|F9m!Mb0PY?)N{cU;G#b(#nuXGQV>Emt{bvZ#-6d HhW-BrJ~#K# literal 0 HcmV?d00001 diff --git a/Source/Libs/GtkSharp/Class1.cs b/Source/Libs/GtkSharp/Class1.cs deleted file mode 100755 index 1367c0c30..000000000 --- a/Source/Libs/GtkSharp/Class1.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace GtkSharp -{ - public class Class1 - { - } -} diff --git a/Source/Libs/GtkSharp/Global.cs b/Source/Libs/GtkSharp/Global.cs index b5ae6c364..9cd528f89 100755 --- a/Source/Libs/GtkSharp/Global.cs +++ b/Source/Libs/GtkSharp/Global.cs @@ -20,7 +20,7 @@ namespace Gtk { public partial class Global { - internal const string GtkNativeDll = "libgtk-3-0.dll"; + internal const string GtkNativeDll = "libgtk-3-0"; public static bool ShowUri (string uri) { diff --git a/Source/Libs/GtkSharp/GtkSharp-api.raw b/Source/Libs/GtkSharp/GtkSharp-api.raw index 56ae9d1a5..e47061d17 100755 --- a/Source/Libs/GtkSharp/GtkSharp-api.raw +++ b/Source/Libs/GtkSharp/GtkSharp-api.raw @@ -6,7 +6,7 @@ Please DO NOT MODIFY THIS FILE, modify .metadata files instead. --> - + diff --git a/Source/Libs/GtkSharp/GtkSharp.csproj b/Source/Libs/GtkSharp/GtkSharp.csproj index 930ade95a..fa5f9fe40 100755 --- a/Source/Libs/GtkSharp/GtkSharp.csproj +++ b/Source/Libs/GtkSharp/GtkSharp.csproj @@ -31,5 +31,7 @@ PangoSharp - - + + + + \ No newline at end of file diff --git a/Source/Libs/GtkSharp/linux-x64/libgtk-3-0.so b/Source/Libs/GtkSharp/linux-x64/libgtk-3-0.so new file mode 100755 index 0000000000000000000000000000000000000000..cde1f5254900a2a7ea9e68da0c689f329f255271 GIT binary patch literal 7240 zcmeHMU1%It6h50x+B9u`8f}~YfTI>{A37~9{l#d0nq&$|TVnz(7^jonO|rN@b$3>p z;!m&&{V`yDkow?@4^r?&(1(@^O=&5<2#Sc}g9M}ywP1=U)rYL-+_~RoW-^iDgCOLD zx#ynWd+)h-cFsL{t*f`YDi$L^oSq_~CaOJ7n--j1t2>O^Xdf-(b{(x%x;68n1-*3o0Rb$6q>YRKii3q#nv~a=Lw8uip|6P#QEttJV>9G4qQKQ?DF~T&tKZ|g2tKU%viTM~#Ic z*u=CE;t47K4e5knAJayNCuBcAk45munb$0H_+dxR0$hX(rWWU7!FO&8r%VW6)wlh36F zoZ(E$lSNDH#3@G{IGOb66lK!GqwWjacA3SzxkIRg^!AXQN;0;GrQZken>4>g#}|Ci z(~XAmC}&9a8ZhJI%R2{{_3`D50`B|x{;jdj+^w}P)V#9NAnVO3x2pW5b>>#>O_-52 z+4>&K2Cd1Oi=wmtzIE=7yPi!tv`PI?d3wZbeB=#fGjy}@kv5vA+5WgFPVVkkZnn;` zy>(+QZk?O8Zp=Jw#co?)&ABb?Fs2=@5{HZVn`m9ZYE;^8ooW5Hj(dYLpL**;>(5M; z*WBWErl(vk->#YFZfxi#yE;hpo5rF(^wS6{5UI5XR$E#2QfDawOA%O#z)}R3BCr&J zr3n0QBY?aUc_wm5N3RI9otwMeZ8iU-)_`2^41NSMxHD876HhApDU}O zuIPbr9hlZhEbel%T3+Xw)B75))VM`sxl0LL(aA2xx$LpkJxjXKpDTOgU())V2&(xY z4zrqmRm=a>v?jIJ{|@2a93Bz(gPzXL1I8A^GyQxYrj0s_ZRF- zkRK=PN047l*ta0Rh7i9Xe;Fa}LH_c}{ss99?~x*p^RA-)5!8>kUn>2TG=_ubGl=tP z$2s<~*?&FZ{08|AT-PxCEY*)wBjKLr7slmw7`iu$JkIxQ>|ap7dBOeL(|^dXruuST ztLYx!VuB#=Z&gHm8Z>{(fB9qHqneN32PPHl_?^o1%KUDe)h@W=mN7Z$Pm>*S-p+vzgx}}j3GePqu7Te9* z2`RD^xiFH<+oPHMu#>TqZoW{oozf{v}oxA%3~U55`!HONjD^Y)mNOG?S-;PJ!leTO=k%cUS_ z^zs6QUMB-gv8MUl$qMv{BTj;V1Gpq1dMzM<0F1pe~#^CO~}tq=nVp1hk-QK;tE$zkl%hnD*%6A z(eyf~tAc$xWRH9lSnBD12#-I(LKz?HM?L@?*2ntc^E`Lt8;bZKZ@~W#!up_r-(}lI zpFQ#mOPn%5&!gsP@IPRI#2(`#55fOg@E&0uutOX_Vp~~1?2)fb%cK|#)y_At2mY8v zetSY*qX)n_fd|+DUk%wK|7p?o&@e>$G3qvHy{G#ly$$$)Bc&O5b?f(YS CdGwwD literal 0 HcmV?d00001 diff --git a/Source/Libs/PangoSharp/AttrBackground.cs b/Source/Libs/PangoSharp/AttrBackground.cs index d0538afdd..c7ff77e5a 100755 --- a/Source/Libs/PangoSharp/AttrBackground.cs +++ b/Source/Libs/PangoSharp/AttrBackground.cs @@ -23,7 +23,7 @@ namespace Pango { public class AttrBackground : Attribute { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attr_background_new (ushort red, ushort green, ushort blue); public AttrBackground (ushort red, ushort green, ushort blue) : this (pango_attr_background_new (red, green, blue)) {} diff --git a/Source/Libs/PangoSharp/AttrFallback.cs b/Source/Libs/PangoSharp/AttrFallback.cs index 9f23fef77..c9c34aace 100755 --- a/Source/Libs/PangoSharp/AttrFallback.cs +++ b/Source/Libs/PangoSharp/AttrFallback.cs @@ -23,7 +23,7 @@ namespace Pango { public class AttrFallback : Attribute { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attr_fallback_new (bool fallback); public AttrFallback (bool fallback) : this (pango_attr_fallback_new (fallback)) {} diff --git a/Source/Libs/PangoSharp/AttrFamily.cs b/Source/Libs/PangoSharp/AttrFamily.cs index aa2a856bf..2e588cacf 100755 --- a/Source/Libs/PangoSharp/AttrFamily.cs +++ b/Source/Libs/PangoSharp/AttrFamily.cs @@ -23,7 +23,7 @@ namespace Pango { public class AttrFamily : Attribute { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attr_family_new (IntPtr family); public AttrFamily (string family) : base (NewAttrFamily (family)) {} diff --git a/Source/Libs/PangoSharp/AttrFontDesc.cs b/Source/Libs/PangoSharp/AttrFontDesc.cs index 0fe49374e..c7ebafaa3 100755 --- a/Source/Libs/PangoSharp/AttrFontDesc.cs +++ b/Source/Libs/PangoSharp/AttrFontDesc.cs @@ -23,10 +23,10 @@ namespace Pango { public class AttrFontDesc : Attribute { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attr_font_desc_new (IntPtr font_desc); - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_font_description_copy(IntPtr raw); public AttrFontDesc (Pango.FontDescription font_desc) : this (pango_attr_font_desc_new (pango_font_description_copy (font_desc.Handle))) {} diff --git a/Source/Libs/PangoSharp/AttrForeground.cs b/Source/Libs/PangoSharp/AttrForeground.cs index b02f641fe..b9259d8e6 100755 --- a/Source/Libs/PangoSharp/AttrForeground.cs +++ b/Source/Libs/PangoSharp/AttrForeground.cs @@ -23,7 +23,7 @@ namespace Pango { public class AttrForeground : Attribute { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attr_foreground_new (ushort red, ushort green, ushort blue); public AttrForeground (ushort red, ushort green, ushort blue) : this (pango_attr_foreground_new (red, green, blue)) {} diff --git a/Source/Libs/PangoSharp/AttrGravity.cs b/Source/Libs/PangoSharp/AttrGravity.cs index dc1c3fdca..1db9caf12 100755 --- a/Source/Libs/PangoSharp/AttrGravity.cs +++ b/Source/Libs/PangoSharp/AttrGravity.cs @@ -23,7 +23,7 @@ namespace Pango { public class AttrGravity : Attribute { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attr_gravity_new (int gravity); public AttrGravity (Gravity gravity) : this (pango_attr_gravity_new ((int) gravity)) {} diff --git a/Source/Libs/PangoSharp/AttrGravityHint.cs b/Source/Libs/PangoSharp/AttrGravityHint.cs index f37e11306..804aeef16 100755 --- a/Source/Libs/PangoSharp/AttrGravityHint.cs +++ b/Source/Libs/PangoSharp/AttrGravityHint.cs @@ -23,7 +23,7 @@ namespace Pango { public class AttrGravityHint : Attribute { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attr_gravity_hint_new (int hint); public AttrGravityHint (GravityHint hint) : this (pango_attr_gravity_hint_new ((int) hint)) {} diff --git a/Source/Libs/PangoSharp/AttrIterator.cs b/Source/Libs/PangoSharp/AttrIterator.cs index 416bfb347..c371ca948 100755 --- a/Source/Libs/PangoSharp/AttrIterator.cs +++ b/Source/Libs/PangoSharp/AttrIterator.cs @@ -25,7 +25,7 @@ namespace Pango { public partial class AttrIterator { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern void pango_attr_iterator_get_font(IntPtr raw, IntPtr desc, out IntPtr language, out IntPtr extra_attrs); public void GetFont (out Pango.FontDescription desc, out Pango.Language language, out Pango.Attribute[] extra_attrs) @@ -46,7 +46,7 @@ namespace Pango { extra_attrs [i++] = Pango.Attribute.GetAttribute (raw_attr); } - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attr_iterator_get_attrs (IntPtr raw); public Pango.Attribute[] Attrs { diff --git a/Source/Libs/PangoSharp/AttrLanguage.cs b/Source/Libs/PangoSharp/AttrLanguage.cs index 49b5f3482..11ba85bed 100755 --- a/Source/Libs/PangoSharp/AttrLanguage.cs +++ b/Source/Libs/PangoSharp/AttrLanguage.cs @@ -23,7 +23,7 @@ namespace Pango { public class AttrLanguage : Attribute { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attr_language_new (IntPtr language); public AttrLanguage (Pango.Language language) : this (pango_attr_language_new (language.Handle)) {} diff --git a/Source/Libs/PangoSharp/AttrLetterSpacing.cs b/Source/Libs/PangoSharp/AttrLetterSpacing.cs index 34e23f2c0..63b99c730 100755 --- a/Source/Libs/PangoSharp/AttrLetterSpacing.cs +++ b/Source/Libs/PangoSharp/AttrLetterSpacing.cs @@ -23,7 +23,7 @@ namespace Pango { public class AttrLetterSpacing : Attribute { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attr_letter_spacing_new (int letter_spacing); public AttrLetterSpacing (int letter_spacing) : this (pango_attr_letter_spacing_new (letter_spacing)) {} diff --git a/Source/Libs/PangoSharp/AttrList.cs b/Source/Libs/PangoSharp/AttrList.cs index f9870ba54..b9eb15844 100755 --- a/Source/Libs/PangoSharp/AttrList.cs +++ b/Source/Libs/PangoSharp/AttrList.cs @@ -25,10 +25,10 @@ namespace Pango { public partial class AttrList { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attribute_copy (IntPtr raw); - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern void pango_attr_list_insert (IntPtr raw, IntPtr attr); public void Insert (Pango.Attribute attr) @@ -36,7 +36,7 @@ namespace Pango { pango_attr_list_insert (Handle, pango_attribute_copy (attr.Handle)); } - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern void pango_attr_list_insert_before (IntPtr raw, IntPtr attr); public void InsertBefore (Pango.Attribute attr) diff --git a/Source/Libs/PangoSharp/AttrRise.cs b/Source/Libs/PangoSharp/AttrRise.cs index 55eb732f4..f6291aeb7 100755 --- a/Source/Libs/PangoSharp/AttrRise.cs +++ b/Source/Libs/PangoSharp/AttrRise.cs @@ -23,7 +23,7 @@ namespace Pango { public class AttrRise : Attribute { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attr_rise_new (int rise); public AttrRise (int rise) : this (pango_attr_rise_new (rise)) {} diff --git a/Source/Libs/PangoSharp/AttrScale.cs b/Source/Libs/PangoSharp/AttrScale.cs index 8055c7982..e429ceca6 100755 --- a/Source/Libs/PangoSharp/AttrScale.cs +++ b/Source/Libs/PangoSharp/AttrScale.cs @@ -23,7 +23,7 @@ namespace Pango { public class AttrScale : Attribute { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attr_scale_new (double scale); public AttrScale (double scale) : this (pango_attr_scale_new (scale)) {} diff --git a/Source/Libs/PangoSharp/AttrShape.cs b/Source/Libs/PangoSharp/AttrShape.cs index 090afb674..13291aee9 100755 --- a/Source/Libs/PangoSharp/AttrShape.cs +++ b/Source/Libs/PangoSharp/AttrShape.cs @@ -23,7 +23,7 @@ namespace Pango { public class AttrShape : Attribute { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attr_shape_new (ref Pango.Rectangle ink_rect, ref Pango.Rectangle logical_rect); public AttrShape (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect) : this (pango_attr_shape_new (ref ink_rect, ref logical_rect)) {} diff --git a/Source/Libs/PangoSharp/AttrSize.cs b/Source/Libs/PangoSharp/AttrSize.cs index f21bae40c..e4ccbfce8 100755 --- a/Source/Libs/PangoSharp/AttrSize.cs +++ b/Source/Libs/PangoSharp/AttrSize.cs @@ -23,10 +23,10 @@ namespace Pango { public class AttrSize : Attribute { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attr_size_new (int size); - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attr_size_new_absolute (int size); public AttrSize (int size) : this (pango_attr_size_new (size)) {} diff --git a/Source/Libs/PangoSharp/AttrStretch.cs b/Source/Libs/PangoSharp/AttrStretch.cs index ec39997aa..c8d4b2469 100755 --- a/Source/Libs/PangoSharp/AttrStretch.cs +++ b/Source/Libs/PangoSharp/AttrStretch.cs @@ -23,7 +23,7 @@ namespace Pango { public class AttrStretch : Attribute { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attr_stretch_new (Pango.Stretch stretch); public AttrStretch (Pango.Stretch stretch) : this (pango_attr_stretch_new (stretch)) {} diff --git a/Source/Libs/PangoSharp/AttrStrikethrough.cs b/Source/Libs/PangoSharp/AttrStrikethrough.cs index 46b2b4301..c66006904 100755 --- a/Source/Libs/PangoSharp/AttrStrikethrough.cs +++ b/Source/Libs/PangoSharp/AttrStrikethrough.cs @@ -23,7 +23,7 @@ namespace Pango { public class AttrStrikethrough : Attribute { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attr_strikethrough_new (bool strikethrough); public AttrStrikethrough (bool strikethrough) : this (pango_attr_strikethrough_new (strikethrough)) {} diff --git a/Source/Libs/PangoSharp/AttrStrikethroughColor.cs b/Source/Libs/PangoSharp/AttrStrikethroughColor.cs index 3add21fcd..da6df9a28 100755 --- a/Source/Libs/PangoSharp/AttrStrikethroughColor.cs +++ b/Source/Libs/PangoSharp/AttrStrikethroughColor.cs @@ -23,7 +23,7 @@ namespace Pango { public class AttrStrikethroughColor : Attribute { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attr_strikethrough_color_new (ushort red, ushort green, ushort blue); public AttrStrikethroughColor (ushort red, ushort green, ushort blue) : this (pango_attr_strikethrough_color_new (red, green, blue)) {} diff --git a/Source/Libs/PangoSharp/AttrStyle.cs b/Source/Libs/PangoSharp/AttrStyle.cs index eeaa9fa0b..a60b77958 100755 --- a/Source/Libs/PangoSharp/AttrStyle.cs +++ b/Source/Libs/PangoSharp/AttrStyle.cs @@ -23,7 +23,7 @@ namespace Pango { public class AttrStyle : Attribute { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attr_style_new (Pango.Style style); public AttrStyle (Pango.Style style) : this (pango_attr_style_new (style)) {} diff --git a/Source/Libs/PangoSharp/AttrUnderline.cs b/Source/Libs/PangoSharp/AttrUnderline.cs index aaaf71c98..d2b3a846c 100755 --- a/Source/Libs/PangoSharp/AttrUnderline.cs +++ b/Source/Libs/PangoSharp/AttrUnderline.cs @@ -23,7 +23,7 @@ namespace Pango { public class AttrUnderline : Attribute { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attr_underline_new (Pango.Underline underline); public AttrUnderline (Pango.Underline underline) : this (pango_attr_underline_new (underline)) {} diff --git a/Source/Libs/PangoSharp/AttrUnderlineColor.cs b/Source/Libs/PangoSharp/AttrUnderlineColor.cs index a9ccf8d19..0840b23ea 100755 --- a/Source/Libs/PangoSharp/AttrUnderlineColor.cs +++ b/Source/Libs/PangoSharp/AttrUnderlineColor.cs @@ -23,7 +23,7 @@ namespace Pango { public class AttrUnderlineColor : Attribute { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attr_underline_color_new (ushort red, ushort green, ushort blue); public AttrUnderlineColor (ushort red, ushort green, ushort blue) : this (pango_attr_underline_color_new (red, green, blue)) {} diff --git a/Source/Libs/PangoSharp/AttrVariant.cs b/Source/Libs/PangoSharp/AttrVariant.cs index dfd769aa1..53aca0fc1 100755 --- a/Source/Libs/PangoSharp/AttrVariant.cs +++ b/Source/Libs/PangoSharp/AttrVariant.cs @@ -23,7 +23,7 @@ namespace Pango { public class AttrVariant : Attribute { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attr_variant_new (Pango.Variant variant); public AttrVariant (Pango.Variant variant) : this (pango_attr_variant_new (variant)) {} diff --git a/Source/Libs/PangoSharp/AttrWeight.cs b/Source/Libs/PangoSharp/AttrWeight.cs index 26420d8ef..9d7a416c2 100755 --- a/Source/Libs/PangoSharp/AttrWeight.cs +++ b/Source/Libs/PangoSharp/AttrWeight.cs @@ -23,7 +23,7 @@ namespace Pango { public class AttrWeight : Attribute { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attr_weight_new (Pango.Weight weight); public AttrWeight (Pango.Weight weight) : this (pango_attr_weight_new (weight)) {} diff --git a/Source/Libs/PangoSharp/Attribute.cs b/Source/Libs/PangoSharp/Attribute.cs index 39a4c62fe..3f6114ff6 100755 --- a/Source/Libs/PangoSharp/Attribute.cs +++ b/Source/Libs/PangoSharp/Attribute.cs @@ -93,7 +93,7 @@ namespace Pango { Dispose (); } - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern void pango_attribute_destroy (IntPtr raw); public void Dispose () @@ -149,14 +149,14 @@ namespace Pango { } } - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_attribute_copy (IntPtr raw); public Pango.Attribute Copy () { return GetAttribute (pango_attribute_copy (raw)); } - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern bool pango_attribute_equal (IntPtr raw1, IntPtr raw2); public bool Equal (Pango.Attribute attr2) { diff --git a/Source/Libs/PangoSharp/Class1.cs b/Source/Libs/PangoSharp/Class1.cs deleted file mode 100755 index 953c14733..000000000 --- a/Source/Libs/PangoSharp/Class1.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace PangoSharp -{ - public class Class1 - { - } -} diff --git a/Source/Libs/PangoSharp/Context.cs b/Source/Libs/PangoSharp/Context.cs index 5a978d64f..a3c79cc14 100755 --- a/Source/Libs/PangoSharp/Context.cs +++ b/Source/Libs/PangoSharp/Context.cs @@ -25,7 +25,7 @@ namespace Pango { public partial class Context { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern void pango_context_list_families(IntPtr raw, out IntPtr families, out int n_families); public FontFamily [] Families { @@ -46,7 +46,7 @@ namespace Pango { } } - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern void pango_context_list_families(IntPtr raw, IntPtr families, out int n_families); [Obsolete] diff --git a/Source/Libs/PangoSharp/Coverage.cs b/Source/Libs/PangoSharp/Coverage.cs index e9008e932..b37189a2d 100755 --- a/Source/Libs/PangoSharp/Coverage.cs +++ b/Source/Libs/PangoSharp/Coverage.cs @@ -25,7 +25,7 @@ namespace Pango { public partial class Coverage { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern void pango_coverage_to_bytes (IntPtr raw, out IntPtr bytes, out int n_bytes); public void ToBytes(out byte[] bytes) diff --git a/Source/Libs/PangoSharp/FontFamily.cs b/Source/Libs/PangoSharp/FontFamily.cs index 77fd79ba3..2b46a317b 100755 --- a/Source/Libs/PangoSharp/FontFamily.cs +++ b/Source/Libs/PangoSharp/FontFamily.cs @@ -25,7 +25,7 @@ namespace Pango { public partial class FontFamily { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern void pango_font_family_list_faces(IntPtr raw, out IntPtr faces, out int n_faces); public FontFace [] Faces { @@ -46,7 +46,7 @@ namespace Pango { } } - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern void pango_font_family_list_faces(IntPtr raw, IntPtr faces, out int n_faces); [Obsolete] diff --git a/Source/Libs/PangoSharp/FontMap.cs b/Source/Libs/PangoSharp/FontMap.cs index 311ccfd74..eb6a754b8 100755 --- a/Source/Libs/PangoSharp/FontMap.cs +++ b/Source/Libs/PangoSharp/FontMap.cs @@ -25,7 +25,7 @@ namespace Pango { public partial class FontMap { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern void pango_font_map_list_families(IntPtr raw, out IntPtr families, out int n_families); public FontFamily [] Families { @@ -46,7 +46,7 @@ namespace Pango { } } - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern void pango_font_map_list_families(IntPtr raw, IntPtr families, out int n_families); [Obsolete] diff --git a/Source/Libs/PangoSharp/Global.cs b/Source/Libs/PangoSharp/Global.cs index bc5bfc49f..0be2a1439 100755 --- a/Source/Libs/PangoSharp/Global.cs +++ b/Source/Libs/PangoSharp/Global.cs @@ -25,7 +25,9 @@ namespace Pango { public partial class Global { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + public static string PangoNativeDll = "libpango-1.0-0"; + + [DllImport (PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern bool pango_scan_int(IntPtr pos, out int out_param); [Obsolete] @@ -37,7 +39,7 @@ namespace Pango { return ret; } - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern bool pango_parse_markup (IntPtr markup, int length, uint accel_marker, out IntPtr attr_list_handle, out IntPtr text, out uint accel_char, IntPtr err); public static bool ParseMarkup (string markup, char accel_marker, out Pango.AttrList attrs, out string text, out char accel_char) diff --git a/Source/Libs/PangoSharp/GlyphItem.cs b/Source/Libs/PangoSharp/GlyphItem.cs index 1b7e1468d..b21202e95 100755 --- a/Source/Libs/PangoSharp/GlyphItem.cs +++ b/Source/Libs/PangoSharp/GlyphItem.cs @@ -25,7 +25,7 @@ namespace Pango { public partial struct GlyphItem { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_glyph_item_apply_attrs(ref Pango.GlyphItem raw, IntPtr text, IntPtr list); public GlyphItem[] ApplyAttrs (string text, Pango.AttrList list) diff --git a/Source/Libs/PangoSharp/Layout.cs b/Source/Libs/PangoSharp/Layout.cs index abbcc0628..4c7a28083 100755 --- a/Source/Libs/PangoSharp/Layout.cs +++ b/Source/Libs/PangoSharp/Layout.cs @@ -26,7 +26,7 @@ namespace Pango { public partial class Layout { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_layout_get_lines(IntPtr raw); public LayoutLine[] Lines { @@ -43,7 +43,7 @@ namespace Pango { } } - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern void pango_layout_set_markup_with_accel (IntPtr raw, IntPtr markup, int length, uint accel_marker, out uint accel_char); public void SetMarkupWithAccel (string markup, char accel_marker, out char accel_char) @@ -55,7 +55,7 @@ namespace Pango { accel_char = GLib.Marshaller.GUnicharToChar (ucs4_accel_char); } - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern void pango_layout_get_log_attrs (IntPtr raw, out IntPtr attrs, out int n_attrs); public LogAttr [] LogAttrs { @@ -76,7 +76,7 @@ namespace Pango { } } - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern void pango_layout_set_text (IntPtr raw, IntPtr text, int length); public void SetText (string text) @@ -86,7 +86,7 @@ namespace Pango { GLib.Marshaller.Free (native_text); } - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern void pango_layout_set_markup (IntPtr raw, IntPtr markup, int length); public void SetMarkup (string markup) diff --git a/Source/Libs/PangoSharp/LayoutLine.cs b/Source/Libs/PangoSharp/LayoutLine.cs index 89c2e551c..fb984411b 100755 --- a/Source/Libs/PangoSharp/LayoutLine.cs +++ b/Source/Libs/PangoSharp/LayoutLine.cs @@ -26,7 +26,7 @@ namespace Pango { public partial class LayoutLine { #if NOT_BROKEN - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern void pango_layout_line_get_x_ranges(IntPtr raw, int start_index, int end_index, out IntPtr ranges_handle, out int n_ranges); #endif diff --git a/Source/Libs/PangoSharp/PangoSharp-api.raw b/Source/Libs/PangoSharp/PangoSharp-api.raw index 872ad00ee..c7cca1b38 100755 --- a/Source/Libs/PangoSharp/PangoSharp-api.raw +++ b/Source/Libs/PangoSharp/PangoSharp-api.raw @@ -6,7 +6,7 @@ Please DO NOT MODIFY THIS FILE, modify .metadata files instead. --> - + diff --git a/Source/Libs/PangoSharp/PangoSharp.csproj b/Source/Libs/PangoSharp/PangoSharp.csproj index 748494fed..541b0cfd9 100755 --- a/Source/Libs/PangoSharp/PangoSharp.csproj +++ b/Source/Libs/PangoSharp/PangoSharp.csproj @@ -1,5 +1,4 @@ - true netstandard2.0 @@ -19,5 +18,7 @@ CairoSharp - + + + diff --git a/Source/Libs/PangoSharp/PangoSharp.metadata b/Source/Libs/PangoSharp/PangoSharp.metadata index 60c4f2e03..1db221d1b 100755 --- a/Source/Libs/PangoSharp/PangoSharp.metadata +++ b/Source/Libs/PangoSharp/PangoSharp.metadata @@ -36,7 +36,7 @@ VersionString 1 CairoHelper - libpangocairo-1.0-0.dll + libpangocairo-1.0-0 1 1 ref diff --git a/Source/Libs/PangoSharp/ScriptIter.cs b/Source/Libs/PangoSharp/ScriptIter.cs index e44502b2b..ada5780fd 100755 --- a/Source/Libs/PangoSharp/ScriptIter.cs +++ b/Source/Libs/PangoSharp/ScriptIter.cs @@ -27,7 +27,7 @@ namespace Pango { public ScriptIter(IntPtr raw) : base(raw) {} - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern IntPtr pango_script_iter_new(IntPtr text, int length); public ScriptIter (string text) @@ -36,7 +36,7 @@ namespace Pango { Raw = pango_script_iter_new (native_text, -1); } - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern void pango_script_iter_free (IntPtr raw); ~ScriptIter () @@ -46,10 +46,10 @@ namespace Pango { Raw = IntPtr.Zero; } - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern void pango_script_iter_get_range (IntPtr raw, out IntPtr start, out IntPtr end, out Pango.Script script); - [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libglib-2.0-0", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_utf8_pointer_to_offset (IntPtr str, IntPtr pos); public void GetRange (out int start, out int len, out Pango.Script script) @@ -62,7 +62,7 @@ namespace Pango { len = (int)g_utf8_pointer_to_offset (start_ptr, end_ptr); } - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern bool pango_script_iter_next (IntPtr raw); public bool Next () diff --git a/Source/Libs/PangoSharp/TabArray.cs b/Source/Libs/PangoSharp/TabArray.cs index 069f6047d..0d33d8283 100755 --- a/Source/Libs/PangoSharp/TabArray.cs +++ b/Source/Libs/PangoSharp/TabArray.cs @@ -25,7 +25,7 @@ namespace Pango { public partial class TabArray { - [DllImport ("libpango-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport (Global.PangoNativeDll, CallingConvention = CallingConvention.Cdecl)] static extern void pango_tab_array_get_tabs (IntPtr raw, out IntPtr alignments, out IntPtr locations); public void GetTabs (out TabAlign[] alignments, out int[] locations) diff --git a/Source/Libs/PangoSharp/linux-x64/libpango-1.0-0.so b/Source/Libs/PangoSharp/linux-x64/libpango-1.0-0.so new file mode 100755 index 0000000000000000000000000000000000000000..f4114fc9cc0816a245a00bb1ed1d9aa36704533b GIT binary patch literal 7240 zcmeHMU1%It6h50x+Vm$sjkZmHpraOSA3DaC{t3}d(j-$z+87gP#W0=hZjy!lX?G{m z6pO(sw3c8MmHJpg5quH)(o)6Lmg0+`s3?7qfK*~Fm?BE`A?rDJ?w8C=Hd1^Lggs^F z-1D7t?$5b*GUuMY*xuDq5s45eN>7qVL^7WoP8Hl_zOTD2oy#Ws zoWXR`)0NiP@#Btk;G|P0l9Wyj9(A(AxowY|O=clyHVG1!)-JM>3CDHFwg(FZZw3ry z6V%zYzqQTYZf-Ys>ghA9;8^3I#63ag z_yUJKRcELk{4Me$4P)b;9X za3gD?`5o5vTN72Ui_PA9)|p%GI(BK*E;R$isUfp&lbi^mfopY}Vl*$a|6wtl*x9SP z**eSq*45dlb!Nu8I{lOtxnX@Z>o#(S5#8ZR>2R_B#+#S18I3+>oofDWIk);{J~h_a z=G!b4S6}DnbZ4qwz|TW$K%~|lSgov}OyvlaBT$Y&IRfPf zlp|1%!2de}$UBi|B8PPJvLH(?E40#MbNPFXmXWuw(=zhg4O&Ltx?ao3bLHM51pV)` z#hl2O^uV|dOz9*Rcexp@UoOT>7d%EQG;h>g?ovXRbh3+aKJZ|5&yptWXN%tW=e0d2 zf@(g9!;F?+()vHOtVP}Hf5&id4v&cYL1$ar6UG+4iEcG^^L?c$Y*$K-@=XHwYrj6q z_ZRF-5RVe}BZyZL_AQ845#krbmk{C}#Fx(PUl3n-j}(2BcNO)IpnZw^rLtc^BRFV2 zhbW(RoMRu%{nrrAZxFBLx`yG0R69y_gnOD_8I{{%=-w>)DBrWOe?j|(1@~{y{sF(4 zYRh@8q`Q2J36i|O6(!*RyEGpW~&j{bxalgm=(V_5#@yReQVzL-%6?&-7n}ciWnX%~O0D;OWxp_<7Ztv6zdqLXSQm?mKIdno#D4w2xS=e9kH1(f zRWFfJU8y?9QpQX5vxf0{_6XNkHfTIN&qo*Or-kuSb)5mmOVwj2o_7oG=+KZEr}+|# z?Plz_6j=&f6iMXl;dE}$N!tlGmoM1P=y8hYGDp)%H<>VZ?cKejw2>;_*iJt0jBz!^ z&5zMg-pM5G#Aqfn#x6cdReJ)aw%yU&(%o*iAJ`|=AUjdW*&|LiAtj%EhYz%L?{8z2 zOF^*c>^j)m(q$j)=y;~R&+cn!?P_Pgf2thmqK{W%3RRz^`V%MzNk{ilW{So9H6yQx zMP^|v<2r-P-Mq&~(8}iAq&b`&H3vsi>BP2Ff|NAk6h_EQjAhx=<8I#5JfF-LQn_qE zuvwQ+rX6u0Qx(okH+kG8Q?1QRj(D;5bY7S}9op>ZWKwbNHOF53Fps9Wp{img7sbfr z4bSi<1`q$gkR(r#Z#8OF`2K)z4)q!OGesur|KM*i{PCRvmwKlVzSGD9Je0U1PAYeR zKfY&kTpP-`{L0MbE65vSj7i_{pVAHR3#{{#^x-Fq1<5twkMAS6)RcuVf7pTdvrcjs z$oP(e8{*6qp1+3@CA1Fym-Im3$d@oa;)nHT*&qNOP^8L*)ed{l~Qd z_{}*>uYtNM;1eN#JE{)D_n4}f!m9^eOlIpmN0r&0UEF6mpP0Mf|B!z1;}}RQLn6uiO8H-r0hzw=*xWPh F|2HV0`N#kO literal 0 HcmV?d00001 diff --git a/Source/OldStuff/generate.sh b/Source/OldStuff/generate.sh new file mode 100755 index 000000000..883fa3e0b --- /dev/null +++ b/Source/OldStuff/generate.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +set -e +cd "$(dirname "$0")" + +genstub () +{ + DLLNAME=$1 + TARGET=$2 + + rm -f empty.c + touch empty.c + gcc -shared -o ${TARGET} empty.c + gcc -Wl,--no-as-needed -shared -o ${DLLNAME}.so -fPIC -L. -l:${TARGET} + rm -f ${TARGET} + rm -f empty.c + + echo "Mapped ${DLLNAME}.dll ==> ${TARGET}" +} + +#genstub libglib-2.0-0 libglib-2.0.so.0 +#genstub libgobject-2.0-0 libgobject-2.0.so.0 +#genstub libgthread-2.0-0 libgthread-2.0.so.0 +#genstub libgio-2.0-0 libgio-2.0.so.0 +#genstub libatk-1.0-0 libatk-1.0.so.0 +#genstub libcairo-2 libcairo.so.2 +#genstub libgtk-3-0 libgtk-3.so.0 +#genstub libgdk-3-0 libgdk-3.so.0 +#genstub libgdk_pixbuf-2.0-0 libgdk_pixbuf-2.0.so.0 +#genstub libgtk-3-0 libgtk-3.so.0 +genstub libpango-1.0-0 libpango-1.0.so.0 diff --git a/build.cake b/build.cake index 1735e28e3..23efd8aa5 100755 --- a/build.cake +++ b/build.cake @@ -1,73 +1,130 @@ #load CakeScripts\GAssembly.cs #load CakeScripts\GapiFixup.cs +#load CakeScripts\Settings.cs #addin "Cake.FileHelpers" +#addin "Cake.Incubator" // VARS -GAssembly.Cake = Context; +Settings.Cake = Context; +Settings.BuildTarget = Argument("BuildTarget", "Default"); +Settings.Assembly = Argument("Assembly", ""); -var target = Argument("Target", "Default"); var configuration = Argument("Configuration", "Release"); +var list = new List(); var glist = new List() { new GAssembly("GLibSharp"), new GAssembly("GioSharp") { - Includes = new[] { "GLibSharp" } + Deps = new[] { "GLibSharp" } }, new GAssembly("AtkSharp") { - Includes = new[] { "GLibSharp" }, + Deps = new[] { "GLibSharp" }, ExtraArgs = "--abi-cs-usings=Atk,GLib" }, new GAssembly("CairoSharp"), new GAssembly("PangoSharp") { - Includes = new[] { "GLibSharp", "CairoSharp" } + Deps = new[] { "GLibSharp", "CairoSharp" } }, new GAssembly("GdkSharp") { - Includes = new[] { "GLibSharp", "GioSharp", "CairoSharp", "PangoSharp" } + Deps = new[] { "GLibSharp", "GioSharp", "CairoSharp", "PangoSharp" } }, new GAssembly("GtkSharp") { - Includes = new[] { "GLibSharp", "GioSharp", "AtkSharp", "CairoSharp", "PangoSharp", "GdkSharp" }, + Deps = new[] { "GLibSharp", "GioSharp", "AtkSharp", "CairoSharp", "PangoSharp", "GdkSharp" }, ExtraArgs = "--abi-cs-usings=Gtk,GLib" } }; // TASKS -Task("Prepare") +Task("Init") .Does(() => { + // Add stuff to list + foreach(var gassembly in glist) + if(string.IsNullOrEmpty(Settings.Assembly) || Settings.Assembly == gassembly.Name) + list.Add(gassembly); +}); + +Task("Prepare") + .IsDependentOn("Clean") + .Does(() => +{ + // Build Tools + DotNetCoreRestore("Source/Tools/GapiCodegen/GapiCodegen.csproj"); MSBuild("Source/Tools/GapiCodegen/GapiCodegen.csproj", new MSBuildSettings { Verbosity = Verbosity.Minimal, Configuration = "Release", }); - foreach(var gassembly in glist) + // Generate code and prepare libs projects + foreach(var gassembly in list) gassembly.Prepare(); + DotNetCoreRestore("Source/Libs/GLibSharp.sln"); +}); + +Task("Test") + .Does(() => +{ + }); Task("Clean") + .IsDependentOn("Init") .Does(() => { - foreach(var gassembly in glist) + foreach(var gassembly in list) gassembly.Clean(); }); +Task("FullClean") + .IsDependentOn("Clean") + .Does(() => +{ + DeleteDirectory("BuildOutput", true); +}); + Task("Build") .IsDependentOn("Prepare") .Does(() => { - foreach(var gassembly in glist) + if (list.Count == glist.Count) { - MSBuild(gassembly.Csproj, new MSBuildSettings { + MSBuild("Source/Libs/GLibSharp.sln", new MSBuildSettings { Verbosity = Verbosity.Minimal, Configuration = "Release", }); } + else + { + foreach(var gassembly in list) + { + MSBuild(gassembly.Csproj, new MSBuildSettings { + Verbosity = Verbosity.Minimal, + Configuration = "Release", + }); + } + } +}); + +Task("PackageNuGet") + .IsDependentOn("Build") + .Does(() => +{ + var settings = new DotNetCorePackSettings + { + Configuration = "Release", + OutputDirectory = "BuildOutput/NugetPackages", + NoBuild = true + }; + + foreach(var gassembly in list) + DotNetCorePack(gassembly.Csproj, settings); }); // TASK TARGETS @@ -77,4 +134,4 @@ Task("Default") // EXECUTION -RunTarget(target); +RunTarget(Settings.BuildTarget);