scripts/configure.fsx: put Frontend in cfg summary

To be able to reuse the way of checking for GTK via pkg-config in
both configure and Makefile we had to put it in fsxHelper.fs, which
in turn required me to convert a tuple into a function (and add one
more case to its potential error msg).

scripts/configure.fsx

@@ -15,6 +15,8 @@ open System.Configuration
 open Fsdk
 open Fsdk.Process
 
+#load "fsxHelper.fs"
+open GWallet.Scripting
 
 let rootDir = DirectoryInfo(Path.Combine(__SOURCE_DIRECTORY__, ".."))
 
@@ -148,6 +150,18 @@ let version = Misc.GetCurrentVersion(rootDir)
 
 let repoInfo = Git.GetRepoInfo()
 
+let frontend =
+    match buildTool, Misc.GuessPlatform() with
+    | "dotnet", _ -> "Console"
+    | _, Misc.Platform.Linux ->
+        if FsxHelper.IsGtkPresent() then
+            "Xamarin.Forms"
+        else
+            "Console"
+    | "msbuild", _ ->
+        "Xamarin.Forms"
+    | _ -> "Console"
+
 Console.WriteLine()
 Console.WriteLine(sprintf
                       "\tConfiguration summary for geewallet %s %s"
@@ -162,6 +176,9 @@ Console.WriteLine(sprintf
 Console.WriteLine(sprintf
                       "\t* .NET build tool: %s"
                       (if buildTool = "dotnet" then "dotnet build" else buildTool))
+Console.WriteLine(sprintf
+                      "\t* Frontend: %s"
+                      frontend)
 Console.WriteLine()
 
 Console.WriteLine "Configuration succeeded, you can now run `make`"

scripts/fsxHelper.fs

@@ -4,6 +4,7 @@ open System
 open System.IO
 
 open Fsdk
+open Fsdk.Process
 
 module FsxHelper =
 
@@ -19,7 +20,16 @@ module FsxHelper =
             |> ignore
         dir
 
-    let FsxRunnerBin,FsxRunnerArg =
+    let IsGtkPresent() =
+        if Misc.GuessPlatform() <> Misc.Platform.Linux then
+            failwith "Gtk is only supported in Linux"
+
+        let pkgConfigForGtkProc = Process.Execute({ Command = "pkg-config"; Arguments = "gtk-sharp-2.0" }, Echo.All)
+        match pkgConfigForGtkProc.Result with
+        | Error _ -> false
+        | _ -> true
+
+    let FsxRunnerInfo() =
         match Misc.GuessPlatform() with
         | Misc.Platform.Windows ->
 #if !LEGACY_FRAMEWORK
@@ -34,6 +44,10 @@ module FsxHelper =
                 let msg = "FsxRunnerBin env var not found, it should have been sourced from build.config file"
                 let msgFull =
                     msg + Environment.NewLine +
-                    "(maybe you meant to run a Makefile target rather than this script directly; or there is a .sh wrapper script for your .fsx script)"
+                    (sprintf "(maybe you 1. %s, or 2. %s, or 3. %s)"
+                        "called this from configure.fsx (which is not supported, just use this func from make.fsx or sanitycheck.fsx)"
+                        "you meant to run a Makefile target rather than this script directly?"
+                        "there is a .sh wrapper script for your .fsx script"
+                    )
                 failwith msgFull
             fsxRunnerBinEnvVar, fsxRunnerArgEnvVar

scripts/make.fsx

@@ -300,13 +300,7 @@ let JustBuild binaryConfig maybeConstant: Frontend*FileInfo =
 
                 Frontend.Console
             | Misc.Platform.Linux ->
-                let pkgConfigForGtkProc = Process.Execute({ Command = "pkg-config"; Arguments = "gtk-sharp-2.0" }, Echo.All)
-                let isGtkPresent =
-                    match pkgConfigForGtkProc.Result with
-                    | Error _ -> false
-                    | _ -> true
-
-                if isGtkPresent then
+                if FsxHelper.IsGtkPresent() then
                     let solution = LINUX_SOLUTION_FILE
 #if LEGACY_FRAMEWORK
                     ExplicitRestore solution
@@ -615,10 +609,11 @@ match maybeTarget with
 #endif
 
     let sanityCheckScript = Path.Combine(FsxHelper.ScriptsDir.FullName, "sanitycheck.fsx")
+    let fsxRunnerBin,fsxRunnerArg = FsxHelper.FsxRunnerInfo()
     Process.Execute(
         {
-            Command = FsxHelper.FsxRunnerBin
-            Arguments = sprintf "%s %s" FsxHelper.FsxRunnerArg sanityCheckScript
+            Command = fsxRunnerBin
+            Arguments = sprintf "%s %s" fsxRunnerArg sanityCheckScript
         },
         Echo.All
     ).UnwrapDefault() |> ignore<string>

scripts/sanitycheck.fsx

@@ -98,11 +98,12 @@ let FindOffendingPrintfUsage () =
             Path.DirectorySeparatorChar
         )
 
+    let fsxRunnerBin, fsxRunnerArg = FsxHelper.FsxRunnerInfo()
     let proc =
         {
-            Command = FsxHelper.FsxRunnerBin
+            Command = fsxRunnerBin
             Arguments = sprintf "%s %s --exclude=%s %s"
-                                FsxHelper.FsxRunnerArg
+                                fsxRunnerArg
                                 findScript
                                 excludeFolders
                                 "printf failwithf"