Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/mono/SkiaSharp
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattleibow
mattleibow committed Jun 28, 2019
2 parents 12403f1 + 94c5d88 commit 4a65093
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 27 deletions.
52 changes: 26 additions & 26 deletions cake/BuildExternals.cake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ Task ("externals-windows")
// copy libHarfBuzzSharp to output
var outDir = $"output/native/windows/{dir}";
EnsureDirectoryExists (outDir);
CopyFileToDirectory ($"native-builds/libHarfBuzzSharp_windows/bin/{arch}/Release/libHarfBuzzSharp.dll", outDir);
CopyFileToDirectory ($"native-builds/libHarfBuzzSharp_windows/bin/{arch}/Release/libHarfBuzzSharp.pdb", outDir);
CopyFileToDirectory ($"native-builds/libHarfBuzzSharp_windows/bin/{arch}/{CONFIGURATION}/libHarfBuzzSharp.dll", outDir);
CopyFileToDirectory ($"native-builds/libHarfBuzzSharp_windows/bin/{arch}/{CONFIGURATION}/libHarfBuzzSharp.pdb", outDir);
});

buildHarfBuzzArch ("Win32", "x86");
Expand Down Expand Up @@ -163,8 +163,8 @@ Task ("externals-uwp")
// copy libHarfBuzzSharp to output
var outDir = $"output/native/uwp/{dir}";
EnsureDirectoryExists (outDir);
CopyFileToDirectory ($"native-builds/libHarfBuzzSharp_uwp/bin/{arch}/Release/libHarfBuzzSharp.dll", outDir);
CopyFileToDirectory ($"native-builds/libHarfBuzzSharp_uwp/bin/{arch}/Release/libHarfBuzzSharp.pdb", outDir);
CopyFileToDirectory ($"native-builds/libHarfBuzzSharp_uwp/bin/{arch}/{CONFIGURATION}/libHarfBuzzSharp.dll", outDir);
CopyFileToDirectory ($"native-builds/libHarfBuzzSharp_uwp/bin/{arch}/{CONFIGURATION}/libHarfBuzzSharp.pdb", outDir);
});

buildHarfBuzzArch ("Win32", "x86");
Expand All @@ -180,8 +180,8 @@ Task ("externals-uwp")
// copy SkiaSharp.Views.Interop.UWP to native
var outDir = $"./output/native/uwp/{dir}";
EnsureDirectoryExists (outDir);
CopyFileToDirectory ($"source/SkiaSharp.Views.Interop.UWP/bin/{arch}/Release/SkiaSharp.Views.Interop.UWP.dll", outDir);
CopyFileToDirectory ($"source/SkiaSharp.Views.Interop.UWP/bin/{arch}/Release/SkiaSharp.Views.Interop.UWP.pdb", outDir);
CopyFileToDirectory ($"source/SkiaSharp.Views.Interop.UWP/bin/{arch}/{CONFIGURATION}/SkiaSharp.Views.Interop.UWP.dll", outDir);
CopyFileToDirectory ($"source/SkiaSharp.Views.Interop.UWP/bin/{arch}/{CONFIGURATION}/SkiaSharp.Views.Interop.UWP.pdb", outDir);
});

buildInteropArch ("Win32", "x86");
Expand Down Expand Up @@ -228,12 +228,12 @@ Task ("externals-osx")
Target = "libSkiaSharp",
Sdk = "macosx",
Arch = arch,
Configuration = "Release",
Configuration = CONFIGURATION,
});

// copy libSkiaSharp to output
EnsureDirectoryExists ($"output/native/osx/{arch}");
CopyDirectory ("native-builds/libSkiaSharp_osx/build/Release/", $"output/native/osx/{arch}");
CopyDirectory ($"native-builds/libSkiaSharp_osx/build/{CONFIGURATION}/", $"output/native/osx/{arch}");

StripSign ($"output/native/osx/{arch}/libSkiaSharp.dylib");
});
Expand All @@ -254,12 +254,12 @@ Task ("externals-osx")
Target = "libHarfBuzzSharp",
Sdk = "macosx",
Arch = arch,
Configuration = "Release",
Configuration = CONFIGURATION,
});

