From bf7b30065fba2d9440b3755f44a02a2a84cf0e96 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Tue, 21 Mar 2023 13:22:51 -0700 Subject: build: use 1.99.x for 2.0 development Additionally, fix the things that break with that along the way. --- meson.build | 15 +++++++++++---- tests/libpeas/testing/testing.c | 2 +- tests/testing-util/testing-util.c | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 4d6f173..bea1739 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project( 'libpeas', 'c', - version: '2.0.0.alpha', + version: '1.99.0', license: 'LGPLv2.1+', meson_version: '>= 0.62.0', default_options: ['buildtype=debugoptimized', 'warning_level=2'] @@ -18,7 +18,11 @@ version_major = version_arr[0].to_int() version_minor = version_arr[1].to_int() version_micro = version_arr[2].to_int() -api_version = '@0@'.format(version_major) +if version_minor == 99 + api_version = '@0@'.format(version_major+1) +else + api_version = '@0@'.format(version_major) +endif if version_minor.is_odd() interface_age = 0 @@ -30,7 +34,10 @@ endif # current = minor * 100 + micro - interface # revision = interface lib_version_soversion = 0 -lib_version_current = version_minor * 100 + version_micro - interface_age +lib_version_current = 0 +if version_minor != 99 + lib_version_current = version_minor * 100 + version_micro - interface_age +endif lib_version_revision = interface_age lib_version = '@0@.@1@.@2@'.format( lib_version_soversion, @@ -78,7 +85,7 @@ config_h.set_quoted('PACKAGE_URL', 'https://wiki.gnome.org/Projects/Libpeas') config_h.set_quoted('PACKAGE_URL', 'https://wiki.gnome.org/Projects/Libpeas') config_h.set_quoted('PACKAGE_VERSION', version) config_h.set_quoted('VERSION', version) -config_h.set_quoted('VERSION_MAJOR_S', '@0@'.format(version_major)) +config_h.set_quoted('API_VERSION_S', '@0@'.format(api_version)) config_h.set_quoted('GETTEXT_PACKAGE', package_string) diff --git a/tests/libpeas/testing/testing.c b/tests/libpeas/testing/testing.c index 3bfa99e..7ceaf62 100644 --- a/tests/libpeas/testing/testing.c +++ b/tests/libpeas/testing/testing.c @@ -50,7 +50,7 @@ testing_init (int *argc, g_irepository_require_private (g_irepository_get_default (), BUILDDIR "/tests/libpeas/introspection", - "Introspection", VERSION_MAJOR_S, 0, &error); + "Introspection", API_VERSION_S, 0, &error); g_assert_no_error (error); initialized = TRUE; diff --git a/tests/testing-util/testing-util.c b/tests/testing-util/testing-util.c index 464460d..ab58eb9 100644 --- a/tests/testing-util/testing-util.c +++ b/tests/testing-util/testing-util.c @@ -211,7 +211,7 @@ testing_util_init (void) g_irepository_require_private (g_irepository_get_default (), BUILDDIR "/libpeas", - "Peas", VERSION_MAJOR_S, 0, &error); + "Peas", API_VERSION_S, 0, &error); g_assert_no_error (error); initialized = TRUE; -- cgit v1.2.1