From 69480da5e75d553c76ae64ed869d87bd19b206a7 Mon Sep 17 00:00:00 2001
From: RichardG867 <richardg867@gmail.com>
Date: Mon, 27 Jun 2022 15:51:10 -0300
Subject: [PATCH] Freeze EMU_VERSION_EX at 3.50 due to reported Windows
 redetections

---
 CMakeLists.txt                   |  3 +--
 bumpversion.sh                   | 26 ++++++--------------------
 src/include/86box/version.h.in   |  2 +-
 src/include_make/86box/version.h |  2 +-
 4 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa3ee449d..1ba5aa151 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,11 +187,10 @@ elseif(BUILD_TYPE_LOWER STREQUAL "alpha")
     add_compile_definitions(ALPHA_BUILD)
 endif()
 
-# Variables introduced by richardg867 for versioning stuff
+# Versioning variables
 if(NOT CMAKE_PROJECT_VERSION_PATCH)
     set(CMAKE_PROJECT_VERSION_PATCH 0)
 endif()
-set(EMU_VERSION_EX "3.50")
 if(NOT EMU_BUILD_NUM)
     set(EMU_BUILD_NUM 0)
 endif()
diff --git a/bumpversion.sh b/bumpversion.sh
index 2efbeb952..5c960e6f7 100644
--- a/bumpversion.sh
+++ b/bumpversion.sh
@@ -30,31 +30,19 @@ newversion_min=$(echo $newversion | cut -d. -f2)
 newversion_patch=$(echo $newversion | cut -d. -f3)
 [ -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.
 cd "$(dirname "$0")"
 
 get_latest_rom_release() {
-    # get the latest ROM release from GitHub api
-    curl --silent "https://api.github.com/repos/86Box/roms/releases/latest" |
-        grep '"tag_name":' |
-        sed -E 's/.*"([^"]+)".*/\1/'
+	# Get the latest ROM release from the GitHub API.
+	curl --silent "https://api.github.com/repos/86Box/roms/releases/latest" |
+		grep '"tag_name":' |
+		sed -E 's/.*"([^"]+)".*/\1/'
 }
 
 pretty_date() {
-    # Ensure we get the date in English
-    LANG=en_US.UTF-8 date '+%a %b %d %Y'
+	# Ensure we get the date in English.
+	LANG=en_US.UTF-8 date '+%a %b %d %Y'
 }
 
 # Patch files.
@@ -71,10 +59,8 @@ patch_file() {
 	fi
 }
 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 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_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"'/'
diff --git a/src/include/86box/version.h.in b/src/include/86box/version.h.in
index 0e6595536..b8cd9ed97 100644
--- a/src/include/86box/version.h.in
+++ b/src/include/86box/version.h.in
@@ -22,7 +22,7 @@
 
 #define EMU_VERSION	"@CMAKE_PROJECT_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_MIN	@CMAKE_PROJECT_VERSION_MINOR@
 #define EMU_VERSION_PATCH @CMAKE_PROJECT_VERSION_PATCH@
diff --git a/src/include_make/86box/version.h b/src/include_make/86box/version.h
index 548ca28a6..fbf31b0b4 100644
--- a/src/include_make/86box/version.h
+++ b/src/include_make/86box/version.h
@@ -22,7 +22,7 @@
 
 #define EMU_VERSION	"3.5"
 #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_MIN	5
 #define EMU_VERSION_PATCH 0