diff options
| author | Christian Hergert <chergert@redhat.com> | 2023-03-21 13:22:51 -0700 |
|---|---|---|
| committer | Christian Hergert <chergert@redhat.com> | 2023-03-22 16:44:45 -0700 |
| commit | bf7b30065fba2d9440b3755f44a02a2a84cf0e96 (patch) | |
| tree | 0312f1a84b5f87d6584c4f27ea15aa5e6758131b | |
| parent | d49bcadf159501bec166304825047d2c1ea9b915 (diff) | |
| download | libpeas-bf7b30065fba2d9440b3755f44a02a2a84cf0e96.tar.gz | |
build: use 1.99.x for 2.0 development
Additionally, fix the things that break with that along the way.
| -rw-r--r-- | meson.build | 15 | ||||
| -rw-r--r-- | tests/libpeas/testing/testing.c | 2 | ||||
| -rw-r--r-- | 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; |