From 201e7a90a8bb63d096f01930367718a9fd4775fa Mon Sep 17 00:00:00 2001
From: jolavillette <jolavillette@gmail.com>
Date: Sun, 19 Jul 2026 16:35:32 +0200
Subject: [PATCH] build(macos): align the .dmg name with the AppImage/Windows
 scheme
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rename the deploy output so macOS matches the shared convention:
  RetroShare-v<ver>-<YYYYMMDD>-<count>-g<hash>-Qt-<qtver>-macos-<min>-<arch>.dmg

- add the leading 'v' and drop the old '-macOS-<arch>' infix;
- the runtime slot is 'macos-<min>', the minimum macOS version to run (the
  binary's deployment target, read via otool) — the macOS analog of the
  AppImage's glibc-<min>;
- '<arch>' (arm64 / x86_64, from uname -m) moves to the end.

Purely a naming change; deployment behaviour is unchanged.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 build_scripts/OSX/deploy-macos.sh | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/build_scripts/OSX/deploy-macos.sh b/build_scripts/OSX/deploy-macos.sh
index 58f3af9e6..af7c09bbb 100755
--- a/build_scripts/OSX/deploy-macos.sh
+++ b/build_scripts/OSX/deploy-macos.sh
@@ -87,7 +87,21 @@ fi
 MACVERSION=$(sw_vers -productVersion 2>/dev/null || echo "UnknownOS")
 ARCH=$(uname -m)
 
-ARCHIVE_BASE="RetroShare-${VERSION}-macOS-${ARCH}${GIT_SUFFIX}-Qt-${QT_VERSION}"
+# Minimum macOS version to run = the deployment target baked into the built
+# binary (the macOS analog of the AppImage's glibc floor / min glibc to run).
+# Read it from the GUI binary's load commands (LC_BUILD_VERSION `minos`, or the
+# older LC_VERSION_MIN_MACOSX `version`); fall back to the build host's version.
+MINOS=$(otool -l "$GUI_BIN" 2>/dev/null \
+        | grep -A3 -E 'LC_BUILD_VERSION|LC_VERSION_MIN_MACOSX' \
+        | grep -oE '(minos|version) [0-9]+(\.[0-9]+)+' \
+        | grep -oE '[0-9]+(\.[0-9]+)+' | head -1)
+[ -n "$MINOS" ] || MINOS="$MACVERSION"
+
+# Naming mirrors the Linux AppImage and Windows schemes:
+#   RetroShare-v<ver>-<YYYYMMDD>-<count>-g<hash>-Qt-<qtver>-macos-<min>-<arch>.dmg
+# GIT_SUFFIX already carries "-<YYYYMMDD>-<count>-g<hash>" (or just the date when
+# exactly on a tag).
+ARCHIVE_BASE="RetroShare-v${VERSION}${GIT_SUFFIX}-Qt-${QT_VERSION}-macos-${MINOS}-${ARCH}"
 DEPLOY_DIR="${BUILD_DIR}/${ARCHIVE_BASE}"
 
 echo "  Target Package Name: ${ARCHIVE_BASE}"