diff --git a/CakeScripts/GAssembly.cs b/CakeScripts/GAssembly.cs index 1d494b896..15bdd58b9 100755 --- a/CakeScripts/GAssembly.cs +++ b/CakeScripts/GAssembly.cs @@ -83,22 +83,28 @@ public class GAssembly public void GenerateLinuxStubs() { + var basedir = P.Combine("..", "..", Dir); + + Cake.DeleteDirectory(P.Combine(basedir, "linux-x86"), new DeleteDirectorySettings { Recursive = true, Force = true }); + Cake.DeleteDirectory(P.Combine(basedir, "linux-x64"), new DeleteDirectorySettings { Recursive = true, Force = true }); + Cake.DeleteDirectory(P.Combine(basedir, "linux-arm"), new DeleteDirectorySettings { Recursive = true, Force = true }); + for (int i = 0; i < NativeDeps.Length; i += 2) { - // Generate x64 stubs - Cake.CreateDirectory(P.Combine(Dir, "linux-x64")); - Cake.StartProcess("gcc", "-shared -o BuildOutput/LinuxStubs/" + NativeDeps[i] + " BuildOutput/LinuxStubs/empty.c"); - Cake.StartProcess("gcc", "-Wl,--no-as-needed -shared -o " + P.Combine(Dir, "linux-x64", NativeDeps[i + 1] + ".so") + " -fPIC -L. -l:BuildOutput/LinuxStubs/" + NativeDeps[i] + ""); - // Generate x86 stubs - Cake.CreateDirectory(P.Combine(Dir, "linux-x86")); - Cake.StartProcess("gcc", "-m32 -shared -o BuildOutput/LinuxStubs/" + NativeDeps[i] + " BuildOutput/LinuxStubs/empty.c"); - Cake.StartProcess("gcc", "-m32 -Wl,--no-as-needed -shared -o " + P.Combine(Dir, "linux-x86", NativeDeps[i + 1] + ".so") + " -fPIC -L. -l:BuildOutput/LinuxStubs/" + NativeDeps[i] + ""); + Cake.CreateDirectory(P.Combine(basedir, "linux-x86")); + Cake.StartProcess("gcc", "-m32 -shared -o " + NativeDeps[i] + " empty.c"); + Cake.StartProcess("gcc", "-m32 -Wl,--no-as-needed -shared -o " + P.Combine(basedir, "linux-x86", NativeDeps[i + 1] + ".so") + " -fPIC -L. -l:" + NativeDeps[i] + ""); + + // Generate x64 stubs + Cake.CreateDirectory(P.Combine(basedir, "linux-x64")); + Cake.StartProcess("gcc", "-shared -o " + NativeDeps[i] + " empty.c"); + Cake.StartProcess("gcc", "-Wl,--no-as-needed -shared -o " + P.Combine(basedir, "linux-x64", NativeDeps[i + 1] + ".so") + " -fPIC -L. -l:" + NativeDeps[i] + ""); // Generate arm stubs - Cake.CreateDirectory(P.Combine(Dir, "linux-arm")); - Cake.StartProcess("arm-none-eabi-gcc", "-shared -o BuildOutput/LinuxStubs/" + NativeDeps[i] + " BuildOutput/LinuxStubs/empty.c"); - Cake.StartProcess("arm-none-eabi-gcc", "-Wl,--no-as-needed -shared -o " + P.Combine(Dir, "linux-arm", NativeDeps[i + 1] + ".so") + " -fPIC -L. -l:BuildOutput/LinuxStubs/" + NativeDeps[i] + ""); + Cake.CreateDirectory(P.Combine(basedir, "linux-arm")); + Cake.StartProcess("arm-none-eabi-gcc", "-shared -o " + NativeDeps[i] + " empty.c"); + Cake.StartProcess("arm-none-eabi-gcc", "-Wl,--no-as-needed -shared -o " + P.Combine(basedir, "linux-arm", NativeDeps[i + 1] + ".so") + " -fPIC -L. -l:" + NativeDeps[i] + ""); } } } diff --git a/Source/Libs/AtkSharp/linux-arm/libatk-1.0-0.so b/Source/Libs/AtkSharp/linux-arm/libatk-1.0-0.so index 99996b548..a98e0f4e0 100755 Binary files a/Source/Libs/AtkSharp/linux-arm/libatk-1.0-0.so and b/Source/Libs/AtkSharp/linux-arm/libatk-1.0-0.so differ diff --git a/Source/Libs/AtkSharp/linux-x64/libatk-1.0-0.so b/Source/Libs/AtkSharp/linux-x64/libatk-1.0-0.so index a95f8c4dc..3fcc72a74 100755 Binary files a/Source/Libs/AtkSharp/linux-x64/libatk-1.0-0.so and b/Source/Libs/AtkSharp/linux-x64/libatk-1.0-0.so differ diff --git a/Source/Libs/AtkSharp/linux-x86/libatk-1.0-0.so b/Source/Libs/AtkSharp/linux-x86/libatk-1.0-0.so index 00c3077c5..a88897af5 100755 Binary files a/Source/Libs/AtkSharp/linux-x86/libatk-1.0-0.so and b/Source/Libs/AtkSharp/linux-x86/libatk-1.0-0.so differ diff --git a/Source/Libs/CairoSharp/linux-arm/libcairo-2.so b/Source/Libs/CairoSharp/linux-arm/libcairo-2.so index f6b81edc5..beaaa759e 100755 Binary files a/Source/Libs/CairoSharp/linux-arm/libcairo-2.so and b/Source/Libs/CairoSharp/linux-arm/libcairo-2.so differ diff --git a/Source/Libs/CairoSharp/linux-x64/libcairo-2.so b/Source/Libs/CairoSharp/linux-x64/libcairo-2.so index 7100145db..f828c0df3 100755 Binary files a/Source/Libs/CairoSharp/linux-x64/libcairo-2.so and b/Source/Libs/CairoSharp/linux-x64/libcairo-2.so differ diff --git a/Source/Libs/CairoSharp/linux-x86/libcairo-2.so b/Source/Libs/CairoSharp/linux-x86/libcairo-2.so index c8df73573..bc569bec6 100755 Binary files a/Source/Libs/CairoSharp/linux-x86/libcairo-2.so and b/Source/Libs/CairoSharp/linux-x86/libcairo-2.so differ diff --git a/Source/Libs/GLibSharp/linux-arm/libglib-2.0-0.so b/Source/Libs/GLibSharp/linux-arm/libglib-2.0-0.so index 3c097d1c9..8946174da 100755 Binary files a/Source/Libs/GLibSharp/linux-arm/libglib-2.0-0.so and b/Source/Libs/GLibSharp/linux-arm/libglib-2.0-0.so differ diff --git a/Source/Libs/GLibSharp/linux-arm/libgobject-2.0-0.so b/Source/Libs/GLibSharp/linux-arm/libgobject-2.0-0.so index 18e1da58e..95210ac8c 100755 Binary files a/Source/Libs/GLibSharp/linux-arm/libgobject-2.0-0.so and b/Source/Libs/GLibSharp/linux-arm/libgobject-2.0-0.so differ diff --git a/Source/Libs/GLibSharp/linux-arm/libgthread-2.0-0.so b/Source/Libs/GLibSharp/linux-arm/libgthread-2.0-0.so index 4e6eb823a..2344ee5be 100755 Binary files a/Source/Libs/GLibSharp/linux-arm/libgthread-2.0-0.so and b/Source/Libs/GLibSharp/linux-arm/libgthread-2.0-0.so differ diff --git a/Source/Libs/GLibSharp/linux-x64/libglib-2.0-0.so b/Source/Libs/GLibSharp/linux-x64/libglib-2.0-0.so index 06442cdce..8459d1bd0 100755 Binary files a/Source/Libs/GLibSharp/linux-x64/libglib-2.0-0.so and b/Source/Libs/GLibSharp/linux-x64/libglib-2.0-0.so differ diff --git a/Source/Libs/GLibSharp/linux-x64/libgobject-2.0-0.so b/Source/Libs/GLibSharp/linux-x64/libgobject-2.0-0.so index 3426518f4..22eb9c6a3 100755 Binary files a/Source/Libs/GLibSharp/linux-x64/libgobject-2.0-0.so and b/Source/Libs/GLibSharp/linux-x64/libgobject-2.0-0.so differ diff --git a/Source/Libs/GLibSharp/linux-x64/libgthread-2.0-0.so b/Source/Libs/GLibSharp/linux-x64/libgthread-2.0-0.so index b50f95322..0245be6fc 100755 Binary files a/Source/Libs/GLibSharp/linux-x64/libgthread-2.0-0.so and b/Source/Libs/GLibSharp/linux-x64/libgthread-2.0-0.so differ diff --git a/Source/Libs/GLibSharp/linux-x86/libglib-2.0-0.so b/Source/Libs/GLibSharp/linux-x86/libglib-2.0-0.so index b0cf1ac20..bea661662 100755 Binary files a/Source/Libs/GLibSharp/linux-x86/libglib-2.0-0.so and b/Source/Libs/GLibSharp/linux-x86/libglib-2.0-0.so differ diff --git a/Source/Libs/GLibSharp/linux-x86/libgobject-2.0-0.so b/Source/Libs/GLibSharp/linux-x86/libgobject-2.0-0.so index c18dd82c0..206265421 100755 Binary files a/Source/Libs/GLibSharp/linux-x86/libgobject-2.0-0.so and b/Source/Libs/GLibSharp/linux-x86/libgobject-2.0-0.so differ diff --git a/Source/Libs/GLibSharp/linux-x86/libgthread-2.0-0.so b/Source/Libs/GLibSharp/linux-x86/libgthread-2.0-0.so index cef9c19b0..ded8bc4b4 100755 Binary files a/Source/Libs/GLibSharp/linux-x86/libgthread-2.0-0.so and b/Source/Libs/GLibSharp/linux-x86/libgthread-2.0-0.so differ diff --git a/Source/Libs/GdkSharp/linux-arm/libgdk-3-0.so b/Source/Libs/GdkSharp/linux-arm/libgdk-3-0.so index 103b2baed..55a9360f6 100755 Binary files a/Source/Libs/GdkSharp/linux-arm/libgdk-3-0.so and b/Source/Libs/GdkSharp/linux-arm/libgdk-3-0.so differ diff --git a/Source/Libs/GdkSharp/linux-arm/libgdk_pixbuf-2.0-0.so b/Source/Libs/GdkSharp/linux-arm/libgdk_pixbuf-2.0-0.so index 2a3e899b9..57c6a095d 100755 Binary files a/Source/Libs/GdkSharp/linux-arm/libgdk_pixbuf-2.0-0.so and b/Source/Libs/GdkSharp/linux-arm/libgdk_pixbuf-2.0-0.so differ diff --git a/Source/Libs/GdkSharp/linux-x64/libgdk-3-0.so b/Source/Libs/GdkSharp/linux-x64/libgdk-3-0.so index 74d116604..e3476e74d 100755 Binary files a/Source/Libs/GdkSharp/linux-x64/libgdk-3-0.so and b/Source/Libs/GdkSharp/linux-x64/libgdk-3-0.so differ 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 index bdeeb75df..a9ee0d021 100755 Binary files a/Source/Libs/GdkSharp/linux-x64/libgdk_pixbuf-2.0-0.so and b/Source/Libs/GdkSharp/linux-x64/libgdk_pixbuf-2.0-0.so differ diff --git a/Source/Libs/GdkSharp/linux-x86/libgdk-3-0.so b/Source/Libs/GdkSharp/linux-x86/libgdk-3-0.so index 64ada24ed..c86107c4e 100755 Binary files a/Source/Libs/GdkSharp/linux-x86/libgdk-3-0.so and b/Source/Libs/GdkSharp/linux-x86/libgdk-3-0.so differ diff --git a/Source/Libs/GdkSharp/linux-x86/libgdk_pixbuf-2.0-0.so b/Source/Libs/GdkSharp/linux-x86/libgdk_pixbuf-2.0-0.so index 97cdb6e3d..8d77d5985 100755 Binary files a/Source/Libs/GdkSharp/linux-x86/libgdk_pixbuf-2.0-0.so and b/Source/Libs/GdkSharp/linux-x86/libgdk_pixbuf-2.0-0.so differ diff --git a/Source/Libs/GioSharp/linux-arm/libgio-2.0-0.so b/Source/Libs/GioSharp/linux-arm/libgio-2.0-0.so index 6950594b5..8230f7ce5 100755 Binary files a/Source/Libs/GioSharp/linux-arm/libgio-2.0-0.so and b/Source/Libs/GioSharp/linux-arm/libgio-2.0-0.so differ diff --git a/Source/Libs/GioSharp/linux-x64/libgio-2.0-0.so b/Source/Libs/GioSharp/linux-x64/libgio-2.0-0.so index 327b75fc3..15aac75fb 100755 Binary files a/Source/Libs/GioSharp/linux-x64/libgio-2.0-0.so and b/Source/Libs/GioSharp/linux-x64/libgio-2.0-0.so differ diff --git a/Source/Libs/GioSharp/linux-x86/libgio-2.0-0.so b/Source/Libs/GioSharp/linux-x86/libgio-2.0-0.so index 0b81c80ea..25659bc95 100755 Binary files a/Source/Libs/GioSharp/linux-x86/libgio-2.0-0.so and b/Source/Libs/GioSharp/linux-x86/libgio-2.0-0.so differ diff --git a/Source/Libs/GtkSharp/linux-arm/libgtk-3-0.so b/Source/Libs/GtkSharp/linux-arm/libgtk-3-0.so index 63f071d26..9b572874b 100755 Binary files a/Source/Libs/GtkSharp/linux-arm/libgtk-3-0.so and b/Source/Libs/GtkSharp/linux-arm/libgtk-3-0.so differ diff --git a/Source/Libs/GtkSharp/linux-x64/libgtk-3-0.so b/Source/Libs/GtkSharp/linux-x64/libgtk-3-0.so index ddb134953..cde1f5254 100755 Binary files a/Source/Libs/GtkSharp/linux-x64/libgtk-3-0.so and b/Source/Libs/GtkSharp/linux-x64/libgtk-3-0.so differ diff --git a/Source/Libs/GtkSharp/linux-x86/libgtk-3-0.so b/Source/Libs/GtkSharp/linux-x86/libgtk-3-0.so index 8ac443c63..4f2ba8b00 100755 Binary files a/Source/Libs/GtkSharp/linux-x86/libgtk-3-0.so and b/Source/Libs/GtkSharp/linux-x86/libgtk-3-0.so differ diff --git a/Source/Libs/PangoSharp/linux-arm/libpango-1.0-0.so b/Source/Libs/PangoSharp/linux-arm/libpango-1.0-0.so index 907b819b0..2307a18c5 100755 Binary files a/Source/Libs/PangoSharp/linux-arm/libpango-1.0-0.so and b/Source/Libs/PangoSharp/linux-arm/libpango-1.0-0.so differ diff --git a/Source/Libs/PangoSharp/linux-x64/libpango-1.0-0.so b/Source/Libs/PangoSharp/linux-x64/libpango-1.0-0.so index ed30e7dfd..f4114fc9c 100755 Binary files a/Source/Libs/PangoSharp/linux-x64/libpango-1.0-0.so and b/Source/Libs/PangoSharp/linux-x64/libpango-1.0-0.so differ diff --git a/Source/Libs/PangoSharp/linux-x86/libpango-1.0-0.so b/Source/Libs/PangoSharp/linux-x86/libpango-1.0-0.so index e00d7c027..fe2b0b600 100755 Binary files a/Source/Libs/PangoSharp/linux-x86/libpango-1.0-0.so and b/Source/Libs/PangoSharp/linux-x86/libpango-1.0-0.so differ diff --git a/build.cake b/build.cake index 884bdde69..5d3668046 100755 --- a/build.cake +++ b/build.cake @@ -18,7 +18,7 @@ Task("Init") .Does(() => { // Assign some common properties - msbuildsettings = msbuildsettings.WithProperty("Version", "3.22.24.0"); + msbuildsettings = msbuildsettings.WithProperty("Version", "3.22.24.7"); msbuildsettings = msbuildsettings.WithProperty("Authors", "'GtkSharp Contributors'"); msbuildsettings = msbuildsettings.WithProperty("PackageLicenseUrl", "'https://github.com/cra0zy/GtkSharp/blob/cakecore/LICENSE'"); @@ -51,9 +51,11 @@ Task("GenerateLinuxStubs") .Does(() => { CreateDirectory("BuildOutput/LinuxStubs"); - FileWriteText("BuildOutput/LinuxStubs/empty.c", ""); + System.IO.Directory.SetCurrentDirectory("BuildOutput/LinuxStubs"); + FileWriteText("empty.c", ""); foreach(var gassembly in list) gassembly.GenerateLinuxStubs(); + System.IO.Directory.SetCurrentDirectory("../.."); DeleteDirectory("BuildOutput/LinuxStubs", new DeleteDirectorySettings { Recursive = true, Force = true }); });