Build Rnote and Installer for Windows Arm64

build-aux/cargo_build.py

@@ -2,6 +2,7 @@
 
 import sys
 import os
+import platform
 
 project_build_root = sys.argv[1]
 project_src_root = sys.argv[2]
@@ -22,7 +23,16 @@
     output_file: {output_file}
 """, file=sys.stderr)
 
-cargo_call = f"env {cargo_env} {cargo_cmd} build {cargo_options}"
+# Detecting architecture
+if sys.platform == 'win32':
+    if platform.machine().lower() == 'arm64':
+        rustflags = '-C linker=clang'
+    else:
+        rustflags = ''
+else:
+    rustflags = ''
+
+cargo_call = f"env {cargo_env} RUSTFLAGS='{rustflags}' {cargo_cmd} build {cargo_options}"
 cp_call = f"cp {bin_output} {output_file}"
 
 print(cargo_call, file=sys.stderr)

build-aux/rnote_inno.iss.in

@@ -40,9 +40,9 @@ DisableProgramGroupPage=yes
 Compression=lzma2/ultra64
 SolidCompression=yes
 WizardStyle=modern
-; Run in 64-bit mode, restrict to x64 architecture.
-ArchitecturesAllowed=x64
-ArchitecturesInstallIn64BitMode=x64
+; Run in 64-bit mode, restrict to x64 and ARM64 architecture.
+ArchitecturesAllowed=x64 arm64
+ArchitecturesInstallIn64BitMode=x64 arm64
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"

meson_options.txt

@@ -33,5 +33,5 @@ option(
   'win-build-environment-path',
   type: 'string',
   value: 'C:\\msys64\\mingw64',
-  description: 'Only relevant for builds on Windows: the path of the installed msys/mingw64 environment.',
+  description: 'Only relevant for builds on Windows: the path of the installed msys/mingw64 (or msys/clangarm64) environment.',
 )

misc/building/rnote-windows-arm64-build.md

@@ -0,0 +1,96 @@
+# Build Instructions for Windows arm64
+
+## Prerequisites
+### Clone the repository
+
+```bash
+git clone https://github.com/flxzt/rnote
+git submodule update --init --recursive
+```
+
+### Install MSYS2
+- Install MSYS2 (using CLANGARM64 environment)
+- Update MSYS2:
+   ```Bash
+   pacman -Suy
+   ```
+- Add MSYS2 binary directories `C:\msys64\clangarm64\bin` and `C:\msys64\usr\bin` to the system environment variable Path.
+
+### (Optional) Install Inno Setup (for building the installer)
+
+### Install Dependencies
+Run the following command in the MSYS2 CLANGARM64 terminal to install necessary dependencies:
+
+```bash
+pacman -S mingw-w64-clang-aarch64-xz mingw-w64-clang-aarch64-pkgconf mingw-w64-clang-aarch64-clang \
+mingw-w64-clang-aarch64-toolchain mingw-w64-clang-aarch64-autotools mingw-w64-clang-aarch64-make mingw-w64-clang-aarch64-cmake \
+mingw-w64-clang-aarch64-meson mingw-w64-clang-aarch64-desktop-file-utils mingw-w64-clang-aarch64-appstream \
+mingw-w64-clang-aarch64-gtk4 mingw-w64-clang-aarch64-libadwaita mingw-w64-clang-aarch64-poppler mingw-w64-clang-aarch64-poppler-data \
+mingw-w64-clang-aarch64-angleproject
+```
+All the above packages are clang-aarch64 versions corresponding to x86_64 versions.
+The mingw-w64-x86_64-diffutils package doesn't have a corresponding clang-aarch64 version, so install mingw-w64-x86_64-diffutils directly:
+
+```bash
+pacman -S mingw-w64-x86_64-diffutils
+```
+
+### Install Rust
+Install Rust provided by MSYS2 (important)
+```bash
+pacman -S mingw-w64-clang-aarch64-rust
+```
+
+### Configuration
+
+Add the following line to the end of the `C:\msys64\home\<user>\.bashrc` file to add the Rust binary directory to MSYS2's `PATH`:
+
+```
+export PATH=$PATH:/c/msys64/clangarm64/bin
+```
+If you have installed Inno Setup, add the following line to the end of the `C:\msys64\home\<user>\.bashrc` file:
+
+```
+export PATH=$PATH:/c/msys64/clangarm64/bin:/c/Program\ Files\ \(x86\)/Inno\ Setup\ 6
+```
+Apply the configuration:
+
+```bash
+source ~/.bashrc
+```
+
+# Compile Rnote
+
+1. First, make sure you're in the correct directory:
+   ```bash
+   cd /c/rnote
+   ```
+
+2. Clean previous build files:
+   ```bash
+   rm -rf _mesonbuild
+   ```
+
+3. Reconfigure the project:
+    ```bash
+    meson setup --prefix="C:/msys64/clangarm64" -Dwin-installer-name='windows_arm64_installer' -Dwin-build-environment-path='C:\\msys64\\clangarm64' _mesonbuild
+    ```
+
+4. Compile the project:
+   ```bash
+   meson compile -C _mesonbuild
+   ```
+
+5. Install the project:
+   ```bash
+   meson install -C _mesonbuild
+   ```
+# Build the installer
+
+```bash
+meson compile rnote-gmo -C _mesonbuild
+```
+
+```bash
+meson compile build-installer -C _mesonbuild
+```