80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Freeze EMU_VERSION_EX at 3.50 due to reported Windows redetections

Browse Source
This commit is contained in:
RichardG867
2022-06-27 15:51:10 -03:00
parent e6b84753c4
commit 69480da5e7
4 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -187,11 +187,10 @@ elseif(BUILD_TYPE_LOWER STREQUAL "alpha")
add_compile_definitions(ALPHA_BUILD) add_compile_definitions(ALPHA_BUILD)
endif() endif()
# Variables introduced by richardg867 for versioning stuff # Versioning variables
if(NOT CMAKE_PROJECT_VERSION_PATCH) if(NOT CMAKE_PROJECT_VERSION_PATCH)
set(CMAKE_PROJECT_VERSION_PATCH 0) set(CMAKE_PROJECT_VERSION_PATCH 0)
endif() endif()
set(EMU_VERSION_EX "3.50")
if(NOT EMU_BUILD_NUM) if(NOT EMU_BUILD_NUM)
set(EMU_BUILD_NUM 0) set(EMU_BUILD_NUM 0)
endif() endif()

26
bumpversion.sh
View File

@@ -30,31 +30,19 @@ newversion_min=$(echo $newversion | cut -d. -f2)
newversion_patch=$(echo $newversion | cut -d. -f3) newversion_patch=$(echo $newversion | cut -d. -f3)
[ -z "$newversion_patch" ] && newversion_patch=0 [ -z "$newversion_patch" ] && newversion_patch=0
base36() {
if [ $1 -lt 10 ]
then
echo $1
else
printf '%b' $(printf '\\%03o' $((55 + $1)))
fi
}
newversion_maj_base36=$(base36 $newversion_maj)
newversion_min_base36=$(base36 $newversion_min)
newversion_patch_base36=$(base36 $newversion_patch)
# Switch to the repository root directory. # Switch to the repository root directory.
cd "$(dirname "$0")" cd "$(dirname "$0")"
get_latest_rom_release() { get_latest_rom_release() {
# get the latest ROM release from GitHub api # Get the latest ROM release from the GitHub API.
curl --silent "https://api.github.com/repos/86Box/roms/releases/latest" | curl --silent "https://api.github.com/repos/86Box/roms/releases/latest" |
grep '"tag_name":' | grep '"tag_name":' |
sed -E 's/.*"([^"]+)".*/\1/' sed -E 's/.*"([^"]+)".*/\1/'
} }
pretty_date() { pretty_date() {
# Ensure we get the date in English # Ensure we get the date in English.
LANG=en_US.UTF-8 date '+%a %b %d %Y' LANG=en_US.UTF-8 date '+%a %b %d %Y'
} }
# Patch files. # Patch files.
@@ -71,10 +59,8 @@ patch_file() {
fi fi
} }
patch_file CMakeLists.txt VERSION 's/^(\s*VERSION ).+/\1'"$newversion"'/' patch_file CMakeLists.txt VERSION 's/^(\s*VERSION ).+/\1'"$newversion"'/'
patch_file CMakeLists.txt EMU_VERSION_EX 's/(\s*set\(EMU_VERSION_EX\s+")[^"]+/\1'"$newversion_maj_base36.$newversion_min_base36$newversion_patch_base36"'/'
patch_file vcpkg.json version-string 's/(^\s*"version-string"\s*:\s*")[^"]+/\1'"$newversion"'/' patch_file vcpkg.json version-string 's/(^\s*"version-string"\s*:\s*")[^"]+/\1'"$newversion"'/'
patch_file src/include_make/*/version.h EMU_VERSION 's/(#\s*define\s+EMU_VERSION\s+")[^"]+/\1'"$newversion"'/' patch_file src/include_make/*/version.h EMU_VERSION 's/(#\s*define\s+EMU_VERSION\s+")[^"]+/\1'"$newversion"'/'
patch_file src/include_make/*/version.h EMU_VERSION_EX 's/(#\s*define\s+EMU_VERSION_EX\s+")[^"]+/\1'"$newversion_maj_base36.$newversion_min_base36$newversion_patch_base36"'/'
patch_file src/include_make/*/version.h EMU_VERSION_MAJ 's/(#\s*define\s+EMU_VERSION_MAJ\s+)[0-9]+/\1'"$newversion_maj"'/' patch_file src/include_make/*/version.h EMU_VERSION_MAJ 's/(#\s*define\s+EMU_VERSION_MAJ\s+)[0-9]+/\1'"$newversion_maj"'/'
patch_file src/include_make/*/version.h EMU_VERSION_MIN 's/(#\s*define\s+EMU_VERSION_MIN\s+)[0-9]+/\1'"$newversion_min"'/' patch_file src/include_make/*/version.h EMU_VERSION_MIN 's/(#\s*define\s+EMU_VERSION_MIN\s+)[0-9]+/\1'"$newversion_min"'/'
patch_file src/include_make/*/version.h EMU_VERSION_PATCH 's/(#\s*define\s+EMU_VERSION_PATCH\s+)[0-9]+/\1'"$newversion_patch"'/' patch_file src/include_make/*/version.h EMU_VERSION_PATCH 's/(#\s*define\s+EMU_VERSION_PATCH\s+)[0-9]+/\1'"$newversion_patch"'/'

2
src/include/86box/version.h.in
View File

@@ -22,7 +22,7 @@
#define EMU_VERSION "@CMAKE_PROJECT_VERSION@" #define EMU_VERSION "@CMAKE_PROJECT_VERSION@"
#define EMU_VERSION_W LSTR(EMU_VERSION) #define EMU_VERSION_W LSTR(EMU_VERSION)
#define EMU_VERSION_EX "@EMU_VERSION_EX@" #define EMU_VERSION_EX "3.50" /* frozen due to IDE re-detection behavior on Windows */
#define EMU_VERSION_MAJ @CMAKE_PROJECT_VERSION_MAJOR@ #define EMU_VERSION_MAJ @CMAKE_PROJECT_VERSION_MAJOR@
#define EMU_VERSION_MIN @CMAKE_PROJECT_VERSION_MINOR@ #define EMU_VERSION_MIN @CMAKE_PROJECT_VERSION_MINOR@
#define EMU_VERSION_PATCH @CMAKE_PROJECT_VERSION_PATCH@ #define EMU_VERSION_PATCH @CMAKE_PROJECT_VERSION_PATCH@

2
src/include_make/86box/version.h
View File

@@ -22,7 +22,7 @@
#define EMU_VERSION "3.5" #define EMU_VERSION "3.5"
#define EMU_VERSION_W LSTR(EMU_VERSION) #define EMU_VERSION_W LSTR(EMU_VERSION)
#define EMU_VERSION_EX "3.50" #define EMU_VERSION_EX "3.50" /* frozen due to IDE re-detection behavior on Windows */
#define EMU_VERSION_MAJ 3 #define EMU_VERSION_MAJ 3
#define EMU_VERSION_MIN 5 #define EMU_VERSION_MIN 5
#define EMU_VERSION_PATCH 0 #define EMU_VERSION_PATCH 0