luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-14 00:06:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename .gir files using GI namespace. Use XDG_DATA_DIRS for looking up

Browse Source 
2008-08-20  Colin Walters  <walters@verbum.org>

	* gir/Makefile.am: Rename .gir files using GI namespace.
	* girepository/girepository.c: Use XDG_DATA_DIRS for
	looking up typelibs.  Also typelibs are now suffixed
	with .typelib.
	* tests/invoke/Makefile.am: Only use metadata.
	* girepository/Makefile.am: Remove unnecessary include.
	* tests/scanner/Makefile.am: Update using GI namespaces
	for scanner includes.

svn path=/trunk/; revision=422
This commit is contained in:
Colin Walters 2008-08-20 19:17:14 +00:00 committed by Colin Walters
parent e47f68925e
commit 89e881b47b
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -2,8 +2,6 @@ include $(top_srcdir)/gcov.mak
GCOVSOURCES = $(libgirepository_la_SOURCES)
INCLUDES = -DGIREPO_DEFAULT_SEARCH_PATH="\"$(libdir)\""
girepodir = $(includedir)/gobject-introspection-1.0/
girepo_HEADERS = girepository.h

28
girepository.c
View File

@ -114,11 +114,6 @@ g_irepository_register (GIRepository *repository,
if (typelib->module == NULL)
typelib->module = g_module_open (NULL, 0);
if (g_getenv ("G_IREPOSITORY_VERBOSE"))
{
g_printerr ("Loaded typelib %s\n", name);
}
return name;
}
@ -395,22 +390,17 @@ g_irepository_get_shared_library (GIRepository *repository,
static inline void
g_irepository_build_search_path (void)
{
gchar **dir;
gchar **tokens;
const gchar *const *datadirs;
const gchar *const *dir;
if (g_getenv ("GIREPOPATH")) {
gchar *path;
path = g_strconcat (g_getenv ("GIREPOPATH"), ":", GIREPO_DEFAULT_SEARCH_PATH, NULL);
tokens = g_strsplit (path, ":", 0);
g_free (path);
} else
tokens = g_strsplit (GIREPO_DEFAULT_SEARCH_PATH, ":", 0);
datadirs = g_get_system_data_dirs ();
search_path = g_slist_prepend (search_path, ".");
for (dir = tokens; *dir; ++dir)
search_path = g_slist_prepend (search_path, *dir);
search_path = NULL;
for (dir = datadirs; *dir; dir++) {
char *path = g_build_filename (*dir, "gitypelibs", NULL);
search_path = g_slist_prepend (search_path, path);
}
search_path = g_slist_reverse (search_path);
g_free (tokens);
}
const gchar *
@ -441,7 +431,7 @@ g_irepository_register_file (GIRepository *repository,
if (search_path == NULL)
g_irepository_build_search_path ();
fname = g_strconcat (namespace, ".repo", NULL);
fname = g_strconcat (namespace, ".typelib", NULL);
for (ldir = search_path; ldir; ldir = ldir->next) {
dir = ldir->data;