From 669e75b84632e2c6cc5c65974ec9e28052cb7a4e Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Fri, 19 Aug 2022 09:58:25 -0700
Subject: [PATCH] Updated to version 2.2.0 for release
---
CMakeLists.txt | 4 ++--
Makefile.os2 | 4 ++--
SDL_net.h | 4 ++--
VisualC/Version.rc | 8 ++++----
Xcode/Info-Framework.plist | 4 ++--
Xcode/SDL_net.xcodeproj/project.pbxproj | 4 ++--
configure | 24 ++++++++++++------------
configure.ac | 4 ++--
version.rc | 8 ++++----
9 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index abaf49e..bf30a70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,8 +4,8 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
# See release_checklist.md
set(MAJOR_VERSION 2)
-set(MINOR_VERSION 1)
-set(MICRO_VERSION 1)
+set(MINOR_VERSION 2)
+set(MICRO_VERSION 0)
set(SDL_REQUIRED_VERSION 2.0.4)
set(DYLIB_COMPATIBILITY_VERSION "1")
diff --git a/Makefile.os2 b/Makefile.os2
index c5c1e67..0b0e2cb 100644
--- a/Makefile.os2
+++ b/Makefile.os2
@@ -6,8 +6,8 @@
LIBNAME = SDL2net
MAJOR_VERSION = 2
-MINOR_VERSION = 1
-MICRO_VERSION = 1
+MINOR_VERSION = 2
+MICRO_VERSION = 0
VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
TITLENAME = $(LIBNAME) $(VERSION)
diff --git a/SDL_net.h b/SDL_net.h
index 2e0ddea..16c545c 100644
--- a/SDL_net.h
+++ b/SDL_net.h
@@ -55,8 +55,8 @@ extern "C" {
/* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL
*/
#define SDL_NET_MAJOR_VERSION 2
-#define SDL_NET_MINOR_VERSION 1
-#define SDL_NET_PATCHLEVEL 1
+#define SDL_NET_MINOR_VERSION 2
+#define SDL_NET_PATCHLEVEL 0
/* This macro can be used to fill a version structure with the compile-time
* version of the SDL_net library.
diff --git a/VisualC/Version.rc b/VisualC/Version.rc
index 49951e8..dd5726c 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,1,1,0
- PRODUCTVERSION 2,1,1,0
+ FILEVERSION 2,2,0,0
+ PRODUCTVERSION 2,2,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -46,12 +46,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileDescription", "SDL_net\0"
- VALUE "FileVersion", "2, 1, 1, 0\0"
+ VALUE "FileVersion", "2, 2, 0, 0\0"
VALUE "InternalName", "SDL_net\0"
VALUE "LegalCopyright", "Copyright 2022 Sam Lantinga\0"
VALUE "OriginalFilename", "SDL_net.dll\0"
VALUE "ProductName", "Simple DirectMedia Layer\0"
- VALUE "ProductVersion", "2, 1, 1, 0\0"
+ VALUE "ProductVersion", "2, 2, 0, 0\0"
END
END
BLOCK "VarFileInfo"
diff --git a/Xcode/Info-Framework.plist b/Xcode/Info-Framework.plist
index eb2fc85..acd71ca 100644
--- a/Xcode/Info-Framework.plist
+++ b/Xcode/Info-Framework.plist
@@ -15,8 +15,8 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
- <string>2.1.1</string>
+ <string>2.2.0</string>
<key>CFBundleVersion</key>
- <string>2.1.1</string>
+ <string>2.2.0</string>
</dict>
</plist>
diff --git a/Xcode/SDL_net.xcodeproj/project.pbxproj b/Xcode/SDL_net.xcodeproj/project.pbxproj
index f66dc6a..45cb6e2 100644
--- a/Xcode/SDL_net.xcodeproj/project.pbxproj
+++ b/Xcode/SDL_net.xcodeproj/project.pbxproj
@@ -427,7 +427,7 @@
ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1.0.0;
- DYLIB_CURRENT_VERSION = 102.0.0;
+ DYLIB_CURRENT_VERSION = 201.0.0;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/$(PLATFORM)\"";
@@ -457,7 +457,7 @@
ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
DEPLOYMENT_POSTPROCESSING = YES;
DYLIB_COMPATIBILITY_VERSION = 1.0.0;
- DYLIB_CURRENT_VERSION = 102.0.0;
+ DYLIB_CURRENT_VERSION = 201.0.0;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/$(PLATFORM)\"";
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
diff --git a/configure b/configure
index 938aabd..216f37b 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.71 for SDL2_net 2.1.1.
+# Generated by GNU Autoconf 2.71 for SDL2_net 2.2.0.
#
# Report bugs to <https://github.com/libsdl-org/SDL_net/issues>.
#
@@ -760,8 +760,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='SDL2_net'
PACKAGE_TARNAME='SDL2_net'
-PACKAGE_VERSION='2.1.1'
-PACKAGE_STRING='SDL2_net 2.1.1'
+PACKAGE_VERSION='2.2.0'
+PACKAGE_STRING='SDL2_net 2.2.0'
PACKAGE_BUGREPORT='https://github.com/libsdl-org/SDL_net/issues'
PACKAGE_URL=''
@@ -1522,7 +1522,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_net 2.1.1 to adapt to many kinds of systems.
+\`configure' configures SDL2_net 2.2.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1593,7 +1593,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of SDL2_net 2.1.1:";;
+ short | recursive ) echo "Configuration of SDL2_net 2.2.0:";;
esac
cat <<\_ACEOF
@@ -1707,7 +1707,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-SDL2_net configure 2.1.1
+SDL2_net configure 2.2.0
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1968,7 +1968,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_net $as_me 2.1.1, which was
+It was created by SDL2_net $as_me 2.2.0, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -2728,9 +2728,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
MAJOR_VERSION=2
-MINOR_VERSION=1
+MINOR_VERSION=2
-MICRO_VERSION=1
+MICRO_VERSION=0
BINARY_AGE=`expr $MINOR_VERSION \* 100 + $MICRO_VERSION`
@@ -11361,7 +11361,7 @@ fi
# Define the identity of the package.
PACKAGE='SDL2_net'
- VERSION='2.1.1'
+ VERSION='2.2.0'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -13958,7 +13958,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_net $as_me 2.1.1, which was
+This file was extended by SDL2_net $as_me 2.2.0, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14017,7 +14017,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-SDL2_net config.status 2.1.1
+SDL2_net config.status 2.2.0
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 1665902..b5def8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@ dnl Process this file with autoconf to produce a configure script.
dnl Set various version strings - taken gratefully from the GTk sources
# See release_checklist.md
m4_define([MAJOR_VERSION_MACRO], [2])
-m4_define([MINOR_VERSION_MACRO], [1])
-m4_define([MICRO_VERSION_MACRO], [1])
+m4_define([MINOR_VERSION_MACRO], [2])
+m4_define([MICRO_VERSION_MACRO], [0])
AC_INIT([SDL2_net],
[MAJOR_VERSION_MACRO.MINOR_VERSION_MACRO.MICRO_VERSION_MACRO],
diff --git a/version.rc b/version.rc
index 1914b33..be2c18a 100644
--- a/version.rc
+++ b/version.rc
@@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,1,1,0
- PRODUCTVERSION 2,1,1,0
+ FILEVERSION 2,2,0,0
+ PRODUCTVERSION 2,2,0,0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x40004L
@@ -23,12 +23,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileDescription", "SDL_net\0"
- VALUE "FileVersion", "2, 1, 1, 0\0"
+ VALUE "FileVersion", "2, 2, 0, 0\0"
VALUE "InternalName", "SDL_net\0"
VALUE "LegalCopyright", "Copyright 2022 Sam Lantinga\0"
VALUE "OriginalFilename", "SDL_net.dll\0"
VALUE "ProductName", "Simple DirectMedia Layer\0"
- VALUE "ProductVersion", "2, 1, 1, 0\0"
+ VALUE "ProductVersion", "2, 2, 0, 0\0"
END
END
BLOCK "VarFileInfo"