// copy libHarfBuzzSharp to output
EnsureDirectoryExists ($"output/native/osx/{arch}");
CopyFileToDirectory ("native-builds/libHarfBuzzSharp_osx/build/Release/libHarfBuzzSharp.dylib", $"output/native/osx/{arch}");
CopyFileToDirectory ($"native-builds/libHarfBuzzSharp_osx/build/{CONFIGURATION}/libHarfBuzzSharp.dylib", $"output/native/osx/{arch}");

StripSign ($"output/native/osx/{arch}/libHarfBuzzSharp.dylib");
});
Expand Down Expand Up @@ -298,12 +298,12 @@ Task ("externals-ios")
Target = "libSkiaSharp",
Sdk = sdk,
Arch = arch,
Configuration = "Release",
Configuration = CONFIGURATION,
});

// copy libSkiaSharp to output
EnsureDirectoryExists ($"output/native/ios/{arch}");
CopyDirectory ($"native-builds/libSkiaSharp_ios/build/Release-{sdk}", $"output/native/ios/{arch}");
CopyDirectory ($"native-builds/libSkiaSharp_ios/build/{CONFIGURATION}-{sdk}", $"output/native/ios/{arch}");

StripSign ($"output/native/ios/{arch}/libSkiaSharp.framework");
});
Expand Down Expand Up @@ -332,12 +332,12 @@ Task ("externals-ios")
Target = "libHarfBuzzSharp",
Sdk = sdk,
Arch = arch,
Configuration = "Release",
Configuration = CONFIGURATION,
});

// copy libHarfBuzzSharp_ios to output
EnsureDirectoryExists ($"output/native/ios/{arch}");
CopyFileToDirectory ($"native-builds/libHarfBuzzSharp_ios/build/Release-{sdk}/libHarfBuzzSharp.a", $"output/native/ios/{arch}");
CopyFileToDirectory ($"native-builds/libHarfBuzzSharp_ios/build/{CONFIGURATION}-{sdk}/libHarfBuzzSharp.a", $"output/native/ios/{arch}");

StripSign ($"output/native/ios/{arch}/libHarfBuzzSharp.a");
});
Expand Down Expand Up @@ -382,12 +382,12 @@ Task ("externals-tvos")
Target = "libSkiaSharp",
Sdk = sdk,
Arch = arch,
Configuration = "Release",
Configuration = CONFIGURATION,
});

// copy libSkiaSharp to output
EnsureDirectoryExists ($"output/native/tvos/{arch}");
CopyDirectory ($"native-builds/libSkiaSharp_tvos/build/Release-{sdk}", $"output/native/tvos/{arch}");
CopyDirectory ($"native-builds/libSkiaSharp_tvos/build/{CONFIGURATION}-{sdk}", $"output/native/tvos/{arch}");

StripSign ($"output/native/tvos/{arch}/libSkiaSharp.framework");
});
Expand All @@ -412,12 +412,12 @@ Task ("externals-tvos")
Target = "libHarfBuzzSharp",
Sdk = sdk,
Arch = arch,
Configuration = "Release",
Configuration = CONFIGURATION,
});

// copy libHarfBuzzSharp to output
EnsureDirectoryExists ($"output/native/tvos/{arch}");
CopyFileToDirectory ($"native-builds/libHarfBuzzSharp_tvos/build/Release-{sdk}/libHarfBuzzSharp.a", $"output/native/tvos/{arch}");
CopyFileToDirectory ($"native-builds/libHarfBuzzSharp_tvos/build/{CONFIGURATION}-{sdk}/libHarfBuzzSharp.a", $"output/native/tvos/{arch}");

StripSign ($"output/native/tvos/{arch}/libHarfBuzzSharp.a");
});
Expand Down Expand Up @@ -459,12 +459,12 @@ Task ("externals-watchos")
Target = "libSkiaSharp",
Sdk = sdk,
Arch = arch,
Configuration = "Release",
Configuration = CONFIGURATION,
});

// copy libSkiaSharp to output
EnsureDirectoryExists ($"output/native/watchos/{arch}");
CopyDirectory ($"native-builds/libSkiaSharp_watchos/build/Release-{sdk}", $"output/native/watchos/{arch}");
CopyDirectory ($"native-builds/libSkiaSharp_watchos/build/{CONFIGURATION}-{sdk}", $"output/native/watchos/{arch}");

