From 10b9cde328947d038029f2496f43da75138abb3d Mon Sep 17 00:00:00 2001 From: kotontrion Date: Wed, 18 Sep 2024 20:29:21 +0200 Subject: [PATCH] add version constants to auth, river and wireplumber libs --- .../include/{astal-auth.h => astal-auth.h.in} | 6 ++++++ lib/auth/include/meson.build | 19 ++++++++++++++++--- .../{astal-river.h => astal-river.h.in} | 7 +++++++ lib/river/include/meson.build | 19 +++++++++++++++---- lib/wireplumber/include/astal-wp.h | 4 ---- lib/wireplumber/include/astal-wp.h.in | 14 ++++++++++++++ lib/wireplumber/include/meson.build | 16 +++++++++++++--- 7 files changed, 71 insertions(+), 14 deletions(-) rename lib/auth/include/{astal-auth.h => astal-auth.h.in} (83%) rename lib/river/include/{astal-river.h => astal-river.h.in} (90%) delete mode 100644 lib/wireplumber/include/astal-wp.h create mode 100644 lib/wireplumber/include/astal-wp.h.in diff --git a/lib/auth/include/astal-auth.h b/lib/auth/include/astal-auth.h.in similarity index 83% rename from lib/auth/include/astal-auth.h rename to lib/auth/include/astal-auth.h.in index a3073ff..c8a0ece 100644 --- a/lib/auth/include/astal-auth.h +++ b/lib/auth/include/astal-auth.h.in @@ -4,6 +4,12 @@ #include #include + +#define ASTAL_AUTH_MAJOR_VERSION @MAJOR_VERSION@ +#define ASTAL_AUTH_MINOR_VERSION @MINOR_VERSION@ +#define ASTAL_AUTH_MICRO_VERSION @MICRO_VERSION@ +#define ASTAL_AUTH_VERSION "@VERSION@" + G_BEGIN_DECLS #define ASTAL_AUTH_TYPE_PAM (astal_auth_pam_get_type()) diff --git a/lib/auth/include/meson.build b/lib/auth/include/meson.build index 0575998..9c92caf 100644 --- a/lib/auth/include/meson.build +++ b/lib/auth/include/meson.build @@ -1,4 +1,17 @@ -astal_auth_inc = include_directories('.') -astal_auth_headers = files('astal-auth.h') -install_headers('astal-auth.h') +config = configure_file( + input: 'astal-auth.h.in', + output: 'astal-auth.h', + configuration: { + 'VERSION': meson.project_version(), + 'MAJOR_VERSION': version_split[0], + 'MINOR_VERSION': version_split[1], + 'MICRO_VERSION': version_split[2], + }, +) + + +astal_auth_inc = include_directories('.') +astal_auth_headers = config + +install_headers(astal_auth_headers) diff --git a/lib/river/include/astal-river.h b/lib/river/include/astal-river.h.in similarity index 90% rename from lib/river/include/astal-river.h rename to lib/river/include/astal-river.h.in index 6bedd94..d2b769c 100644 --- a/lib/river/include/astal-river.h +++ b/lib/river/include/astal-river.h.in @@ -3,6 +3,13 @@ #include + +#define ASTAL_RIVER_MAJOR_VERSION @MAJOR_VERSION@ +#define ASTAL_RIVER_MINOR_VERSION @MINOR_VERSION@ +#define ASTAL_RIVER_MICRO_VERSION @MICRO_VERSION@ +#define ASTAL_RIVER_VERSION "@VERSION@" + + G_BEGIN_DECLS #define ASTAL_RIVER_TYPE_OUTPUT (astal_river_output_get_type()) diff --git a/lib/river/include/meson.build b/lib/river/include/meson.build index 4b08a89..d91be23 100644 --- a/lib/river/include/meson.build +++ b/lib/river/include/meson.build @@ -1,6 +1,17 @@ -astal_river_inc = include_directories('.') -astal_river_headers = files( - 'astal-river.h', + +config = configure_file( + input: 'astal-river.h.in', + output: 'astal-river.h', + configuration: { + 'VERSION': meson.project_version(), + 'MAJOR_VERSION': version_split[0], + 'MINOR_VERSION': version_split[1], + 'MICRO_VERSION': version_split[2], + }, ) -install_headers('astal-river.h') + +astal_river_inc = include_directories('.') +astal_river_headers = config + +install_headers(astal_river_headers) diff --git a/lib/wireplumber/include/astal-wp.h b/lib/wireplumber/include/astal-wp.h deleted file mode 100644 index 6c48211..0000000 --- a/lib/wireplumber/include/astal-wp.h +++ /dev/null @@ -1,4 +0,0 @@ - -#include "astal/wireplumber/audio.h" -#include "astal/wireplumber/endpoint.h" -#include "astal/wireplumber/wp.h" diff --git a/lib/wireplumber/include/astal-wp.h.in b/lib/wireplumber/include/astal-wp.h.in new file mode 100644 index 0000000..7d9d997 --- /dev/null +++ b/lib/wireplumber/include/astal-wp.h.in @@ -0,0 +1,14 @@ + +#ifndef WP_H +#define WP_H + +#include "astal/wireplumber/audio.h" +#include "astal/wireplumber/endpoint.h" +#include "astal/wireplumber/wp.h" + +#define ASTAL_WP_MAJOR_VERSION @MAJOR_VERSION@ +#define ASTAL_WP_MINOR_VERSION @MINOR_VERSION@ +#define ASTAL_WP_MICRO_VERSION @MICRO_VERSION@ +#define ASTAL_WP_VERSION "@VERSION@" + +#endif // WP_H diff --git a/lib/wireplumber/include/meson.build b/lib/wireplumber/include/meson.build index afe00eb..cae0d6e 100644 --- a/lib/wireplumber/include/meson.build +++ b/lib/wireplumber/include/meson.build @@ -1,8 +1,18 @@ -astal_wireplumber_inc = include_directories('.', 'astal/wireplumber', 'private') -astal_wireplumber_headers = files( - 'astal-wp.h', + +config = configure_file( + input: 'astal-wp.h.in', + output: 'astal-wp.h', + configuration: { + 'VERSION': meson.project_version(), + 'MAJOR_VERSION': version_split[0], + 'MINOR_VERSION': version_split[1], + 'MICRO_VERSION': version_split[2], + }, ) +astal_wireplumber_inc = include_directories('.', 'astal/wireplumber', 'private') +astal_wireplumber_headers = config + install_headers(astal_wireplumber_headers) subdir('astal/wireplumber')