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

Default to --raw. Update.

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

	* tools/generate.c, tools/compiler.c: Default
	to --raw.
	* all Makefile.am: Update.

svn path=/trunk/; revision=462
This commit is contained in:
Colin Walters 2008-08-22 21:14:31 +00:00 committed by Philip Withnall
parent a91b3dba67
commit fc4cffc61d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
girepository/tools/generate.c
View File

@ -1159,7 +1159,7 @@ load_typelib (const gchar *filename,
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
gboolean raw = FALSE; gboolean shlib = FALSE;
gchar **input = NULL; gchar **input = NULL;
GOptionContext *context; GOptionContext *context;
GError *error = NULL; GError *error = NULL;
@ -1168,7 +1168,7 @@ main (int argc, char *argv[])
GTypelib *data; GTypelib *data;
GOptionEntry options[] = GOptionEntry options[] =
{ {
{ "raw", 0, 0, G_OPTION_ARG_NONE, &raw, "handle raw typelib", NULL }, { "shlib", 0, 0, G_OPTION_ARG_NONE, &shlib, "handle typelib embedded in shlib", NULL },
{ "output", 'o', 0, G_OPTION_ARG_FILENAME, &output, "output file", "FILE" }, { "output", 'o', 0, G_OPTION_ARG_FILENAME, &output, "output file", "FILE" },
{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &input, NULL, NULL }, { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &input, NULL, NULL },
{ NULL, } { NULL, }
@ -1195,7 +1195,7 @@ main (int argc, char *argv[])
const guchar *typelib; const guchar *typelib;
gsize len; gsize len;
if (raw) if (!shlib)
{ {
if (!g_file_get_contents (input[i], (gchar **)&typelib, &len, &error)) if (!g_file_get_contents (input[i], (gchar **)&typelib, &len, &error))
{ {