StripSign ($"output/native/watchos/{arch}/libSkiaSharp.framework");
});
Expand All @@ -489,12 +489,12 @@ Task ("externals-watchos")
Target = "libHarfBuzzSharp",
Sdk = sdk,
Arch = arch,
Configuration = "Release",
Configuration = CONFIGURATION,
});

// copy libHarfBuzzSharp to output
EnsureDirectoryExists ($"output/native/watchos/{arch}");
CopyFileToDirectory ($"native-builds/libHarfBuzzSharp_watchos/build/Release-{sdk}/libHarfBuzzSharp.a", $"output/native/watchos/{arch}");
CopyFileToDirectory ($"native-builds/libHarfBuzzSharp_watchos/build/{CONFIGURATION}-{sdk}/libHarfBuzzSharp.a", $"output/native/watchos/{arch}");

StripSign ($"output/native/watchos/{arch}/libHarfBuzzSharp.a");
});
Expand Down Expand Up @@ -658,27 +658,27 @@ Task ("externals-tizen")

// build libSkiaSharp
RunProcess (tizen, new ProcessSettings {
Arguments = $"build-native -a {skiaArch} -c llvm -C Release" ,
Arguments = $"build-native -a {skiaArch} -c llvm -C {CONFIGURATION}" ,
WorkingDirectory = ROOT_PATH.Combine ("native-builds/libSkiaSharp_tizen").FullPath,
});

// copy libSkiaSharp to output
var outDir = $"output/native/tizen/{arch}";
var libSkiaSharp = "native-builds/libSkiaSharp_tizen/Release/libskiasharp.so";
var libSkiaSharp = $"native-builds/libSkiaSharp_tizen/{CONFIGURATION}/libskiasharp.so";
EnsureDirectoryExists (outDir);
CopyFile (libSkiaSharp, $"{outDir}/libSkiaSharp.so");
});

var buildHarfBuzzArch = new Action<string, string> ((arch, skiaArch) => {
// build libHarfBuzzSharp
RunProcess(tizen, new ProcessSettings {
Arguments = $"build-native -a {skiaArch} -c llvm -C Release",
Arguments = $"build-native -a {skiaArch} -c llvm -C {CONFIGURATION}",
WorkingDirectory = ROOT_PATH.Combine ("native-builds/libHarfBuzzSharp_tizen").FullPath
});

// copy libHarfBuzzSharp to output
var outDir = $"output/native/tizen/{arch}";
var so = "native-builds/libHarfBuzzSharp_tizen/Release/libharfbuzzsharp.so";
var so = $"native-builds/libHarfBuzzSharp_tizen/{CONFIGURATION}/libharfbuzzsharp.so";
EnsureDirectoryExists ($"output/native/tizen/{arch}");
CopyFile (so, $"{outDir}/libHarfBuzzSharp.so");
});
Expand Down
11 changes: 10 additions & 1 deletion tests/Tests/HBBufferTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ public void ShouldHaveCorrectContentType()
{
using (var buffer = new Buffer())
{
buffer.Direction = Direction.LeftToRight;

Assert.Equal(ContentType.Invalid, buffer.ContentType);

buffer.AddUtf8(SimpleText);
Expand Down Expand Up @@ -107,6 +109,8 @@ public void ShouldThrowInvalidOperationExceptionOnAddUtfWhenBufferIsShaped()
{
using (var buffer = new Buffer())
{
buffer.Direction = Direction.LeftToRight;

buffer.AddUtf8(SimpleText);

Font.Shape(buffer);
Expand Down Expand Up @@ -223,13 +227,18 @@ public void ShouldNormalize()
{
using (var buffer = new Buffer())
{
buffer.Direction = Direction.LeftToRight;

buffer.AddUtf16("Â̶");

Font.Shape(buffer);

buffer.NormalizeGlyphs();

Assert.Equal(1027, buffer.GlyphPositions[1].YOffset);
Assert.Equal(0, buffer.GlyphPositions[0].XOffset);
Assert.Equal(0, buffer.GlyphPositions[0].YOffset);
Assert.Equal(-1135, buffer.GlyphPositions[1].XOffset);
Assert.Equal(0, buffer.GlyphPositions[1].YOffset);
}
}

Expand Down

0 comments on commit 4a65093

Please sign in to comment.