Merge pull request #220 from aarani/wip/byeKzu

GTK build with dotnet6+xbuild.
nblockchain · Oct 13, 2023 · 31870f9 · 31870f9
2 parents ae262f1 + 4d00028
commit 31870f9
Show file tree

Hide file tree

Showing 18 changed files with 350 additions and 492 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,11 @@
+# NOTE: newer commits are above, older ones below
+
+# GitHubCI: cosmetic, use `--yes` instead of `-y`
+3e02b8291c7ae377222f67bb18a0f6222a74c46f
+
+# scripts/make.fsx: cosmetic, use longer flag name
+94aadcc339724f6528cba39e22581dc6fe16717b
+
+# scripts/make.fsx: cosmetic, use longer flag name
+ae83bae269359e9431ec670764d20e5bb452b15e
+
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -218,7 +218,7 @@ jobs:
     - name: check mono version
       run: mono --version
     - name: install GTK libs (dependency of GTK frontend)
-      run: sudo apt install -y libgtk2.0-cil-dev
+      run: sudo apt install --yes libgtk2.0-cil-dev
     - name: configure
       run: ./configure.sh
     - name: build in DEBUG mode (retry 3 times because of flakey XamForms restore)
@@ -248,7 +248,11 @@ jobs:
     - name: install sudo
       run: apt update && apt install --yes sudo
     - name: install all dependencies
-      run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl fsharp nunit-console
+      run: |
+        # needed by fsx submodule
+        sudo apt install --yes curl
+
+        sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make fsharp nunit-console
 
     # workaround for https://github.com/actions/runner/issues/2033
     - name: ownership workaround
@@ -284,7 +288,7 @@ jobs:
     - name: install sudo
       run: apt update && apt install --yes sudo
     - name: install all dependencies
-      run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet6
+      run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet6
 
     # workaround for https://github.com/actions/runner/issues/2033
     - name: ownership workaround
@@ -326,7 +330,7 @@ jobs:
     - name: install sudo
       run: apt update && apt install --yes sudo
     - name: install all dependencies
-      run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet6
+      run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet6
     - name: install last version of mono (Microsoft APT repositories)
       run: sudo ./scripts/install_mono_from_microsoft_deb_packages.sh
 
@@ -370,8 +374,9 @@ jobs:
     - name: install sudo
       run: apt update && apt install --yes sudo
     - name: install all dependencies
-      run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet6 mono-xbuild
-
+      run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet6 mono-xbuild fsharp
+    - name: install GTK libs (dependency of GTK frontend)
+      run: sudo apt install --yes libgtk2.0-cil-dev
     # workaround for https://github.com/actions/runner/issues/2033
     - name: ownership workaround
       run: git config --global --add safe.directory '*'
@@ -412,7 +417,7 @@ jobs:
     - name: install sudo
       run: apt update && apt install --yes sudo
     - name: install all dependencies
-      run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl fsharp nunit-console
+      run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make fsharp nunit-console
     - name: install last version of mono (Microsoft APT repositories)
       run: sudo ./scripts/install_mono_from_microsoft_deb_packages.sh
 
@@ -423,7 +428,7 @@ jobs:
     - name: check mono version
       run: mono --version
     - name: install GTK libs (dependency of GTK frontend)
-      run: sudo apt install -y libgtk2.0-cil-dev
+      run: sudo apt install --yes libgtk2.0-cil-dev
     - name: configure
       run: ./configure.sh
     - name: build in DEBUG mode (retry 3 times because of flakey XamForms restore)
@@ -477,7 +482,7 @@ jobs:
     - name: check mono version
       run: mono --version
     - name: install GTK libs (dependency of GTK frontend)
-      run: sudo apt install -y libgtk2.0-cil-dev
+      run: sudo apt install --yes libgtk2.0-cil-dev
     - name: configure
       run: ./configure.sh
     - name: build in DEBUG mode (retry 3 times because of flakey XamForms restore)
@@ -507,7 +512,11 @@ jobs:
     - name: install sudo
       run: apt update && apt install --yes sudo
     - name: install all dependencies
-      run: sudo apt install --yes git make curl fsharp nunit-console
+      run: |
+        # needed by fsx submodule
+        sudo apt install --yes curl
+
+        sudo apt install --yes git make fsharp nunit-console
 
     # workaround for https://github.com/actions/runner/issues/2033
     - name: ownership workaround
