diff options
author | Patrick Griffis <pgriffis@igalia.com> | 2022-04-12 10:23:21 -0500 |
---|---|---|
committer | Patrick Griffis <pgriffis@igalia.com> | 2022-04-12 10:23:21 -0500 |
commit | 875c5e8402699a6f1d5b909ad2087e9b4db2d3f6 (patch) | |
tree | 82ecd2bb4149ad0d0ba76c7f9cf2d8a4f8c79ff9 | |
parent | f762884d81c1290a9d18883910806685cc2983cd (diff) | |
download | libsoup-875c5e8402699a6f1d5b909ad2087e9b4db2d3f6.tar.gz |
3.1 (dev)
-rwxr-xr-x | libsoup/generate-version-header.py | 5 | ||||
-rw-r--r-- | libsoup/soup-version.h.in | 4 | ||||
-rw-r--r-- | meson.build | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/libsoup/generate-version-header.py b/libsoup/generate-version-header.py index 0bd91ec5..72503542 100755 --- a/libsoup/generate-version-header.py +++ b/libsoup/generate-version-header.py @@ -19,8 +19,8 @@ if major == 2: # Specific to 3.x dev releases versions.append((3, 0)) else: - minor_max = minor if minor != 0 and is_stable(minor) else minor + 1 - for i in range(0, minor_max): + minor_max = minor if is_stable(minor) else minor + 1 + for i in range(0, minor_max + 1): if is_stable(i): versions.append((3, i)) @@ -37,7 +37,6 @@ for version in versions: * Since: {major_version}.{minor_version} */ #define SOUP_VERSION_{major_version}_{minor_version} (G_ENCODE_VERSION ({major_version}, {minor_version})) - '''.format(major_version=version[0], minor_version=version[1]) version_attributes += '''#if SOUP_VERSION_MIN_REQUIRED >= SOUP_VERSION_{major_version}_{minor_version} diff --git a/libsoup/soup-version.h.in b/libsoup/soup-version.h.in index 557bf95f..c302e74c 100644 --- a/libsoup/soup-version.h.in +++ b/libsoup/soup-version.h.in @@ -87,8 +87,8 @@ G_BEGIN_DECLS #if SOUP_VERSION_MAX_ALLOWED < SOUP_VERSION_MIN_REQUIRED #error "SOUP_VERSION_MAX_ALLOWED must be >= SOUP_VERSION_MIN_REQUIRED" #endif -#if SOUP_VERSION_MIN_REQUIRED < SOUP_VERSION_3_0 -#error "SOUP_VERSION_MIN_REQUIRED must be >= SOUP_VERSION_3_0" +#if SOUP_VERSION_MIN_REQUIRED < SOUP_VERSION_3_2 +#error "SOUP_VERSION_MIN_REQUIRED must be >= SOUP_VERSION_3_2" #endif #define SOUP_AVAILABLE_IN_ALL _SOUP_EXTERN diff --git a/meson.build b/meson.build index b1ecbefd..b2f6798a 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('libsoup', 'c', - version: '3.0.6', + version: '3.1.0', meson_version : '>= 0.54', license : 'LGPL-2.0-or-later', default_options : [ |