From e9dcda6d7a5a872d3d8c9ccdae10fdaf7f7e73a0 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Wed, 25 May 2022 10:32:51 -0700 Subject: [PATCH] Updated version to 2.19.1 for RC build --- CMakeLists.txt | 2 +- Makefile.os2 | 2 +- SDL_ttf.h | 2 +- VisualC/Version.rc | 8 ++++---- Xcode/Info-Framework.plist | 4 ++-- Xcode/SDL_ttf.xcodeproj/project.pbxproj | 4 ++-- configure | 22 +++++++++++----------- configure.ac | 2 +- release_checklist.md | 2 ++ version.rc | 8 ++++---- 10 files changed, 29 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 022e51fd..f1db6f8d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.14) # See docs/release_checklist.md set(MAJOR_VERSION 2) set(MINOR_VERSION 19) -set(MICRO_VERSION 0) +set(MICRO_VERSION 1) set(SDL_TTF_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}") set(SDL_REQUIRED_VERSION 2.0.10) diff --git a/Makefile.os2 b/Makefile.os2 index 165b5dd3..291ec872 100644 --- a/Makefile.os2 +++ b/Makefile.os2 @@ -7,7 +7,7 @@ LIBNAME = SDL2ttf MAJOR_VERSION = 2 MINOR_VERSION = 19 -MICRO_VERSION = 0 +MICRO_VERSION = 1 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION) TITLENAME = $(LIBNAME) $(VERSION) diff --git a/SDL_ttf.h b/SDL_ttf.h index 0392a4c3..1a4d80b9 100644 --- a/SDL_ttf.h +++ b/SDL_ttf.h @@ -43,7 +43,7 @@ extern "C" { */ #define SDL_TTF_MAJOR_VERSION 2 #define SDL_TTF_MINOR_VERSION 19 -#define SDL_TTF_PATCHLEVEL 0 +#define SDL_TTF_PATCHLEVEL 1 /* This macro can be used to fill a version structure with the compile-time * version of the SDL_ttf library. diff --git a/VisualC/Version.rc b/VisualC/Version.rc index ec7c8f99..3f627cf9 100644 --- a/VisualC/Version.rc +++ b/VisualC/Version.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,19,0,0 - PRODUCTVERSION 2,19,0,0 + FILEVERSION 2,19,1,0 + PRODUCTVERSION 2,19,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -46,12 +46,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL_ttf\0" - VALUE "FileVersion", "2, 19, 0, 0\0" + VALUE "FileVersion", "2, 19, 1, 0\0" VALUE "InternalName", "SDL_ttf\0" VALUE "LegalCopyright", "Copyright © 2022 Sam Lantinga\0" VALUE "OriginalFilename", "SDL_ttf.dll\0" VALUE "ProductName", "Simple DirectMedia Layer\0" - VALUE "ProductVersion", "2, 19, 0, 0\0" + VALUE "ProductVersion", "2, 19, 1, 0\0" END END BLOCK "VarFileInfo" diff --git a/Xcode/Info-Framework.plist b/Xcode/Info-Framework.plist index 1793919b..394cb499 100644 --- a/Xcode/Info-Framework.plist +++ b/Xcode/Info-Framework.plist @@ -15,8 +15,8 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.19.0 + 2.19.1 CFBundleVersion - 2.19.0 + 2.19.1 diff --git a/Xcode/SDL_ttf.xcodeproj/project.pbxproj b/Xcode/SDL_ttf.xcodeproj/project.pbxproj index 80057bc3..e8547ddf 100644 --- a/Xcode/SDL_ttf.xcodeproj/project.pbxproj +++ b/Xcode/SDL_ttf.xcodeproj/project.pbxproj @@ -981,7 +981,7 @@ CLANG_CXX_LIBRARY = "libc++"; COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 15.0.0; - DYLIB_CURRENT_VERSION = 1901.0.0; + DYLIB_CURRENT_VERSION = 1902.0.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/$(PLATFORM)\""; @@ -1021,7 +1021,7 @@ CLANG_CXX_LIBRARY = "libc++"; DEPLOYMENT_POSTPROCESSING = YES; DYLIB_COMPATIBILITY_VERSION = 15.0.0; - DYLIB_CURRENT_VERSION = 1901.0.0; + DYLIB_CURRENT_VERSION = 1902.0.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/$(PLATFORM)\""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; diff --git a/configure b/configure index d89fa157..a8e733f8 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for SDL2_ttf 2.19.0. +# Generated by GNU Autoconf 2.69 for SDL2_ttf 2.19.1. # # Report bugs to . # @@ -729,8 +729,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='SDL2_ttf' PACKAGE_TARNAME='SDL2_ttf' -PACKAGE_VERSION='2.19.0' -PACKAGE_STRING='SDL2_ttf 2.19.0' +PACKAGE_VERSION='2.19.1' +PACKAGE_STRING='SDL2_ttf 2.19.1' PACKAGE_BUGREPORT='https://github.com/libsdl-org/SDL_ttf/issues' PACKAGE_URL='' @@ -1523,7 +1523,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures SDL2_ttf 2.19.0 to adapt to many kinds of systems. +\`configure' configures SDL2_ttf 2.19.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1597,7 +1597,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of SDL2_ttf 2.19.0:";; + short | recursive ) echo "Configuration of SDL2_ttf 2.19.1:";; esac cat <<\_ACEOF @@ -1729,7 +1729,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -SDL2_ttf configure 2.19.0 +SDL2_ttf configure 2.19.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2311,7 +2311,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by SDL2_ttf $as_me 2.19.0, which was +It was created by SDL2_ttf $as_me 2.19.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2666,7 +2666,7 @@ MAJOR_VERSION=2 MINOR_VERSION=19 -MICRO_VERSION=0 +MICRO_VERSION=1 BINARY_AGE=`expr $MINOR_VERSION \* 100 + $MICRO_VERSION` @@ -11132,7 +11132,7 @@ fi # Define the identity of the package. PACKAGE='SDL2_ttf' - VERSION='2.19.0' + VERSION='2.19.1' cat >>confdefs.h <<_ACEOF @@ -19933,7 +19933,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by SDL2_ttf $as_me 2.19.0, which was +This file was extended by SDL2_ttf $as_me 2.19.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19990,7 +19990,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -SDL2_ttf config.status 2.19.0 +SDL2_ttf config.status 2.19.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 60b9f437..364c385a 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Set various version strings - taken gratefully from the GTk sources # See docs/release_checklist.md m4_define([MAJOR_VERSION_MACRO], [2]) m4_define([MINOR_VERSION_MACRO], [19]) -m4_define([MICRO_VERSION_MACRO], [0]) +m4_define([MICRO_VERSION_MACRO], [1]) AC_INIT([SDL2_ttf], MAJOR_VERSION_MACRO.MINOR_VERSION_MACRO.MICRO_VERSION_MACRO, diff --git a/release_checklist.md b/release_checklist.md index 8c2245d5..351e44bb 100644 --- a/release_checklist.md +++ b/release_checklist.md @@ -18,6 +18,8 @@ `FILEVERSION`, `PRODUCTVERSION`, `FileVersion`, `ProductVersion` * `VisualC/Version.rc`: `FILEVERSION`, `PRODUCTVERSION`, `FileVersion`, `ProductVersion` + * `Xcode/Info-Framework.plist`: + `CFBundleShortVersionString`, `CFBundleVersion` * Bump ABI version information diff --git a/version.rc b/version.rc index 07cacdf4..64bacf8d 100644 --- a/version.rc +++ b/version.rc @@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,19,0,0 - PRODUCTVERSION 2,19,0,0 + FILEVERSION 2,19,1,0 + PRODUCTVERSION 2,19,1,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "SDL_ttf\0" - VALUE "FileVersion", "2, 19, 0, 0\0" + VALUE "FileVersion", "2, 19, 1, 0\0" VALUE "InternalName", "SDL_ttf\0" VALUE "LegalCopyright", "Copyright © 2022 Sam Lantinga\0" VALUE "OriginalFilename", "SDL_ttf.dll\0" VALUE "ProductName", "Simple DirectMedia Layer\0" - VALUE "ProductVersion", "2, 19, 0, 0\0" + VALUE "ProductVersion", "2, 19, 1, 0\0" END END BLOCK "VarFileInfo"