@@ -543,7 +552,7 @@ jobs:
     - name: install sudo
       run: apt update && apt install --yes sudo
     - name: install all dependencies
-      run: sudo apt install --yes git make curl fsharp nunit-console
+      run: sudo apt install --yes git make fsharp nunit-console
     - name: install last version of mono (Microsoft APT repositories)
       run: sudo ./scripts/install_mono_from_microsoft_deb_packages.sh
 
@@ -554,7 +563,7 @@ jobs:
     - name: check mono version
       run: mono --version
     - name: install GTK libs (dependency of GTK frontend)
-      run: sudo apt install -y libgtk2.0-cil-dev
+      run: sudo apt install --yes libgtk2.0-cil-dev
     - name: configure
       run: ./configure.sh
     - name: build in DEBUG mode (retry 3 times because of flakey XamForms restore)
@@ -631,15 +640,14 @@ jobs:
     - name: Install snap tools
       run: |
         sudo apt update
-        sudo ./scripts/install_mono_from_microsoft_deb_packages.sh
         ./scripts/install_snapcraft.sh
 
-    # hack to disable dotnet detection (can't use apt purge because github VM seems to have it installed in different way)
-    # NOTE: you might think an easier way to do this would be use container:\nimage: ubuntu22.04 and then not install dotnet pkg,
+    # hack to disable msbuild detection
+    # NOTE: you might think an easier way to do this would be use container:\nimage: ubuntu22.04 and then not install msbuild,
     #       but that doesn't work because we get the following error when trying to install snapcraft via `snap install --classic`:
     # > error: cannot communicate with server: Post "http://localhost/v2/snaps/snapcraft": dial unix /run/snapd.socket: connect: no such file or directory
-    - name: HACK to emulate dotnet uninstall
-      run: sudo rm `which dotnet`
+    - name: HACK to emulate msbuild uninstall
+      run: sudo rm `which msbuild`
 
     - name: Generate snap package
       run: |

diff --git a/.gitignore b/.gitignore
@@ -22,9 +22,6 @@ TestResult.xml
 # backup files of some editors such as nano
 *~
 
-# autogenerated file by configure.sh
-before.gwallet.core-legacy.sln.targets
-
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 

diff --git a/NuGet.Restore.targets b/NuGet.Restore.targets
diff --git a/gwallet.sln → geewallet.sln b/gwallet.sln → geewallet.sln
@@ -42,14 +42,13 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "GWallet.Frontend.XF", "src\
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GWallet.Frontend.XF.iOS", "src\GWallet.Frontend.XF.iOS\GWallet.Frontend.XF.iOS.fsproj", "{5DD656CE-3319-46BB-B47F-BBED8CC722FD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "InfraLib", "InfraLib", "{6EE07541-91A1-42C2-A21F-2809BBDC2F50}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Fsdk", "Fsdk", "{6EE07541-91A1-42C2-A21F-2809BBDC2F50}"
 	ProjectSection(SolutionItems) = preProject
-		scripts\fsx\InfraLib\Misc.fs = scripts\fsx\InfraLib\Misc.fs
-		scripts\fsx\InfraLib\Unix.fs = scripts\fsx\InfraLib\Unix.fs
-		scripts\fsx\InfraLib\Taiga.fs = scripts\fsx\InfraLib\Taiga.fs
-		scripts\fsx\InfraLib\Process.fs = scripts\fsx\InfraLib\Process.fs
-		scripts\fsx\InfraLib\Network.fs = scripts\fsx\InfraLib\Network.fs
-		scripts\fsx\InfraLib\Git.fs = scripts\fsx\InfraLib\Git.fs
+		scripts\fsx\Fsdk\Misc.fs = scripts\fsx\Fsdk\Misc.fs
+		scripts\fsx\Fsdk\Unix.fs = scripts\fsx\Fsdk\Unix.fs
+		scripts\fsx\Fsdk\Process.fs = scripts\fsx\Fsdk\Process.fs
+		scripts\fsx\Fsdk\Network.fs = scripts\fsx\Fsdk\Network.fs
+		scripts\fsx\Fsdk\Git.fs = scripts\fsx\Fsdk\Git.fs
 	EndProjectSection
 EndProject
 Global