From a4d084e975ff75955e0399f25814013a121a41bd Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 13 Dec 2024 23:40:32 +0000 Subject: [PATCH] gio, gobject: Improve reproducibility of enumtypes headers `@filename@` expands to the (absolute or relative) path from the build directory to the source directory, which can be rather verbose. In practice Meson usually (always?) generates a relative path, but even so, the resulting installed header is not necessarily reproducible if using different build directories outside the source directory. We don't really need a full path here anyway: the basename is enough of a hint to point a reader towards the file where the underlying enum was defined. Signed-off-by: Simon McVittie --- gio/gioenumtypes.c.template | 2 +- gio/gioenumtypes.h.template | 2 +- gobject/glib-enumtypes.c.template | 2 +- gobject/glib-enumtypes.h.template | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gio/gioenumtypes.c.template b/gio/gioenumtypes.c.template index 3176eade6..5a329618b 100644 --- a/gio/gioenumtypes.c.template +++ b/gio/gioenumtypes.c.template @@ -31,7 +31,7 @@ /*** END file-header ***/ /*** BEGIN file-production ***/ -/* enumerations from "@filename@" */ +/* enumerations from "@basename@" */ /*** END file-production ***/ /*** BEGIN value-header ***/ diff --git a/gio/gioenumtypes.h.template b/gio/gioenumtypes.h.template index c75a3b459..681175703 100644 --- a/gio/gioenumtypes.h.template +++ b/gio/gioenumtypes.h.template @@ -31,7 +31,7 @@ G_BEGIN_DECLS /*** BEGIN file-production ***/ -/* enumerations from "@filename@" */ +/* enumerations from "@basename@" */ /*** END file-production ***/ /*** BEGIN value-header ***/ diff --git a/gobject/glib-enumtypes.c.template b/gobject/glib-enumtypes.c.template index ab59828fe..a73a49247 100644 --- a/gobject/glib-enumtypes.c.template +++ b/gobject/glib-enumtypes.c.template @@ -14,7 +14,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS /*** END file-tail ***/ /*** BEGIN file-production ***/ -/* enumerations from "@filename@" */ +/* enumerations from "@basename@" */ /*** END file-production ***/ diff --git a/gobject/glib-enumtypes.h.template b/gobject/glib-enumtypes.h.template index f907d9cae..8e3ab384e 100644 --- a/gobject/glib-enumtypes.h.template +++ b/gobject/glib-enumtypes.h.template @@ -9,7 +9,7 @@ G_BEGIN_DECLS /*** BEGIN file-production ***/ -/* enumerations from "@filename@" */ +/* enumerations from "@basename@" */ /*** END file-production ***/ /*** BEGIN value-header ***/