diff --git a/build-scripts/test-versioning.sh b/build-scripts/test-versioning.sh index ed7771516..ab972ffdf 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 9b25c2afc..524f81577 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