mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-26 15:36:14 +01:00
Make g-ir-compiler find files installed by make install
When ./configure --prefix $HOME/some/where is used gobject-introspection will happily install the files into $HOME/some/where/data/gir-1.0 but it will refuse to find them. Apply the same trick as in girepository/girepository.c:init_globals to find the gir files. Unifiy the name gir-1.0 in GIR_SUFFIX and use it throughout the project, introduce GIR_DIR which holds the path to the gir files and update girparser and transformer.py to look into this path.
This commit is contained in:
parent
7f29f620a4
commit
5917b5ba42
10
girparser.c
10
girparser.c
@ -27,6 +27,7 @@
|
||||
#include "girmodule.h"
|
||||
#include "girnode.h"
|
||||
#include "gtypelib.h"
|
||||
#include "config.h"
|
||||
|
||||
struct _GIrParser
|
||||
{
|
||||
@ -245,13 +246,18 @@ locate_gir (GIrParser *parser,
|
||||
}
|
||||
for (dir = datadirs; *dir; dir++)
|
||||
{
|
||||
path = g_build_filename (*dir, "gir-1.0", girname, NULL);
|
||||
path = g_build_filename (*dir, GIR_SUFFIX, girname, NULL);
|
||||
if (g_file_test (path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR))
|
||||
return path;
|
||||
g_free (path);
|
||||
path = NULL;
|
||||
}
|
||||
return path;
|
||||
|
||||
path = g_build_filename (GIR_DIR, girname, NULL);
|
||||
if (g_file_test (path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR))
|
||||
return path;
|
||||
g_free (path);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#define MISSING_ATTRIBUTE(ctx,error,element,attribute) \
|
||||
|
Loading…
Reference in New Issue
Block a user