WIP3

Author: knocte

.github/workflows/CI.yml

@@ -38,7 +38,7 @@ jobs:
         /Library/Frameworks/Xamarin.iOS.framework/Versions/Current/bin/mtouch --version
         ls -l /Library/Frameworks/Xamarin.Android.framework/Versions/
     - name: run
-      run: make run
+      run: ./configure.sh && make run
 
   macOS--mono-only:
     runs-on: macOS-13
@@ -60,7 +60,7 @@ jobs:
         /Library/Frameworks/Xamarin.iOS.framework/Versions/Current/bin/mtouch --version
         ls -l /Library/Frameworks/Xamarin.Android.framework/Versions/
     - name: run
-      run: make run
+      run: ./configure.sh && make run
 
   macOS--dotnet6-only:
     runs-on: macOS-13
@@ -75,7 +75,7 @@ jobs:
     - name: HACK to emulate mono uninstall
       run: sudo rm -f `which mono` && sudo rm -f `which msbuild`
     - name: run
-      run: make run
+      run: configure.sh && make run
 
   windows--dotnet6-and-legacyFramework:
     runs-on: windows-latest
@@ -88,7 +88,7 @@ jobs:
       with:
         dotnet-version: '6.0.113'
     - name: run
-      run: .\make.bat run
+      run: .\configure.bat && .\make.bat run
 
   windows--legacyFramework-only:
     runs-on: windows-2022
@@ -99,7 +99,7 @@ jobs:
     - name: HACK to emulate dotnet uninstall
       run: del $(where.exe dotnet)
     - name: run
-      run: .\make.bat run
+      run: .\configure.bat && .\make.bat run
 
   windows--dotnet6-only:
     runs-on: windows-latest
