Commit 7cff1b22 authored by Philip Withnall's avatar Philip Withnall

glib: Update various code comments to mention Meson

Rather than referring to the old autotools build system.
Signed-off-by: Philip Withnall's avatarPhilip Withnall <withnall@endlessm.com>
parent d08e4661
......@@ -56,7 +56,7 @@ test_annotations (void)
iface = foo_igen_bar_interface_info ();
g_assert (iface != NULL);
/* see Makefile.am for where these annotations are injected */
/* see meson.build for where these annotations are injected */
g_assert_cmpint (count_annotations (iface->annotations), ==, 1);
g_assert_cmpstr (g_dbus_annotation_info_lookup (iface->annotations, "Key1"), ==, "Value1");
......
......@@ -11,11 +11,6 @@ typedef struct {
const gchar *err;
} SchemaTest;
/* Meson build defines this, autotools build does not */
#ifndef GLIB_COMPILE_SCHEMAS
#define GLIB_COMPILE_SCHEMAS "../glib-compile-schemas"
#endif
static void
test_schema_do_compile (gpointer data)
{
......@@ -23,7 +18,7 @@ test_schema_do_compile (gpointer data)
gchar *filename = g_strconcat (test->name, ".gschema.xml", NULL);
gchar *path = g_test_build_filename (G_TEST_DIST, "schema-tests", filename, NULL);
const gchar *argv[] = {
GLIB_COMPILE_SCHEMAS,
GLIB_COMPILE_SCHEMAS, /* defined in meson.build */
"--strict",
"--dry-run",
"--schema-file", path,
......
......@@ -2798,12 +2798,8 @@ main (int argc, char *argv[])
if (!backend_set)
g_setenv ("GSETTINGS_BACKEND", "memory", TRUE);
/* Meson build defines this, autotools build does not */
#ifndef GLIB_MKENUMS
#define GLIB_MKENUMS "../../gobject/glib-mkenums"
#endif
g_remove ("org.gtk.test.enums.xml");
/* #GLIB_MKENUMS is defined in meson.build */
g_assert (g_spawn_command_line_sync (GLIB_MKENUMS " "
"--template " SRCDIR "/enums.xml.template "
SRCDIR "/testenum.h",
......@@ -2820,12 +2816,8 @@ main (int argc, char *argv[])
g_assert (g_file_set_contents ("org.gtk.test.gschema.override", override_text, -1, NULL));
g_free (override_text);
/* Meson build defines this, autotools build does not */
#ifndef GLIB_COMPILE_SCHEMAS
#define GLIB_COMPILE_SCHEMAS "../glib-compile-schemas"
#endif
g_remove ("gschemas.compiled");
/* #GLIB_COMPILE_SCHEMAS is defined in meson.build */
g_assert (g_spawn_command_line_sync (GLIB_COMPILE_SCHEMAS " --targetdir=. "
"--schema-file=org.gtk.test.enums.xml "
"--schema-file=org.gtk.test.gschema.xml "
......
......@@ -90,7 +90,7 @@
#ifdef G_ATOMIC_LOCK_FREE
/* if G_ATOMIC_LOCK_FREE was defined by ./configure then we MUST
/* if G_ATOMIC_LOCK_FREE was defined by `meson configure` then we MUST
* implement the atomic operations in a lock-free manner.
*/
......@@ -669,7 +669,7 @@ gsize
}
#else
/* This error occurs when ./configure decided that we should be capable
/* This error occurs when `meson configure` decided that we should be capable
* of lock-free atomics but we find at compile-time that we are not.
*/
#error G_ATOMIC_LOCK_FREE defined, but incapable of lock-free atomics.
......
......@@ -498,7 +498,7 @@ g_dngettext (const gchar *domain,
* // Rest of your application.
* }
* ]|
* where `DATADIR` is as typically provided by automake.
* where `DATADIR` is as typically provided by automake or Meson.
*
* For a library, you only have to call bindtextdomain() and
* bind_textdomain_codeset() in your initialization function. If your library
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment