From fc08b9530d8484e67ad55253c0e854645adc5fc6 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 28 Apr 2017 16:05:31 -0400 Subject: [PATCH] Added iOS/tvOS/macOS binding projects --- binding/Binding.Shared/Binding.Shared.shproj | 2 +- .../HarfBuzzSharp.Desktop.csproj | 2 +- .../HarfBuzzSharp.OSX.csproj | 69 +++++++++++++++++++ .../Properties/AssemblyInfo.cs | 1 + .../HarfBuzzSharp.Portable.csproj | 2 +- .../HarfBuzzSharp.Shared.shproj | 2 +- binding/HarfBuzzSharp.iOS/ApiDefinition.cs | 1 + .../HarfBuzzSharp.iOS.csproj | 52 ++++++++++++++ .../Properties/AssemblyInfo.cs | 5 ++ binding/HarfBuzzSharp.iOS/Structs.cs | 1 + binding/HarfBuzzSharp.tvOS/ApiDefinition.cs | 1 + .../HarfBuzzSharp.tvOS.csproj | 54 +++++++++++++++ .../Properties/AssemblyInfo.cs | 5 ++ binding/HarfBuzzSharp.tvOS/Structs.cs | 1 + binding/HarfbuzzSharp.Mac.sln | 18 +++++ binding/SkiaSharp.iOS/ApiDefinition.cs | 12 +--- binding/SkiaSharp.iOS/StructsAndEnums.cs | 7 +- build.cake | 4 ++ 18 files changed, 218 insertions(+), 21 deletions(-) create mode 100644 binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj create mode 100644 binding/HarfBuzzSharp.OSX/Properties/AssemblyInfo.cs create mode 100644 binding/HarfBuzzSharp.iOS/ApiDefinition.cs create mode 100644 binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj create mode 100644 binding/HarfBuzzSharp.iOS/Properties/AssemblyInfo.cs create mode 100644 binding/HarfBuzzSharp.iOS/Structs.cs create mode 100644 binding/HarfBuzzSharp.tvOS/ApiDefinition.cs create mode 100644 binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj create mode 100644 binding/HarfBuzzSharp.tvOS/Properties/AssemblyInfo.cs create mode 100644 binding/HarfBuzzSharp.tvOS/Structs.cs diff --git a/binding/Binding.Shared/Binding.Shared.shproj b/binding/Binding.Shared/Binding.Shared.shproj index 70122b5c..1a604d9d 100644 --- a/binding/Binding.Shared/Binding.Shared.shproj +++ b/binding/Binding.Shared/Binding.Shared.shproj @@ -1,5 +1,5 @@ - + 6f8349dc-90ac-441d-8b8b-be623f46be6d 14.0 diff --git a/binding/HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj b/binding/HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj index b4731a21..c2b66d0f 100644 --- a/binding/HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj +++ b/binding/HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj @@ -1,5 +1,5 @@  - + Debug diff --git a/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj b/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj new file mode 100644 index 00000000..5188dc3b --- /dev/null +++ b/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj @@ -0,0 +1,69 @@ + + + + Debug + AnyCPU + {30952C22-D566-488F-9D7A-2411B027D6CA} + {A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + HarfBuzzSharp + HarfBuzzSharp + v2.0 + Xamarin.Mac + Resources + true + ..\..\mono.snk + + + true + full + false + bin\Debug + DEBUG;__MACOS__;HARFBUZZ + prompt + 4 + false + false + false + false + false + + + + + + true + bin\Release + __MACOS__;HARFBUZZ + prompt + 4 + false + false + false + false + false + + + + + + + + + + + + + + + PreserveNewest + + + nuget\runtimes\osx\native\libHarfBuzzSharp.dylib + PreserveNewest + + + + + + \ No newline at end of file diff --git a/binding/HarfBuzzSharp.OSX/Properties/AssemblyInfo.cs b/binding/HarfBuzzSharp.OSX/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/binding/HarfBuzzSharp.OSX/Properties/AssemblyInfo.cs @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/binding/HarfBuzzSharp.Portable/HarfBuzzSharp.Portable.csproj b/binding/HarfBuzzSharp.Portable/HarfBuzzSharp.Portable.csproj index 5be90ace..c63e7ed1 100644 --- a/binding/HarfBuzzSharp.Portable/HarfBuzzSharp.Portable.csproj +++ b/binding/HarfBuzzSharp.Portable/HarfBuzzSharp.Portable.csproj @@ -1,5 +1,5 @@  - + 10.0 diff --git a/binding/HarfBuzzSharp.Shared/HarfBuzzSharp.Shared.shproj b/binding/HarfBuzzSharp.Shared/HarfBuzzSharp.Shared.shproj index 7bd74c0a..0bff70de 100644 --- a/binding/HarfBuzzSharp.Shared/HarfBuzzSharp.Shared.shproj +++ b/binding/HarfBuzzSharp.Shared/HarfBuzzSharp.Shared.shproj @@ -1,5 +1,5 @@ - + 1aaa8f60-6138-4dfe-b240-5a0f3fb87e0f 14.0 diff --git a/binding/HarfBuzzSharp.iOS/ApiDefinition.cs b/binding/HarfBuzzSharp.iOS/ApiDefinition.cs new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/binding/HarfBuzzSharp.iOS/ApiDefinition.cs @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj b/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj new file mode 100644 index 00000000..1c4c13c9 --- /dev/null +++ b/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj @@ -0,0 +1,52 @@ + + + + Debug + AnyCPU + {E8192110-FCF9-4972-9472-7408BC2CA56B} + {8FFB629D-F513-41CE-95D2-7ECE97B6EEEC};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + HarfBuzzSharp + HarfBuzzSharp + Resources + true + ..\..\mono.snk + + + true + full + false + bin\Debug + DEBUG;MONOTOUCH;HARFBUZZ + prompt + 4 + true + + + true + bin\Release + MONOTOUCH;HARFBUZZ + prompt + 4 + true + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/binding/HarfBuzzSharp.iOS/Properties/AssemblyInfo.cs b/binding/HarfBuzzSharp.iOS/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..f22739d2 --- /dev/null +++ b/binding/HarfBuzzSharp.iOS/Properties/AssemblyInfo.cs @@ -0,0 +1,5 @@ +using Foundation; +using ObjCRuntime; + +[assembly: LinkerSafe] +[assembly: LinkWith("libHarfBuzzSharp.a", IsCxx = true, ForceLoad = true, SmartLink = true)] diff --git a/binding/HarfBuzzSharp.iOS/Structs.cs b/binding/HarfBuzzSharp.iOS/Structs.cs new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/binding/HarfBuzzSharp.iOS/Structs.cs @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/binding/HarfBuzzSharp.tvOS/ApiDefinition.cs b/binding/HarfBuzzSharp.tvOS/ApiDefinition.cs new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/binding/HarfBuzzSharp.tvOS/ApiDefinition.cs @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj b/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj new file mode 100644 index 00000000..7ff4e0ba --- /dev/null +++ b/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj @@ -0,0 +1,54 @@ + + + + Debug + AnyCPU + {8D646738-458A-441F-B69B-253EF058A812} + {4A1ED743-3331-459B-915A-4B17C7B6DBB6};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + HarfBuzzSharp + HarfBuzzSharp + Resources + true + ..\..\mono.snk + + + true + full + false + bin\Debug + DEBUG;MONOTOUCH;HARFBUZZ + prompt + 4 + true + + + true + bin\Release + MONOTOUCH;HARFBUZZ + prompt + 4 + true + + + + + + + + + + + + + + + + + libHarfBuzzSharp.a + + + + + + \ No newline at end of file diff --git a/binding/HarfBuzzSharp.tvOS/Properties/AssemblyInfo.cs b/binding/HarfBuzzSharp.tvOS/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..f22739d2 --- /dev/null +++ b/binding/HarfBuzzSharp.tvOS/Properties/AssemblyInfo.cs @@ -0,0 +1,5 @@ +using Foundation; +using ObjCRuntime; + +[assembly: LinkerSafe] +[assembly: LinkWith("libHarfBuzzSharp.a", IsCxx = true, ForceLoad = true, SmartLink = true)] diff --git a/binding/HarfBuzzSharp.tvOS/Structs.cs b/binding/HarfBuzzSharp.tvOS/Structs.cs new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/binding/HarfBuzzSharp.tvOS/Structs.cs @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/binding/HarfbuzzSharp.Mac.sln b/binding/HarfbuzzSharp.Mac.sln index e3c8bca5..9606c9fe 100644 --- a/binding/HarfbuzzSharp.Mac.sln +++ b/binding/HarfbuzzSharp.Mac.sln @@ -11,6 +11,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.Desktop", "Ha EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.Portable", "HarfBuzzSharp.Portable\HarfBuzzSharp.Portable.csproj", "{4DFBD9A6-EA81-4E26-9753-A9C7A600EA34}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.OSX", "HarfBuzzSharp.OSX\HarfBuzzSharp.OSX.csproj", "{30952C22-D566-488F-9D7A-2411B027D6CA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.iOS", "HarfBuzzSharp.iOS\HarfBuzzSharp.iOS.csproj", "{E8192110-FCF9-4972-9472-7408BC2CA56B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.tvOS", "HarfBuzzSharp.tvOS\HarfBuzzSharp.tvOS.csproj", "{8D646738-458A-441F-B69B-253EF058A812}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution HarfBuzzSharp.Shared\HarfBuzzSharp.Shared.projitems*{1aaa8f60-6138-4dfe-b240-5a0f3fb87e0f}*SharedItemsImports = 13 @@ -31,6 +37,18 @@ Global {4DFBD9A6-EA81-4E26-9753-A9C7A600EA34}.Debug|Any CPU.Build.0 = Debug|Any CPU {4DFBD9A6-EA81-4E26-9753-A9C7A600EA34}.Release|Any CPU.ActiveCfg = Release|Any CPU {4DFBD9A6-EA81-4E26-9753-A9C7A600EA34}.Release|Any CPU.Build.0 = Release|Any CPU + {30952C22-D566-488F-9D7A-2411B027D6CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {30952C22-D566-488F-9D7A-2411B027D6CA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {30952C22-D566-488F-9D7A-2411B027D6CA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {30952C22-D566-488F-9D7A-2411B027D6CA}.Release|Any CPU.Build.0 = Release|Any CPU + {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|Any CPU.Build.0 = Release|Any CPU + {8D646738-458A-441F-B69B-253EF058A812}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8D646738-458A-441F-B69B-253EF058A812}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8D646738-458A-441F-B69B-253EF058A812}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8D646738-458A-441F-B69B-253EF058A812}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/binding/SkiaSharp.iOS/ApiDefinition.cs b/binding/SkiaSharp.iOS/ApiDefinition.cs index c3e77fd5..5f282702 100644 --- a/binding/SkiaSharp.iOS/ApiDefinition.cs +++ b/binding/SkiaSharp.iOS/ApiDefinition.cs @@ -1,11 +1 @@ -using System; - -using UIKit; -using Foundation; -using ObjCRuntime; -using CoreGraphics; - -namespace SkiaSharp.iOS -{ -} - + \ No newline at end of file diff --git a/binding/SkiaSharp.iOS/StructsAndEnums.cs b/binding/SkiaSharp.iOS/StructsAndEnums.cs index 0db92cd1..5f282702 100644 --- a/binding/SkiaSharp.iOS/StructsAndEnums.cs +++ b/binding/SkiaSharp.iOS/StructsAndEnums.cs @@ -1,6 +1 @@ -using System; - -namespace SkiaSharp.iOS -{ -} - + \ No newline at end of file diff --git a/build.cake b/build.cake index 6647d95a..e6c499a2 100644 --- a/build.cake +++ b/build.cake @@ -178,6 +178,10 @@ Task ("libs") }); // copy libHarfBuzzSharp build output + CopyFileToDirectory ("./binding/HarfBuzzSharp.iOS/bin/Release/HarfBuzzSharp.dll", "./output/ios/"); + CopyFileToDirectory ("./binding/HarfBuzzSharp.tvOS/bin/Release/HarfBuzzSharp.dll", "./output/tvos/"); + CopyFileToDirectory ("./binding/HarfBuzzSharp.OSX/bin/Release/HarfBuzzSharp.dll", "./output/osx/"); + CopyFileToDirectory ("./binding/HarfBuzzSharp.OSX/bin/Release/nuget/build/XamarinMac/HarfBuzzSharp.OSX.targets", "./output/osx/"); CopyFileToDirectory ("./binding/HarfBuzzSharp.Portable/bin/Release/HarfBuzzSharp.dll", "./output/portable/"); CopyFileToDirectory ("./binding/HarfBuzzSharp.Desktop/bin/Release/HarfBuzzSharp.dll", "./output/mac/"); CopyFileToDirectory ("./binding/HarfBuzzSharp.Desktop/bin/Release/nuget/build/net45/HarfBuzzSharp.dll.config", "./output/mac/");