From bb31a7befce1260cd0a7dfce6b7cb0e3b985d0a3 Mon Sep 17 00:00:00 2001 From: Noah <2+noah@noreply.gitea.bluefla.re> Date: Tue, 3 Nov 2026 15:26:56 -0600 Subject: [PATCH] macOS build: universal app for Apple Silicon and Intel, macOS 11+ - scripts/build-wx-macos.sh: static, monolithic, universal (arm64 + x86_64) wxOSX/Cocoa 3.3.3 from the vendored tree, with wx's bundled image/zlib/regex/expat so the app links only system frameworks. Minimum macOS 11.0: current SDKs' libc++ supports nothing older. - scripts/build-gui-macos.sh: builds both Rust targets against that prefix and merges them with lipo. - ci/package-macos.py: "Alkane Toolkit.app" (Info.plist, icon, local network usage string), ad-hoc signed, zipped with ditto as alkane-toolkit-vX.Y.Z-macos-universal.zip with LICENSE and README. - crates/alkane-gui/macos: app icon (.icns) from the same glyph as the Windows icon, plus the script that makes it. - wx-rs patch 0009: macOS goes through wx-config (drops the universal -arch flags, maps -framework), reports logical sizes like GTK/MSW instead of narrowing floats to ints, and links clang's compiler runtime for wxOSX's @available checks. - docs/macos.md, README and the manual's install chapter. Verified on an M1 running macOS 27.0.1: both slices build, all workspace unit tests pass, and the headless UI self-test passes 52/52 on arm64. Co-Authored-By: Claude Opus 5.5 --- README.md | 4 +- ci/package-macos.py | 109 ++++++++++++++ crates/alkane-gui/macos/alkane-toolkit.icns | Bin 0 -> 60026 bytes crates/alkane-gui/macos/make-icon.sh | 34 +++++ docs/macos.md | 62 ++++++++ docs/manual/01-getting-started.md | 11 ++ scripts/build-gui-macos.sh | 31 +++- scripts/build-wx-macos.sh | 43 ++++++ .../wx-rs/patches/0009-macos-build.patch | 140 ++++++++++++++++++ thirdparty/wx-rs/patches/README.md | 1 + thirdparty/wx-rs/wx-rs-0.2.0-patched/build.rs | 67 ++++++++- .../wx-rs-0.2.0-patched/cpp_src/wxbridge.cpp | 28 +--- 12 files changed, 495 insertions(+), 35 deletions(-) create mode 100755 ci/package-macos.py create mode 100644 crates/alkane-gui/macos/alkane-toolkit.icns create mode 100755 crates/alkane-gui/macos/make-icon.sh create mode 100644 docs/macos.md create mode 100755 scripts/build-wx-macos.sh create mode 100644 thirdparty/wx-rs/patches/0009-macos-build.patch diff --git a/README.md b/README.md index 6395e402..e0a00dc7 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,9 @@ uses offline fixtures and does not contact hardware. Windows 10/11 builds are cross-compiled on Linux (`scripts/build-wx-windows.sh`, then `scripts/build-gui-windows.sh`) and attached to every release as a self-contained `alkane-toolkit.exe`; see [docs/windows.md](docs/windows.md). -macOS is not built. +macOS builds run on a Mac (`scripts/build-wx-macos.sh`, then +`scripts/build-gui-macos.sh`) and produce one universal app for Apple Silicon +and Intel, macOS 11 or later; see [docs/macos.md](docs/macos.md). ## Current scope diff --git a/ci/package-macos.py b/ci/package-macos.py new file mode 100755 index 00000000..78c2613b --- /dev/null +++ b/ci/package-macos.py @@ -0,0 +1,109 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: MIT +"""Package the universal macOS build as an app bundle, for release. + + package-macos.py VERSION BINARY OUT_DIR + +BINARY is the universal (arm64 + x86_64) alkane-toolkit executable made by +scripts/build-gui-macos.sh. Writes +dist/alkane-toolkit-vVERSION-macos-universal.zip holding "Alkane Toolkit.app", +LICENSE and README.txt, and prints its path. Runs on macOS (lipo, codesign, +ditto). + +The bundle is ad-hoc signed only (Apple Silicon refuses to run unsigned +code); it is not signed with a Developer ID or notarized, so Gatekeeper asks +the user to confirm the first launch. README.txt says how. +""" + +import pathlib +import plistlib +import shutil +import subprocess +import sys +import tempfile + +ROOT = pathlib.Path(__file__).resolve().parents[1] +APP = "Alkane Toolkit.app" +BUNDLE_ID = "re.bluefla.alkane-toolkit" +MIN_MACOS = "11.0" + + +def run(*args: str) -> str: + return subprocess.run(args, check=True, capture_output=True, text=True).stdout + + +def build_app(version: str, binary: pathlib.Path, dest: pathlib.Path) -> pathlib.Path: + archs = run("lipo", "-archs", str(binary)).split() + if sorted(archs) != ["arm64", "x86_64"]: + sys.exit(f"{binary} is not a universal arm64 + x86_64 binary: {archs}") + app = dest / APP + macos = app / "Contents" / "MacOS" + resources = app / "Contents" / "Resources" + macos.mkdir(parents=True) + resources.mkdir() + shutil.copy2(binary, macos / "alkane-toolkit") + shutil.copy2(ROOT / "crates/alkane-gui/macos/alkane-toolkit.icns", resources) + info = { + "CFBundleName": "Alkane Toolkit", + "CFBundleDisplayName": "Alkane Toolkit", + "CFBundleIdentifier": BUNDLE_ID, + "CFBundleExecutable": "alkane-toolkit", + "CFBundleIconFile": "alkane-toolkit", + "CFBundlePackageType": "APPL", + "CFBundleShortVersionString": version, + "CFBundleVersion": version, + "CFBundleInfoDictionaryVersion": "6.0", + "LSMinimumSystemVersion": MIN_MACOS, + "NSHighResolutionCapable": True, + "NSPrincipalClass": "NSApplication", + # The scanner talks to miners on the local network. + "NSLocalNetworkUsageDescription": + "Alkane Toolkit scans your local network to find and manage miners.", + "NSHumanReadableCopyright": + "Copyright (c) 2026 BlueFlare Energy Solutions Inc. (MIT License)", + } + with open(app / "Contents" / "Info.plist", "wb") as fh: + plistlib.dump(info, fh) + (app / "Contents" / "PkgInfo").write_text("APPL????") + # Ad-hoc signature over the whole bundle (the linker's per-slice + # signatures do not cover Info.plist or the resources). + run("codesign", "--force", "--sign", "-", "--timestamp=none", str(app)) + run("codesign", "--verify", "--strict", str(app)) + return app + + +def release(version: str, binary: str, out_dir: str) -> None: + name = f"alkane-toolkit-v{version}-macos-universal" + out = pathlib.Path(out_dir).resolve() / f"{name}.zip" + out.parent.mkdir(parents=True, exist_ok=True) + readme = ( + f"alkane-toolkit v{version} (macOS, Apple Silicon and Intel)\n" + "\n" + f"Runs on macOS {MIN_MACOS} (Big Sur) or later. Drag \"Alkane Toolkit\"\n" + "to Applications, then open it.\n" + "\n" + "The app is not notarized by Apple, so the first launch is blocked\n" + "with a warning. To allow it once:\n" + " - macOS 15 or later: try to open it, then System Settings >\n" + " Privacy & Security > \"Open Anyway\" for Alkane Toolkit.\n" + " - macOS 11 to 14: Control-click the app, choose Open, then Open.\n" + "Or, in Terminal: xattr -dr com.apple.quarantine \"/Applications/Alkane Toolkit.app\"\n" + "\n" + "Settings are stored in ~/.config/alkane-toolkit/.\n" + "Manual: https://blueflare.gitea.bluefla.re/alkane-toolkit/manual/\n" + ) + with tempfile.TemporaryDirectory(prefix="alkane-macos-") as tmp: + folder = pathlib.Path(tmp) / name + folder.mkdir() + build_app(version, pathlib.Path(binary), folder) + shutil.copy2(ROOT / "LICENSE", folder / "LICENSE") + (folder / "README.txt").write_text(readme) + out.unlink(missing_ok=True) + run("ditto", "-c", "-k", "--keepParent", str(folder), str(out)) + print(out) + + +if __name__ == "__main__": + if len(sys.argv) != 4: + sys.exit(__doc__) + release(*sys.argv[1:]) diff --git a/crates/alkane-gui/macos/alkane-toolkit.icns b/crates/alkane-gui/macos/alkane-toolkit.icns new file mode 100644 index 0000000000000000000000000000000000000000..80bee99c891aa3b539ee723f3fc16b949d5a8a1c GIT binary patch literal 60026 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 literal 0 HcmV?d00001 diff --git a/crates/alkane-gui/macos/make-icon.sh b/crates/alkane-gui/macos/make-icon.sh new file mode 100755 index 00000000..8e1b7ce0 --- /dev/null +++ b/crates/alkane-gui/macos/make-icon.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# Regenerate alkane-toolkit.icns (the macOS app icon) from the in-repo +# microchip glyph: the same white chip on a rounded amber tile as the Windows +# icon, at the sizes macOS asks for (16-1024 px). Needs rsvg-convert, +# ImageMagick and python3; the .icns is committed, so a build never runs this. +set -e +cd "$(dirname "$0")" +GLYPH=../assets/icons/microchip-solid-full.svg +TMP=$(mktemp -d) +trap 'rm -rf "$TMP"' 0 +sed 's/currentColor/#ffffff/g; s/ "$TMP/glyph.svg" +for s in 16 32 64 128 256 512 1024; do + # Apple's grid: the tile fills ~80% of the canvas, centred. + t=$((s * 80 / 100)); m=$(((s - t) / 2)); r=$((t * 22 / 100)) + g=$((t * 60 / 100)); o=$(((s - g) / 2)) + rsvg-convert -w "$g" -h "$g" "$TMP/glyph.svg" -o "$TMP/g$s.png" + convert -size "${s}x${s}" xc:none -fill '#d9822b' \ + -draw "roundrectangle $m,$m $((m + t - 1)),$((m + t - 1)) $r,$r" \ + "$TMP/g$s.png" -geometry "+$o+$o" -composite "PNG32:$TMP/i$s.png" +done +python3 - "$TMP" alkane-toolkit.icns <<'PY' +import pathlib, struct, sys +tmp, out = pathlib.Path(sys.argv[1]), sys.argv[2] +# ICNS element types that hold PNG data, by pixel size. +types = [("icp4", 16), ("icp5", 32), ("icp6", 64), ("ic07", 128), ("ic08", 256), + ("ic09", 512), ("ic10", 1024), ("ic11", 32), ("ic12", 64), ("ic13", 256), + ("ic14", 512)] +body = b"" +for kind, size in types: + data = (tmp / f"i{size}.png").read_bytes() + body += kind.encode() + struct.pack(">I", len(data) + 8) + data +pathlib.Path(out).write_bytes(b"icns" + struct.pack(">I", len(body) + 8) + body) +PY +echo "wrote $(pwd)/alkane-toolkit.icns" diff --git a/docs/macos.md b/docs/macos.md new file mode 100644 index 00000000..4a2d5d97 --- /dev/null +++ b/docs/macos.md @@ -0,0 +1,62 @@ +# macOS + +The macOS build is one universal app, `Alkane Toolkit.app`, that runs natively +on Apple Silicon and Intel Macs with macOS 11 (Big Sur) or later. It ships as +`alkane-toolkit-vX.Y.Z-macos-universal.zip`, holding the app, `LICENSE` and a +`README.txt`. + +## Using it + +- Settings live in `~/.config/alkane-toolkit`, the same files as on Linux. +- SSH actions use the system `ssh`; HTTP actions use the system `curl`. +- The app is ad-hoc signed but not notarized, so macOS blocks the first launch. + On macOS 15 or later, try to open it, then choose **Open Anyway** in + System Settings > Privacy & Security. On macOS 11 to 14, Control-click the + app and choose **Open**. Or clear the quarantine flag once: + `xattr -dr com.apple.quarantine "/Applications/Alkane Toolkit.app"`. +- The first scan asks for permission to find devices on the local network + (macOS 15 and later). Scanning needs it. +- Offline demo: `ALKANE_FAKE_SCAN=1 "/Applications/Alkane Toolkit.app/Contents/MacOS/alkane-toolkit"`. + +## Building + +macOS builds only on a Mac. It needs the Xcode Command Line Tools +(`xcode-select --install`) and rustup with both Apple targets: + +```sh +rustup target add aarch64-apple-darwin x86_64-apple-darwin +scripts/build-wx-macos.sh # once: universal static wxOSX 3.3.3 in ~/.cache/wx-3.3.3-macos +scripts/build-gui-macos.sh # both slices, merged with lipo +python3 ci/package-macos.py X.Y.Z target/universal-apple-darwin/release/alkane-toolkit dist +``` + +`build-wx-macos.sh` builds wxWidgets once for arm64 and x86_64 together, with +wx's bundled image, zlib, regex and expat libraries, so the app links only +against system frameworks. `build-gui-macos.sh` builds each Rust target +against that prefix and merges them. `package-macos.py` writes the bundle +(Info.plist, icon), ad-hoc signs it and zips it with `ditto`. + +To test on the Mac: + +```sh +ALKANE_SELFTEST=1 target/universal-apple-darwin/release/alkane-toolkit # headless UI self-test +cargo test --release --offline --target aarch64-apple-darwin --workspace --exclude wx-rs +``` + +The self-test opens a window briefly, so it needs a logged-in desktop +session. Running the x86_64 slice on Apple Silicon needs Rosetta 2. + +## Why macOS 11 + +Current Xcode SDKs ship a libc++ that supports macOS 11 and later only; +building for an older target compiles, but the app could fail at run time on +the older system. macOS 11 is also the first release for Apple Silicon. Older +Intel Macs would need a build with an older SDK. + +## Notes for the bridge + +wxOSX reports logical (point) sizes, like the GTK and MSW bridges; the +bridge never scales to physical pixels. wxOSX's Objective-C uses +`@available`, so `build.rs` links clang's compiler runtime +(`libclang_rt.osx.a`), which rustc's link does not include by itself. Both +are wx-rs patch `0009`. diff --git a/docs/manual/01-getting-started.md b/docs/manual/01-getting-started.md index 56ecbff7..b6194a44 100644 --- a/docs/manual/01-getting-started.md +++ b/docs/manual/01-getting-started.md @@ -14,6 +14,7 @@ Get the latest release from the |---|---|---| | Windows 10 and 11 (x86_64) | `alkane-toolkit-vX.Y.Z-windows-x86_64.zip` | One signed `alkane-toolkit.exe`; nothing to install | | Linux (x86_64) | `alkane-toolkit-vX.Y.Z-linux-x86_64.tar.gz` | One binary; needs GTK 3 (`sudo apt install libgtk-3-0`) | +| macOS 11 or later (Apple Silicon and Intel) | `alkane-toolkit-vX.Y.Z-macos-universal.zip` | One app; not notarized, so confirm the first launch | ### Windows @@ -23,6 +24,16 @@ Get the latest release from the the verified publisher. To check the signature yourself, right-click the exe, choose **Properties** and open **Digital Signatures**. +### macOS + +1. Download the zip and open it; drag **Alkane Toolkit** to Applications. +2. Open it. The app is not notarized, so macOS blocks the first launch: + - macOS 15 or later: open **System Settings > Privacy & Security** and + choose **Open Anyway** for Alkane Toolkit. + - macOS 11 to 14: Control-click the app, choose **Open**, then **Open**. +3. When asked, allow it to find devices on your local network. Scanning + needs this. + ### Linux ```sh diff --git a/scripts/build-gui-macos.sh b/scripts/build-gui-macos.sh index 73245879..abd32615 100755 --- a/scripts/build-gui-macos.sh +++ b/scripts/build-gui-macos.sh @@ -1,9 +1,28 @@ #!/bin/sh -# Build the alkane-toolkit GUI on macOS. -# wx-rs upstream supports macOS: its build.rs clones/builds wx 3.2.2.1 into -# ./dist (osx-release-build) on first build. Requires Xcode Command Line -# Tools. Run this ON a Mac - macOS cannot be linked from Linux. +# Build the alkane-toolkit GUI on macOS as one universal binary. +# +# scripts/build-gui-macos.sh [extra cargo build args] +# -> target/universal-apple-darwin/release/alkane-toolkit (arm64 + x86_64) +# +# Needs the Xcode Command Line Tools, rustup with the aarch64-apple-darwin and +# x86_64-apple-darwin targets, and the universal static wx prefix from +# scripts/build-wx-macos.sh (WX_MACOS_PREFIX, default ~/.cache/wx-3.3.3-macos). +# Each target is built separately against that prefix, then the two slices +# are merged with lipo. MACOSX_DEPLOYMENT_TARGET matches the wx build. set -e cd "$(dirname -- "$0")/.." -cargo build --release -p alkane-gui -echo "binary: target/release/alkane-toolkit (app bundle packaging is follow-up)" +PREFIX="${WX_MACOS_PREFIX:-$HOME/.cache/wx-3.3.3-macos}" +[ -x "$PREFIX/bin/wx-config" ] || { + echo "no wx prefix at $PREFIX; run scripts/build-wx-macos.sh first" >&2; exit 1; } +export WX_RS_WXCONFIG="$PREFIX/bin/wx-config" +export MACOSX_DEPLOYMENT_TARGET="${MACOSX_MIN:-11.0}" +for target in aarch64-apple-darwin x86_64-apple-darwin; do + cargo build --release --offline --locked -p alkane-gui --target "$target" "$@" +done +out=target/universal-apple-darwin/release +mkdir -p "$out" +lipo -create -output "$out/alkane-toolkit" \ + target/aarch64-apple-darwin/release/alkane-toolkit \ + target/x86_64-apple-darwin/release/alkane-toolkit +lipo -info "$out/alkane-toolkit" +echo "binary: $out/alkane-toolkit" diff --git a/scripts/build-wx-macos.sh b/scripts/build-wx-macos.sh new file mode 100755 index 00000000..b5fb6cd7 --- /dev/null +++ b/scripts/build-wx-macos.sh @@ -0,0 +1,43 @@ +#!/bin/sh +# Build the vendored wxWidgets 3.3.3 for macOS: wxOSX/Cocoa, static, +# monolithic, and universal (arm64 + x86_64) so one prefix serves both Rust +# targets. Run on a Mac with the Xcode Command Line Tools. +# +# scripts/build-wx-macos.sh -> ~/.cache/wx-3.3.3-macos +# +# Dependency tracking is off: its bootstrap fails with several -arch flags. +# MACOSX_MIN (default 11.0) is the oldest macOS the app runs on, for both +# slices: the libc++ in current SDKs supports nothing older, and macOS 11 is +# also where Apple Silicon starts. Image/zlib/regex/expat libraries are +# wx's bundled copies, so the app links only against system frameworks. +# The repo's vendor tree stays pristine; the build lives in ~/.cache/wxbuild. +set -e +REPO=$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd) +SRC="$REPO/thirdparty/wxwidgets/wxWidgets-3.3.3" +BUILD="$HOME/.cache/wxbuild/wxWidgets-3.3.3-macos" +PREFIX="${WX_MACOS_PREFIX:-$HOME/.cache/wx-3.3.3-macos}" +MACOSX_MIN="${MACOSX_MIN:-11.0}" +JOBS="${JOBS:-$(sysctl -n hw.ncpu)}" +[ -d "$SRC" ] || { echo "thirdparty wxWidgets tree missing: $SRC" >&2; exit 1; } +rm -rf "$BUILD" +mkdir -p "$HOME/.cache/wxbuild" +cp -R "$SRC" "$BUILD" +trap 'rm -rf "$BUILD"' 0 +chmod +x "$BUILD/configure" "$BUILD/config.guess" "$BUILD/config.sub" "$BUILD/install-sh" 2>/dev/null || true +mkdir -p "$BUILD/build-macos" +cd "$BUILD/build-macos" +sh ../configure --prefix="$PREFIX" --with-osx_cocoa \ + --disable-shared --enable-monolithic \ + --enable-universal_binary=arm64,x86_64 \ + --with-macosx-version-min="$MACOSX_MIN" \ + --disable-dependency-tracking \ + --with-libpng=builtin --with-libjpeg=builtin --without-libtiff \ + --with-zlib=builtin --with-expat=builtin --with-regex=builtin \ + --without-liblzma --without-libcurl \ + --with-opengl=no --disable-stc --disable-webview --disable-mediactrl \ + --disable-tests +make -j"$JOBS" +make install +lib=$(ls "$PREFIX"/lib/libwx_osx_cocoau-3.3*.a | head -1) +lipo -info "$lib" +echo "installed: $PREFIX ($lib)" diff --git a/thirdparty/wx-rs/patches/0009-macos-build.patch b/thirdparty/wx-rs/patches/0009-macos-build.patch new file mode 100644 index 00000000..5d2f5c07 --- /dev/null +++ b/thirdparty/wx-rs/patches/0009-macos-build.patch @@ -0,0 +1,140 @@ +Subject: [PATCH 0009] macOS: wxOSX through wx-config, logical sizes, clang runtime + +--- a/build.rs ++++ b/build.rs +@@ -42,12 +42,12 @@ + target_os() == "linux" + } + +-// alkane-toolkit patch: Linux (wxGTK) and Windows/GNU (wxMSW built with +-// mingw-w64, natively or cross from Linux) both build against a wx prefix +-// described by its wx-config script, so they share one code path. Upstream's +-// MSVC/nmake and macOS download-and-build paths are left as they were. ++// alkane-toolkit patch: Linux (wxGTK), macOS (wxOSX/Cocoa, universal static ++// build) and Windows/GNU (wxMSW built with mingw-w64, natively or cross from ++// Linux) all build against a wx prefix described by its wx-config script, so ++// they share one code path. Upstream's MSVC/nmake path is left as it was. + fn uses_wx_config() -> bool { +- is_linux() || (is_windows() && !is_msvc()) ++ is_linux() || is_osx() || (is_windows() && !is_msvc()) + } + + fn is_stub() -> bool { +@@ -278,7 +278,14 @@ + build.cpp(true) + .file("cpp_src/wxbridge.cpp") + .file("cpp_src/widgets_bridge.cpp"); +- for f in cxxflags.split_whitespace() { ++ let mut flags = cxxflags.split_whitespace(); ++ while let Some(f) = flags.next() { ++ // A universal wx prefix reports `-arch arm64 -arch x86_64`; cargo builds ++ // one target at a time and cc adds that target's own -arch. ++ if is_osx() && f == "-arch" { ++ flags.next(); ++ continue; ++ } + build.flag(f); + } + if is_linux() { +@@ -308,7 +315,53 @@ + } + build.compile("wxbridge"); + +- for flag in libs.split_whitespace() { ++ if is_osx() { ++ // wxOSX's Objective-C uses @available, which calls ++ // ___isPlatformVersionAtLeast from clang's compiler runtime. clang ++ // links that runtime itself, but rustc drives the link without it. ++ let resource_dir = Command::new("clang") ++ .arg("-print-resource-dir") ++ .output() ++ .ok() ++ .filter(|o| o.status.success()) ++ .and_then(|o| String::from_utf8(o.stdout).ok()) ++ .map(|s| s.trim().to_string()) ++ .ok_or("wx-rs: cannot ask clang for its resource directory")?; ++ let rt = Path::new(&resource_dir).join("lib").join("darwin"); ++ if !rt.join("libclang_rt.osx.a").exists() { ++ return Err(format!("wx-rs: no libclang_rt.osx.a in {}", rt.display()).into()); ++ } ++ println!("cargo:rustc-link-search=native={}", rt.display()); ++ println!("cargo:rustc-link-lib=static=clang_rt.osx"); ++ } ++ ++ let mut lib_flags = libs.split_whitespace(); ++ while let Some(flag) = lib_flags.next() { ++ if is_osx() { ++ match flag { ++ "-arch" => { ++ lib_flags.next(); ++ continue; ++ } ++ "-framework" => { ++ if let Some(name) = lib_flags.next() { ++ println!("cargo:rustc-link-lib=framework={}", name); ++ } ++ continue; ++ } ++ "-weak_framework" => { ++ if let Some(name) = lib_flags.next() { ++ println!("cargo:rustc-link-arg=-Wl,-weak_framework,{}", name); ++ } ++ continue; ++ } ++ _ if flag.starts_with("-Wl,") => { ++ println!("cargo:rustc-link-arg={}", flag); ++ continue; ++ } ++ _ => {} ++ } ++ } + if flag.ends_with(".a") && Path::new(flag).is_absolute() { + // static wx builds: wx-config emits the archive as a full path + let file = Path::new(flag).file_name().and_then(|f| f.to_str()).unwrap_or(flag); +--- a/cpp_src/wxbridge.cpp ++++ b/cpp_src/wxbridge.cpp +@@ -492,21 +492,12 @@ + + // The logical window size + Size get_client_size() { +-#ifdef __APPLE__ +- int status_bar_height; +- if (wxGetApp().frame->GetStatusBar()) { +- status_bar_height = wxGetApp().frame->GetStatusBar()->GetRect().height; +- } else { +- status_bar_height = 0; +- } +- float scale_factor = wxGetApp().frame->GetDPIScaleFactor(); +- wxSize s = wxGetApp().frame->GetClientSize(); +- struct Size sz = {s.x * scale_factor, (s.y + status_bar_height) * scale_factor}; +- return sz; +-#elif defined(__linux__) +- // alkane-toolkit patch: wxGTK3 path (upstream only knew Apple vs Windows) ++#if defined(__linux__) || defined(__APPLE__) ++ // alkane-toolkit patch: wxGTK3 and wxOSX both report logical (DIP) sizes, ++ // like every other bridge size. Upstream's Apple branch scaled to physical ++ // pixels through a float -> int narrowing current clang rejects. + wxSize s = wxGetApp().frame->GetClientSize(); +- return Size {(unsigned int)s.x, (unsigned int)s.y}; ++ return Size {s.x, s.y}; + #else + HWND hwnd = (HWND) wxGetApp().frame->GetHandle(); + RECT rect; +@@ -559,15 +550,10 @@ + } + + Size get_mouse_position(wxMouseEvent &event) { +-#ifdef __APPLE__ +- wxPoint p = event.GetPosition(); +- float scale_factor = wxGetApp().frame->GetDPIScaleFactor(); +- struct Size s = {p.x * scale_factor, p.y * scale_factor}; +- return s; +-#else ++ // alkane-toolkit patch: logical (DIP) coordinates on every platform, ++ // matching get_client_size (upstream scaled them on Apple). + wxPoint p = event.GetPosition(); + return Size {p.x, p.y}; +-#endif + } + + int get_mouse_wheel_rotation(wxMouseEvent &event) { diff --git a/thirdparty/wx-rs/patches/README.md b/thirdparty/wx-rs/patches/README.md index af0b6791..45db9776 100644 --- a/thirdparty/wx-rs/patches/README.md +++ b/thirdparty/wx-rs/patches/README.md @@ -27,6 +27,7 @@ later changes go in new patches. | 0006 | Build: platform from the target, not the host; Windows/GNU via `wx-config` | | 0007 | `wxbridge.cpp` on wxMSW: no input-swallowing overlay, appearance before the first window, work-area sizing, executable icon, UTF-8 menu fix | | 0008 | Widget bridge on wxMSW: generic data-view input and tooltips, DIP boundary, anti-aliased shapes, themed selection colours | +| 0009 | macOS: wxOSX (universal static) through `wx-config`, logical sizes on Apple, clang compiler runtime for `@available` | History: the round 19 health-tooltip fix (GTK tip area converted from bin-window to widget coordinates) used to be a separate patch on top of an diff --git a/thirdparty/wx-rs/wx-rs-0.2.0-patched/build.rs b/thirdparty/wx-rs/wx-rs-0.2.0-patched/build.rs index 86b586ef..48628b20 100644 --- a/thirdparty/wx-rs/wx-rs-0.2.0-patched/build.rs +++ b/thirdparty/wx-rs/wx-rs-0.2.0-patched/build.rs @@ -42,12 +42,12 @@ fn is_linux() -> bool { target_os() == "linux" } -// alkane-toolkit patch: Linux (wxGTK) and Windows/GNU (wxMSW built with -// mingw-w64, natively or cross from Linux) both build against a wx prefix -// described by its wx-config script, so they share one code path. Upstream's -// MSVC/nmake and macOS download-and-build paths are left as they were. +// alkane-toolkit patch: Linux (wxGTK), macOS (wxOSX/Cocoa, universal static +// build) and Windows/GNU (wxMSW built with mingw-w64, natively or cross from +// Linux) all build against a wx prefix described by its wx-config script, so +// they share one code path. Upstream's MSVC/nmake path is left as it was. fn uses_wx_config() -> bool { - is_linux() || (is_windows() && !is_msvc()) + is_linux() || is_osx() || (is_windows() && !is_msvc()) } fn is_stub() -> bool { @@ -278,7 +278,14 @@ fn build_with_wx_config() -> Result<(), Box> { build.cpp(true) .file("cpp_src/wxbridge.cpp") .file("cpp_src/widgets_bridge.cpp"); - for f in cxxflags.split_whitespace() { + let mut flags = cxxflags.split_whitespace(); + while let Some(f) = flags.next() { + // A universal wx prefix reports `-arch arm64 -arch x86_64`; cargo builds + // one target at a time and cc adds that target's own -arch. + if is_osx() && f == "-arch" { + flags.next(); + continue; + } build.flag(f); } if is_linux() { @@ -308,7 +315,53 @@ fn build_with_wx_config() -> Result<(), Box> { } build.compile("wxbridge"); - for flag in libs.split_whitespace() { + if is_osx() { + // wxOSX's Objective-C uses @available, which calls + // ___isPlatformVersionAtLeast from clang's compiler runtime. clang + // links that runtime itself, but rustc drives the link without it. + let resource_dir = Command::new("clang") + .arg("-print-resource-dir") + .output() + .ok() + .filter(|o| o.status.success()) + .and_then(|o| String::from_utf8(o.stdout).ok()) + .map(|s| s.trim().to_string()) + .ok_or("wx-rs: cannot ask clang for its resource directory")?; + let rt = Path::new(&resource_dir).join("lib").join("darwin"); + if !rt.join("libclang_rt.osx.a").exists() { + return Err(format!("wx-rs: no libclang_rt.osx.a in {}", rt.display()).into()); + } + println!("cargo:rustc-link-search=native={}", rt.display()); + println!("cargo:rustc-link-lib=static=clang_rt.osx"); + } + + let mut lib_flags = libs.split_whitespace(); + while let Some(flag) = lib_flags.next() { + if is_osx() { + match flag { + "-arch" => { + lib_flags.next(); + continue; + } + "-framework" => { + if let Some(name) = lib_flags.next() { + println!("cargo:rustc-link-lib=framework={}", name); + } + continue; + } + "-weak_framework" => { + if let Some(name) = lib_flags.next() { + println!("cargo:rustc-link-arg=-Wl,-weak_framework,{}", name); + } + continue; + } + _ if flag.starts_with("-Wl,") => { + println!("cargo:rustc-link-arg={}", flag); + continue; + } + _ => {} + } + } if flag.ends_with(".a") && Path::new(flag).is_absolute() { // static wx builds: wx-config emits the archive as a full path let file = Path::new(flag).file_name().and_then(|f| f.to_str()).unwrap_or(flag); diff --git a/thirdparty/wx-rs/wx-rs-0.2.0-patched/cpp_src/wxbridge.cpp b/thirdparty/wx-rs/wx-rs-0.2.0-patched/cpp_src/wxbridge.cpp index 96b0e3aa..3b2c213d 100644 --- a/thirdparty/wx-rs/wx-rs-0.2.0-patched/cpp_src/wxbridge.cpp +++ b/thirdparty/wx-rs/wx-rs-0.2.0-patched/cpp_src/wxbridge.cpp @@ -492,21 +492,12 @@ extern "C" { // The logical window size Size get_client_size() { -#ifdef __APPLE__ - int status_bar_height; - if (wxGetApp().frame->GetStatusBar()) { - status_bar_height = wxGetApp().frame->GetStatusBar()->GetRect().height; - } else { - status_bar_height = 0; - } - float scale_factor = wxGetApp().frame->GetDPIScaleFactor(); - wxSize s = wxGetApp().frame->GetClientSize(); - struct Size sz = {s.x * scale_factor, (s.y + status_bar_height) * scale_factor}; - return sz; -#elif defined(__linux__) - // alkane-toolkit patch: wxGTK3 path (upstream only knew Apple vs Windows) +#if defined(__linux__) || defined(__APPLE__) + // alkane-toolkit patch: wxGTK3 and wxOSX both report logical (DIP) sizes, + // like every other bridge size. Upstream's Apple branch scaled to physical + // pixels through a float -> int narrowing current clang rejects. wxSize s = wxGetApp().frame->GetClientSize(); - return Size {(unsigned int)s.x, (unsigned int)s.y}; + return Size {s.x, s.y}; #else HWND hwnd = (HWND) wxGetApp().frame->GetHandle(); RECT rect; @@ -559,15 +550,10 @@ extern "C" { } Size get_mouse_position(wxMouseEvent &event) { -#ifdef __APPLE__ - wxPoint p = event.GetPosition(); - float scale_factor = wxGetApp().frame->GetDPIScaleFactor(); - struct Size s = {p.x * scale_factor, p.y * scale_factor}; - return s; -#else + // alkane-toolkit patch: logical (DIP) coordinates on every platform, + // matching get_client_size (upstream scaled them on Apple). wxPoint p = event.GetPosition(); return Size {p.x, p.y}; -#endif } int get_mouse_wheel_rotation(wxMouseEvent &event) { -- 2.54.0