From 0c1f9118a7896fb6bc40533fbff7acc93b1981e4 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Tue, 22 Nov 2022 09:29:09 -0800
Subject: [PATCH] Removed version updates/checks for Makefile.os2 and
Makefile.w32
---
build-scripts/test-versioning.sh | 22 ----------------------
build-scripts/update-version.sh | 8 --------
2 files changed, 30 deletions(-)
diff --git a/build-scripts/test-versioning.sh b/build-scripts/test-versioning.sh
index ed77715165bc..ab972ffdf507 100755
--- a/build-scripts/test-versioning.sh
+++ b/build-scripts/test-versioning.sh
@@ -69,28 +69,6 @@ else
not_ok "android-project/app/src/main/java/org/libsdl/app/SDLActivity.java $version disagrees with SDL_version.h $ref_version"
fi
-major=$(sed -ne 's/^MAJOR_VERSION *= *//p' Makefile.os2)
-minor=$(sed -ne 's/^MINOR_VERSION *= *//p' Makefile.os2)
-micro=$(sed -ne 's/^MICRO_VERSION *= *//p' Makefile.os2)
-version="${major}.${minor}.${micro}"
-
-if [ "$ref_version" = "$version" ]; then
- ok "Makefile.os2 $version"
-else
- not_ok "Makefile.os2 $version disagrees with SDL_version.h $ref_version"
-fi
-
-major=$(sed -ne 's/^MAJOR_VERSION *= *//p' Makefile.w32)
-minor=$(sed -ne 's/^MINOR_VERSION *= *//p' Makefile.w32)
-micro=$(sed -ne 's/^MICRO_VERSION *= *//p' Makefile.w32)
-version="${major}.${minor}.${micro}"
-
-if [ "$ref_version" = "$version" ]; then
- ok "Makefile.w32 $version"
-else
- not_ok "Makefile.w32 $version disagrees with SDL_version.h $ref_version"
-fi
-
tuple=$(sed -ne 's/^ *FILEVERSION *//p' src/main/windows/version.rc | tr -d '\r')
ref_tuple="${ref_major},${ref_minor},${ref_micro},0"
diff --git a/build-scripts/update-version.sh b/build-scripts/update-version.sh
index 9b25c2afcd1f..524f81577526 100755
--- a/build-scripts/update-version.sh
+++ b/build-scripts/update-version.sh
@@ -66,14 +66,6 @@ perl -w -pi -e 's/\A(.* SDL_MAJOR_VERSION = )\d+/${1}'$MAJOR'/;' android-project
perl -w -pi -e 's/\A(.* SDL_MINOR_VERSION = )\d+/${1}'$MINOR'/;' android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
perl -w -pi -e 's/\A(.* SDL_MICRO_VERSION = )\d+/${1}'$PATCH'/;' android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
-perl -w -pi -e 's/\A(MAJOR_VERSION\s*=\s*)\d+/${1}'$MAJOR'/;' Makefile.os2
-perl -w -pi -e 's/\A(MINOR_VERSION\s*=\s*)\d+/${1}'$MINOR'/;' Makefile.os2
-perl -w -pi -e 's/\A(MICRO_VERSION\s*=\s*)\d+/${1}'$PATCH'/;' Makefile.os2
-
-perl -w -pi -e 's/\A(MAJOR_VERSION\s*=\s*)\d+/${1}'$MAJOR'/;' Makefile.w32
-perl -w -pi -e 's/\A(MINOR_VERSION\s*=\s*)\d+/${1}'$MINOR'/;' Makefile.w32
-perl -w -pi -e 's/\A(MICRO_VERSION\s*=\s*)\d+/${1}'$PATCH'/;' Makefile.w32
-
perl -w -pi -e 's/(\#define SDL_MAJOR_VERSION\s+)\d+/${1}'$MAJOR'/;' include/SDL_version.h
perl -w -pi -e 's/(\#define SDL_MINOR_VERSION\s+)\d+/${1}'$MINOR'/;' include/SDL_version.h
perl -w -pi -e 's/(\#define SDL_PATCHLEVEL\s+)\d+/${1}'$PATCH'/;' include/SDL_version.h