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

tools/gidlnode.c

Browse Source 
2008-06-08  Philip Van Hoof  <pvanhoof@gnome.org>

        * girepository/girepository.c:
        * girepository/gtypelib.c:
        * girepository/ginfo.c:
        * girepository/ginvoke.c:
        * girepository/girepository.h:
        * girepository/gtypelib.h:
        * girepository/gmetadata.c:
        * girepository/Makefile.am:
        * girepository/gmetadata.h:
        * tools/compiler.c:
        * tools/gidlmodule.c:
        * tools/gidlnode.c
        * tools/generate.c:
        * tools/gidlmodule.h:
        * tools/gidlparser.c:

        Renamed GMetadata to GTypelib


svn path=/trunk/; revision=288
This commit is contained in:
Philip Van Hoof 2008-06-08 14:37:30 +00:00 committed by Evan Welsh
parent c0b53bde4d
commit 397d16145c
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
girepository/tools/compiler.c
View File

@ -27,7 +27,7 @@
#include "gidlmodule.h" #include "gidlmodule.h"
#include "gidlnode.h" #include "gidlnode.h"
#include "gidlparser.h" #include "gidlparser.h"
#include "gmetadata.h" #include "gtypelib.h"
gboolean raw = FALSE; gboolean raw = FALSE;
gboolean no_init = FALSE; gboolean no_init = FALSE;
@ -39,7 +39,7 @@ gboolean debug = FALSE;
gboolean verbose = FALSE; gboolean verbose = FALSE;
static gchar * static gchar *
format_output (GMetadata *metadata) format_output (GTypelib *metadata)
{ {
GString *result; GString *result;
gint i; gint i;
@ -49,7 +49,7 @@ format_output (GMetadata *metadata)
g_string_append_printf (result, "#include <stdlib.h>\n"); g_string_append_printf (result, "#include <stdlib.h>\n");
g_string_append_printf (result, "#include <girepository.h>\n\n"); g_string_append_printf (result, "#include <girepository.h>\n\n");
g_string_append_printf (result, "const unsigned char _G_METADATA[] = \n{"); g_string_append_printf (result, "const unsigned char _G_TYPELIB[] = \n{");
for (i = 0; i < metadata->len; i++) for (i = 0; i < metadata->len; i++)
{ {
@ -63,7 +63,7 @@ format_output (GMetadata *metadata)
} }
g_string_append_printf (result, "\n};\n\n"); g_string_append_printf (result, "\n};\n\n");
g_string_append_printf (result, "const gsize _G_METADATA_SIZE = %u;\n\n", g_string_append_printf (result, "const gsize _G_TYPELIB_SIZE = %u;\n\n",
(guint)metadata->len); (guint)metadata->len);
if (!no_init) if (!no_init)
@ -72,8 +72,8 @@ format_output (GMetadata *metadata)
"__attribute__((constructor)) void\n" "__attribute__((constructor)) void\n"
"register_metadata (void)\n" "register_metadata (void)\n"
"{\n" "{\n"
"\tGMetadata *metadata;\n" "\tGTypelib *metadata;\n"
"\tmetadata = g_metadata_new_from_const_memory (_G_METADATA, _G_METADATA_SIZE);\n" "\tmetadata = g_typelib_new_from_const_memory (_G_TYPELIB, _G_TYPELIB_SIZE);\n"
"\tg_irepository_register (NULL, metadata);\n" "\tg_irepository_register (NULL, metadata);\n"
"}\n\n"); "}\n\n");
@ -83,7 +83,7 @@ format_output (GMetadata *metadata)
"{\n" "{\n"
"\tg_irepository_unregister (NULL, \"%s\");\n" "\tg_irepository_unregister (NULL, \"%s\");\n"
"}\n", "}\n",
g_metadata_get_namespace (metadata)); g_typelib_get_namespace (metadata));
} }
return g_string_free (result, FALSE); return g_string_free (result, FALSE);
@ -91,7 +91,7 @@ format_output (GMetadata *metadata)
static void static void
write_out_metadata (gchar *prefix, write_out_metadata (gchar *prefix,
GMetadata *metadata) GTypelib *metadata)
{ {
FILE *file; FILE *file;
@ -167,7 +167,7 @@ main (int argc, char ** argv)
GError *error = NULL; GError *error = NULL;
GList *c, *m, *modules; GList *c, *m, *modules;
gint i; gint i;
g_metadata_check_sanity (); g_typelib_check_sanity ();
context = g_option_context_new (""); context = g_option_context_new ("");
g_option_context_add_main_entries (context, options, NULL); g_option_context_add_main_entries (context, options, NULL);
@ -210,7 +210,7 @@ main (int argc, char ** argv)
{ {
GIdlModule *module = m->data; GIdlModule *module = m->data;
gchar *prefix; gchar *prefix;
GMetadata *metadata; GTypelib *metadata;
if (mname && strcmp (mname, module->name) != 0) if (mname && strcmp (mname, module->name) != 0)
continue; continue;
@ -227,7 +227,7 @@ main (int argc, char ** argv)
continue; continue;
} }
if (!g_metadata_validate (metadata, &error)) if (!g_typelib_validate (metadata, &error))
g_error ("Invalid metadata for module '%s': %s", g_error ("Invalid metadata for module '%s': %s",
module->name, error->message); module->name, error->message);
@ -237,7 +237,7 @@ main (int argc, char ** argv)
prefix = NULL; prefix = NULL;
write_out_metadata (prefix, metadata); write_out_metadata (prefix, metadata);
g_metadata_free (metadata); g_typelib_free (metadata);
metadata = NULL; metadata = NULL;
/* when writing to stdout, stop after the first module */ /* when writing to stdout, stop after the first module */