From 7f3eafb79d20b0be7357e5301d050e865a1a461b Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Mon, 13 Aug 2018 23:01:32 +0200 Subject: [PATCH] trim trailing whitespace --- build.cake | 19 ++++++++++++------ cake/BuildExternals.cake | 42 ++++++++++++++++++++-------------------- cake/UpdateDocs.cake | 11 ++--------- cake/UtilsManaged.cake | 16 +++++++-------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/build.cake b/build.cake index 194bbf6f..96c90c58 100644 --- a/build.cake +++ b/build.cake @@ -266,7 +266,7 @@ Task ("samples") } else { // this is a platform variant slnPlatform = slnPlatform.ToLower (); - var shouldBuild = + var shouldBuild = (isLinux && slnPlatform == ".linux") || (isMac && slnPlatform == ".mac") || (isWin && slnPlatform == ".windows"); @@ -285,10 +285,7 @@ Task ("samples") Task ("nuget") .IsDependentOn ("libs") - .IsDependentOn ("nuget-only") - .Does (() => -{ -}); + .IsDependentOn ("nuget-only"); Task ("nuget-only") .Does (() => @@ -392,6 +389,16 @@ Task ("nuget-only") } }); +//////////////////////////////////////////////////////////////////////////////////////////////////// +// DOCS - creating the xml, markdown and other documentation +//////////////////////////////////////////////////////////////////////////////////////////////////// + +Task ("update-docs") + .IsDependentOn ("docs-api-diff") + .IsDependentOn ("docs-api-diff-past") + .IsDependentOn ("docs-update-frameworks") + .IsDependentOn ("docs-format-docs"); + //////////////////////////////////////////////////////////////////////////////////////////////////// // CLEAN - remove all the build artefacts //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -470,7 +477,7 @@ Task ("Linux-CI") .IsDependentOn ("CI"); //////////////////////////////////////////////////////////////////////////////////////////////////// -// BUILD NOW +// BUILD NOW //////////////////////////////////////////////////////////////////////////////////////////////////// Information (""); diff --git a/cake/BuildExternals.cake b/cake/BuildExternals.cake index cdfddd36..2de7f4f8 100644 --- a/cake/BuildExternals.cake +++ b/cake/BuildExternals.cake @@ -42,7 +42,7 @@ void RunLipo (DirectoryPath directory, FilePath output, FilePath[] inputs) if (!IsRunningOnMac ()) { throw new InvalidOperationException ("lipo is only available on Unix."); } - + EnsureDirectoryExists (directory.CombineWithFilePath (output).GetDirectory ()); var inputString = string.Join(" ", inputs.Select (i => string.Format ("\"{0}\"", i))); @@ -67,7 +67,7 @@ Task ("externals-init") }); }); -// this builds the native C and C++ externals +// this builds the native C and C++ externals Task ("externals-native"); Task ("externals-native-skip"); @@ -223,7 +223,7 @@ Task ("externals-osx") // create the fat dylib RunLipo ("output/native/osx/", "libSkiaSharp.dylib", new [] { - (FilePath) "i386/libSkiaSharp.dylib", + (FilePath) "i386/libSkiaSharp.dylib", (FilePath) "x86_64/libSkiaSharp.dylib" }); @@ -251,7 +251,7 @@ Task ("externals-osx") // create the fat dylib RunLipo ("output/native/osx/", "libHarfBuzzSharp.dylib", new [] { - (FilePath) "i386/libHarfBuzzSharp.dylib", + (FilePath) "i386/libHarfBuzzSharp.dylib", (FilePath) "x86_64/libHarfBuzzSharp.dylib" }); }); @@ -310,14 +310,14 @@ Task ("externals-ios") buildArch ("iphonesimulator", "x86_64", "x64"); buildArch ("iphoneos", "armv7", "arm"); buildArch ("iphoneos", "arm64", "arm64"); - + // create the fat framework CopyDirectory ("output/native/ios/armv7/libSkiaSharp.framework/", "output/native/ios/libSkiaSharp.framework/"); DeleteFile ("output/native/ios/libSkiaSharp.framework/libSkiaSharp"); RunLipo ("output/native/ios/", "libSkiaSharp.framework/libSkiaSharp", new [] { - (FilePath) "i386/libSkiaSharp.framework/libSkiaSharp", - (FilePath) "x86_64/libSkiaSharp.framework/libSkiaSharp", - (FilePath) "armv7/libSkiaSharp.framework/libSkiaSharp", + (FilePath) "i386/libSkiaSharp.framework/libSkiaSharp", + (FilePath) "x86_64/libSkiaSharp.framework/libSkiaSharp", + (FilePath) "armv7/libSkiaSharp.framework/libSkiaSharp", (FilePath) "arm64/libSkiaSharp.framework/libSkiaSharp" }); @@ -344,12 +344,12 @@ Task ("externals-ios") buildHarfBuzzArch ("iphonesimulator", "x86_64"); buildHarfBuzzArch ("iphoneos", "armv7"); buildHarfBuzzArch ("iphoneos", "arm64"); - + // create the fat archive RunLipo ("output/native/ios/", "libHarfBuzzSharp.a", new [] { - (FilePath) "i386/libHarfBuzzSharp.a", - (FilePath) "x86_64/libHarfBuzzSharp.a", - (FilePath) "armv7/libHarfBuzzSharp.a", + (FilePath) "i386/libHarfBuzzSharp.a", + (FilePath) "x86_64/libHarfBuzzSharp.a", + (FilePath) "armv7/libHarfBuzzSharp.a", (FilePath) "arm64/libHarfBuzzSharp.a" }); }); @@ -392,12 +392,12 @@ Task ("externals-tvos") buildArch ("appletvsimulator", "x86_64", "x64"); buildArch ("appletvos", "arm64", "arm64"); - + // create the fat framework CopyDirectory ("output/native/tvos/arm64/libSkiaSharp.framework/", "output/native/tvos/libSkiaSharp.framework/"); DeleteFile ("output/native/tvos/libSkiaSharp.framework/libSkiaSharp"); RunLipo ("output/native/tvos/", "libSkiaSharp.framework/libSkiaSharp", new [] { - (FilePath) "x86_64/libSkiaSharp.framework/libSkiaSharp", + (FilePath) "x86_64/libSkiaSharp.framework/libSkiaSharp", (FilePath) "arm64/libSkiaSharp.framework/libSkiaSharp" }); @@ -422,10 +422,10 @@ Task ("externals-tvos") buildHarfBuzzArch ("appletvsimulator", "x86_64"); buildHarfBuzzArch ("appletvos", "arm64"); - + // create the fat framework RunLipo ("output/native/tvos/", "libHarfBuzzSharp.a", new [] { - (FilePath) "x86_64/libHarfBuzzSharp.a", + (FilePath) "x86_64/libHarfBuzzSharp.a", (FilePath) "arm64/libHarfBuzzSharp.a" }); }); @@ -481,7 +481,7 @@ Task ("externals-watchos") CopyDirectory ("output/native/watchos/armv7k/libSkiaSharp.framework/", "output/native/watchos/libSkiaSharp.framework/"); DeleteFile ("output/native/watchos/libSkiaSharp.framework/libSkiaSharp"); RunLipo ("output/native/watchos/", "libSkiaSharp.framework/libSkiaSharp", new [] { - (FilePath) "i386/libSkiaSharp.framework/libSkiaSharp", + (FilePath) "i386/libSkiaSharp.framework/libSkiaSharp", (FilePath) "armv7k/libSkiaSharp.framework/libSkiaSharp" }); @@ -506,10 +506,10 @@ Task ("externals-watchos") buildHarfBuzzArch ("watchsimulator", "i386"); buildHarfBuzzArch ("watchos", "armv7k"); - + // create the fat framework RunLipo ("output/native/watchos/", "libHarfBuzzSharp.a", new [] { - (FilePath) "i386/libHarfBuzzSharp.a", + (FilePath) "i386/libHarfBuzzSharp.a", (FilePath) "armv7k/libHarfBuzzSharp.a" }); }); @@ -554,7 +554,7 @@ Task ("externals-android") RunProcess (ndkbuild, new ProcessSettings { Arguments = "", WorkingDirectory = ROOT_PATH.Combine ("native-builds/libHarfBuzzSharp_android").FullPath, - }); + }); // copy libSkiaSharp to output foreach (var folder in new [] { "x86", "x86_64", "armeabi-v7a", "arm64-v8a" }) { @@ -715,7 +715,7 @@ Task ("externals-angle-uwp") Task ("externals-harfbuzz") .WithCriteria ( - !FileExists (HARFBUZZ_PATH.CombineWithFilePath ("harfbuzz/README")) || + !FileExists (HARFBUZZ_PATH.CombineWithFilePath ("harfbuzz/README")) || !FileExists (HARFBUZZ_PATH.CombineWithFilePath ($"harfbuzz-{GetVersion ("harfbuzz", "release")}.tar.bz2"))) .Does (() => { diff --git a/cake/UpdateDocs.cake b/cake/UpdateDocs.cake index 5f66d4cf..184c48b5 100644 --- a/cake/UpdateDocs.cake +++ b/cake/UpdateDocs.cake @@ -285,14 +285,7 @@ Task ("docs-format-docs") // log summary Information ( - "Documentation missing in {0}/{1} ({2:0.0%}) types and {3}/{4} ({5:0.0%}) members.", - typeCount, totalTypes, typeCount / totalTypes, + "Documentation missing in {0}/{1} ({2:0.0%}) types and {3}/{4} ({5:0.0%}) members.", + typeCount, totalTypes, typeCount / totalTypes, memberCount, totalMembers, memberCount / totalMembers); }); - -Task ("update-docs") - .IsDependentOn ("docs-api-diff") - .IsDependentOn ("docs-api-diff-past") - .IsDependentOn ("docs-update-frameworks") - .IsDependentOn ("docs-format-docs"); - \ No newline at end of file diff --git a/cake/UtilsManaged.cake b/cake/UtilsManaged.cake index 8920f9c5..f068ed9c 100644 --- a/cake/UtilsManaged.cake +++ b/cake/UtilsManaged.cake @@ -3,8 +3,8 @@ var MSBuildNS = (XNamespace) "http://schemas.microsoft.com/developer/msbuild/200 var RunMSBuildWithPlatform = new Action ((solution, platform) => { - MSBuild (solution, c => { - c.Configuration = "Release"; + MSBuild (solution, c => { + c.Configuration = "Release"; c.Verbosity = VERBOSITY; c.Properties ["Platform"] = new [] { platform }; c.MSBuildPlatform = MSBuildPlatform.x86; @@ -16,8 +16,8 @@ var RunMSBuildWithPlatform = new Action ((solution, platform) var RunMSBuildWithPlatformTarget = new Action ((solution, platformTarget) => { - MSBuild (solution, c => { - c.Configuration = "Release"; + MSBuild (solution, c => { + c.Configuration = "Release"; c.Verbosity = VERBOSITY; c.PlatformTarget = (PlatformTarget)Enum.Parse(typeof(PlatformTarget), platformTarget); if (!string.IsNullOrEmpty (MSBuildToolPath)) { @@ -28,8 +28,8 @@ var RunMSBuildWithPlatformTarget = new Action ((solution, plat var RunMSBuildRestore = new Action ((solution) => { - MSBuild (solution, c => { - c.Configuration = "Release"; + MSBuild (solution, c => { + c.Configuration = "Release"; c.Targets.Clear(); c.Targets.Add("Restore"); c.Verbosity = VERBOSITY; @@ -44,8 +44,8 @@ var RunMSBuildRestore = new Action ((solution) => var RunMSBuildRestoreLocal = new Action ((solution, packagesDir) => { var dir = solution.GetDirectory (); - MSBuild (solution, c => { - c.Configuration = "Release"; + MSBuild (solution, c => { + c.Configuration = "Release"; c.Targets.Clear(); c.Targets.Add("Restore"); c.Verbosity = VERBOSITY;