@@ -114,7 +114,7 @@ jobs:
     - name: HACK to emulate legacy .NETFramework uninstall
       run: del $(& "${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -find MSBuild\\**\\Bin\\MSBuild.exe)
     - name: run
-      run: .\make.bat run
+      run: .\configure.bat && .\make.bat run
 
   linux22-github--dotnet-and-mono:
     runs-on: ubuntu-22.04
@@ -127,7 +127,7 @@ jobs:
     - name: check mono version
       run: mono --version
     - name: run
-      run: make run
+      run: ./configure.sh && make run
 
   linux22-github--dotnet-and-newmono:
     runs-on: ubuntu-22.04
@@ -142,7 +142,7 @@ jobs:
     - name: check mono version
       run: mono --version
     - name: run
-      run: make run
+      run: ./configure.sh && make run
 
   linux22-vanilla--stockmono-only:
     runs-on: ubuntu-22.04
@@ -166,7 +166,7 @@ jobs:
     - name: check mono version
       run: mono --version
     - name: run
-      run: make run
+      run: ./configure.sh && make run
 
   linux22-vanilla--stockdotnet6-only:
     runs-on: ubuntu-22.04
@@ -188,7 +188,7 @@ jobs:
       run: git config --global --add safe.directory '*'
 
     - name: run
-      run: make run
+      run: ./configure.sh && make run
 
   linux22-vanilla--stockdotnet6-and-newmono:
     runs-on: ubuntu-22.04
@@ -212,7 +212,7 @@ jobs:
       run: git config --global --add safe.directory '*'
 
     - name: run
-      run: make run
+      run: ./configure.sh && make run
 
   linux22-vanilla--stockdotnet6-and-stockmono:
     runs-on: ubuntu-22.04
@@ -234,7 +234,7 @@ jobs:
       run: git config --global --add safe.directory '*'
 
     - name: run
-      run: make run
+      run: ./configure.sh && make run
 
   linux22-vanilla--newmono-only:
     runs-on: ubuntu-22.04
@@ -260,4 +260,4 @@ jobs:
     - name: check mono version
       run: mono --version
     - name: run
-      run: make run
+      run: ./configure.sh && make run

make.bat

@@ -1,5 +1,9 @@
 @ECHO OFF
 
+IF NOT EXIST "scripts\build.config" (
+    echo "ERROR: configure hasn't been run yet, run .\configure.bat first" && EXIT /b 1
+)
+
 where /q dotnet
 IF ERRORLEVEL 1 (
     CALL scripts\fsx\Tools\fsi.bat scripts\make.fsx %*

scripts/make.fsx

@@ -48,6 +48,77 @@ let rec private GatherTarget (args: string list, targetSet: Option<string>): Opt
             failwith "only one target can be passed to make"
         GatherTarget (tail, Some (head))
 
+let buildConfigFileName = "build.config"
+let buildConfigContents =
+    let buildConfig =
+        Path.Combine (FsxHelper.ScriptsDir.FullName, buildConfigFileName)
+        |> FileInfo
+    if not (buildConfig.Exists) then
+        let configureLaunch =
+            match Misc.GuessPlatform() with
+            | Misc.Platform.Windows -> ".\\configure.bat"
+            | _ -> "./configure.sh"
+        Console.Error.WriteLine (sprintf "ERROR: configure hasn't been run yet, run %s first"
+                                         configureLaunch)
+        Environment.Exit 1
+
+    let configFileLines = File.ReadAllLines buildConfig.FullName
+    let skipBlankLines line = not <| String.IsNullOrWhiteSpace line
+    let splitLineIntoKeyValueTuple (line:string) =
+        let pair = line.Split([|'='|], StringSplitOptions.RemoveEmptyEntries)
+        if pair.Length <> 2 then
+            failwithf "All lines in '%s' must conform to key=value format, but got: '%s'. All lines: \n%s"
+                      buildConfigFileName
+                      line
+                      (File.ReadAllText buildConfig.FullName)
+        pair.[0], pair.[1]
+
+    let buildConfigContents =
+        configFileLines
+        |> Array.filter skipBlankLines
+        |> Array.map splitLineIntoKeyValueTuple
+        |> Map.ofArray
+    buildConfigContents
+
+let GetOrExplain key map =
+    match map |> Map.tryFind key with
+    | Some k -> k
+    | None   -> failwithf "No entry exists in %s with a key '%s'."
+                          buildConfigFileName key
+
+let prefix = buildConfigContents |> GetOrExplain "Prefix"
+let libPrefixDir = DirectoryInfo (Path.Combine (prefix, "lib", UNIX_NAME))
+let binPrefixDir = DirectoryInfo (Path.Combine (prefix, "bin"))
+
+let launcherScriptFile =
+    Path.Combine (FsxHelper.ScriptsDir.FullName, "bin", UNIX_NAME)
+    |> FileInfo
+let mainBinariesDir binaryConfig =
+    Path.Combine (
+        FsxHelper.RootDir.FullName,
+        "src",
+        DEFAULT_FRONTEND,
+        "bin",
+        binaryConfig.ToString())
+    |> DirectoryInfo
+
+let wrapperScript = """#!/usr/bin/env bash
+set -eo pipefail
+
+if [[ $SNAP ]]; then
+    PKG_DIR=$SNAP/usr
+    export MONO_PATH=$PKG_DIR/lib/mono/4.5
+    export MONO_CONFIG=$SNAP/etc/mono/config
+    export MONO_CFG_DIR=$SNAP/etc
+    export MONO_REGISTRY_PATH=~/.mono/registry
+    export MONO_GAC_PREFIX=$PKG_DIR/lib/mono/gac/
+fi
+
+DIR_OF_THIS_SCRIPT=$(dirname "$(realpath "$0")")
+FRONTEND_PATH="$DIR_OF_THIS_SCRIPT/../lib/$UNIX_NAME/$GWALLET_PROJECT.exe"
+exec mono "$FRONTEND_PATH" "$@"
+"""
+
 #if LEGACY_FRAMEWORK
 let PrintNugetVersion () =
     if not (FsxHelper.NugetExe.Exists) then

scripts/make.sh

@@ -1,4 +1,9 @@
 #!/usr/bin/env bash
 set -exo pipefail
 
+BUILD_CONFIG="./scripts/build.config"
+if [ ! -f "$BUILD_CONFIG" ]; then
+    echo "ERROR: configure hasn't been run yet, run ./configure.sh first" >&2 && exit 1
+fi
+source "$BUILD_CONFIG"
 FsxRunnerBin=$FsxRunnerBin FsxRunnerArg=$FsxRunnerArg $FsxRunnerBin $FsxRunnerArg ./scripts/make.fsx "$@"

src/GWallet.Frontend.Console/Program.fs

@@ -510,15 +510,4 @@ let UpdateServersStats () =
 
 [<EntryPoint>]
 let main argv =
-    match argv.Length with
-    | 0 ->
-        NormalStartWithNoParameters()
-    | 1 when argv.[0] = "--version" ->
-        Console.WriteLine (sprintf "geewallet v%s" VersionHelper.CURRENT_VERSION)
-        0
-    | 1 when argv.[0] = "--update-servers-file" ->
-        UpdateServersFile()
-    | 1 when argv.[0] = "--update-servers-stats" ->
-        UpdateServersStats()
-    | _ ->
-        failwith "Arguments not recognized"
+    Console.WriteLine "hello"