diff --git a/CMakeLists.txt b/CMakeLists.txt index 29fedd6ad..2f6c18af0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,7 @@ if(MUNT_EXTERNAL) endif() project(86Box - VERSION 5.2 + VERSION 6.0 DESCRIPTION "Emulator of x86-based systems" HOMEPAGE_URL "https://86box.net" LANGUAGES C CXX) diff --git a/bumpversion.sh b/bumpversion.sh index 6e2536cbe..76ef07554 100644 --- a/bumpversion.sh +++ b/bumpversion.sh @@ -43,23 +43,33 @@ pretty_date() { # Patch files. patch_file() { - # Stop if the file doesn't exist. - [ ! -e "$1" ] && return + # Parse arguments. + desc="$1" + shift + pattern="$1" + shift - # Patch file. - if sed -i -r -e "$3" "$1" - then - echo "[-] Patched $2 on $1" - else - echo "[!] Patching $2 on $1 failed" - fi + # Patch the specified files. + for file in "$@" + do + # Skip file if it doesn't exist. + [ ! -e "$file" ] && continue + + # Patch file. + if sed -i -r -e "$pattern" "$file" + then + echo "[-] Patched $desc in $file" + else + echo "[!] Patching $desc in $file failed" + fi + done } -patch_file CMakeLists.txt VERSION 's/^(\s*VERSION ).+/\1'"$newversion"'/' -patch_file vcpkg.json version-string 's/(^\s*"version-string"\s*:\s*")[^"]+/\1'"$newversion"'/' -patch_file src/unix/assets/*.spec Version 's/(Version:\s+)[0-9].+/\1'"$newversion"'/' -patch_file src/unix/assets/*.spec '%global romver' 's/(^%global\ romver\s+)[0-9]{8}/\1'"$romversion"'/' -patch_file src/unix/assets/*.spec 'changelog version' 's/(^[*]\s.*>\s+)[0-9].+/\1'"$newversion"-1'/' -patch_file src/unix/assets/*.spec 'changelog date' 's/(^[*]\s)[a-zA-Z]{3}\s[a-zA-Z]{3}\s[0-9]{2}\s[0-9]{4}/\1'"$(pretty_date)"'/' -patch_file src/unix/assets/*.metainfo.xml release 's/( .+/> '"$(date -R)"'/' -patch_file debian/changelog 'changelog version' 's/86box \(.+\)/86box \('"$newversion"'\)/' +patch_file VERSION 's/^(\s*VERSION ).+/\1'"$newversion"'/' CMakeLists.txt +patch_file version-string 's/(^\s*"version-string"\s*:\s*")[^"]+/\1'"$newversion"'/' vcpkg.json +patch_file Version 's/(Version:\s+)[0-9].+/\1'"$newversion"'/' src/unix/assets/*.spec +patch_file '%global romver' 's/(^%global\ romver\s+)[^\s]+/\1'"$romversion"'/' src/unix/assets/*.spec +patch_file 'changelog version' 's/(^[*]\s.*>\s+)[0-9].+/\1'"$newversion"-1'/' src/unix/assets/*.spec +patch_file 'changelog date' 's/(^[*]\s)[a-zA-Z]{3}\s[a-zA-Z]{3}\s[0-9]{2}\s[0-9]{4}/\1'"$(pretty_date)"'/' src/unix/assets/*.spec +patch_file release 's/( .+/> '"$(date -R)"'/' debian/changelog +patch_file 'changelog version' 's/86box \(.+\)/86box \('"$newversion"'\)/' debian/changelog diff --git a/debian/changelog b/debian/changelog index cfb4bd9d0..d2606a616 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -86box (5.2) UNRELEASED; urgency=medium +86box (6.0) UNRELEASED; urgency=medium * Bump release. - -- Jasmine Iwanek Thu, 18 Sep 2025 04:25:57 +0200 + -- Jasmine Iwanek Sun, 26 Oct 2025 17:41:47 +0100 diff --git a/src/unix/assets/86Box.spec b/src/unix/assets/86Box.spec index 27805a9e4..35916ffff 100644 --- a/src/unix/assets/86Box.spec +++ b/src/unix/assets/86Box.spec @@ -12,10 +12,10 @@ # After a successful build, you can install the RPMs as follows: # sudo dnf install RPMS/$(uname -m)/86Box-3* RPMS/noarch/86Box-roms* -%global romver 4.1 +%global romver 5.2 Name: 86Box -Version: 5.2 +Version: 6.0 Release: 1%{?dist} Summary: Classic PC emulator License: GPLv2+ @@ -121,5 +121,5 @@ popd %{_datadir}/%{name}/roms %changelog -* Sat Aug 31 Jasmine Iwanek 5.2-1 +* Sat Aug 31 Jasmine Iwanek 6.0-1 - Bump release diff --git a/src/unix/assets/net.86box.86Box.metainfo.xml b/src/unix/assets/net.86box.86Box.metainfo.xml index fd633d426..1e929412c 100644 --- a/src/unix/assets/net.86box.86Box.metainfo.xml +++ b/src/unix/assets/net.86box.86Box.metainfo.xml @@ -11,7 +11,7 @@ net.86box.86Box.desktop - + diff --git a/vcpkg.json b/vcpkg.json index 73f6d08f8..6a4f6376c 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,6 @@ { "name": "86box", - "version-string": "5.2", + "version-string": "6.0", "homepage": "https://86box.net/", "documentation": "https://86box.readthedocs.io/", "license": "GPL-2.0-or-later",