From ebba9f591ebb6f4d610bad36b5c5c82d474ec9e0 Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Thu, 14 Nov 2024 17:21:11 +0100 Subject: [PATCH] Small improvement to the build-info script. --- etc/build/build_info.sh | 12 +++++++++++- etc/build/freebsd/mk-release.sh | 2 +- .../post-install-helper/post-install-launcher.nsi | 1 - 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/etc/build/build_info.sh b/etc/build/build_info.sh index 2f4eb23..c596a7b 100755 --- a/etc/build/build_info.sh +++ b/etc/build/build_info.sh @@ -1,7 +1,17 @@ #!/bin/sh if [ -n "$1" ]; then CC="$1"; elif [ -z "$CC" ]; then CC="cc"; fi +if [ -e /etc/os-release ]; then + PLATFORM_NAME="`cat /etc/os-release | egrep '^PRETTY_NAME=' | cut -c 13- | tr -d '\042'`" +elif [ -x /usr/bin/sw_vers ]; then + PLATFORM_NAME="`/usr/bin/sw_vers -productName` `/usr/bin/sw_vers -productVersion`" +fi + +if [ -z "$PLATFORM_NAME" ]; then + PLATFORM_NAME="`uname -s -r -v -m`" +fi + echo "Built : `date -u +'%Y-%m-%d %H:%M:%S'`" -echo "Platform : `uname -s -r -v -m`" +echo "Platform : $PLATFORM_NAME" echo "Target : `$CC -dumpmachine`" echo "Compiler : `$CC -v 2>&1 | egrep -i '(gcc|clang)[[:space:]]+version' 2>/dev/null | head -n 1`" diff --git a/etc/build/freebsd/mk-release.sh b/etc/build/freebsd/mk-release.sh index c900999..a6835dc 100755 --- a/etc/build/freebsd/mk-release.sh +++ b/etc/build/freebsd/mk-release.sh @@ -3,7 +3,7 @@ set -e cd -- "$(dirname -- "${0}")/../../.." if [ -z "${cc_path}" ]; then - cc_path="/usr/local/bin/gcc13" + cc_path="/usr/local/bin/gcc14" fi mk_slunk() { diff --git a/etc/build/win32/post-install-helper/post-install-launcher.nsi b/etc/build/win32/post-install-helper/post-install-launcher.nsi index 765c5dd..7e51764 100644 --- a/etc/build/win32/post-install-helper/post-install-launcher.nsi +++ b/etc/build/win32/post-install-helper/post-install-launcher.nsi @@ -34,7 +34,6 @@ Section !insertmacro PrintStatusMessage "Detecting operating system, please wait..." ${IfNot} ${AtLeastBuild} 7601 MessageBox MB_ICONSTOP|MB_TOPMOST "This application runs on Windows 7 (SP1) or later!" - ExecShell "open" "https://support.microsoft.com/en-us/windows/install-windows-7-service-pack-1-sp1-b3da2c0f-cdb6-0572-8596-bab972897f61" Quit ${EndIf}