gobject-introspection r462 - in trunk: . tests tests/invoke tests/scanner tools

[walters svn gnome org]

Author: walters
Date: Fri Aug 22 21:14:31 2008
New Revision: 462
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=462&view=rev

Log:
2008-08-22  Colin Walters  <walters verbum org>

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


Modified:
   trunk/ChangeLog
   trunk/tests/Makefile.am
   trunk/tests/invoke/Makefile.am
   trunk/tests/scanner/Makefile.am
   trunk/tools/compiler.c
   trunk/tools/generate.c

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	(original)
+++ trunk/tests/Makefile.am	Fri Aug 22 21:14:31 2008
@@ -25,8 +25,8 @@
 
 %.gir.test: %.gir
 	@echo Testing $<:
-	$(DEBUG) $(top_builddir)/tools/g-ir-compiler --raw $< > $<.1; \
-	$(DEBUG) $(top_builddir)/tools/g-ir-generate --raw $<.1 > $<.2; \
+	$(DEBUG) $(top_builddir)/tools/g-ir-compiler $< > $<.1; \
+	$(DEBUG) $(top_builddir)/tools/g-ir-generate $<.1 > $<.2; \
 	diff -u $< $<.2; rm $<.1 $<.2
 
 check-local: $(GIRTESTS)

Modified: trunk/tests/invoke/Makefile.am
==============================================================================
--- trunk/tests/invoke/Makefile.am	(original)
+++ trunk/tests/invoke/Makefile.am	Fri Aug 22 21:14:31 2008
@@ -16,8 +16,8 @@
 BUILT_SOURCES = testfns-metadata.c
 CLEANFILES = testfns-metadata.c 
 
-testfns-metadata.c: testfns.gir $(top_builddir)/tools/g-ir-compiler
-	$(CHECK_DEBUG) $(top_builddir)/tools/g-ir-compiler $(srcdir)/testfns.gir -o testfns-metadata.c
+testfns-metadata.c: testfns.gir $(top_builddir)/tools/g-ir-compiler Makefile
+	$(CHECK_DEBUG) $(top_builddir)/tools/g-ir-compiler $(srcdir)/testfns.gir --code -o testfns-metadata.c
 
 invoke_SOURCES = invoke.c
 invoke_CFLAGS = $(GIREPO_CFLAGS)  -I$(top_srcdir)/girepository

Modified: trunk/tests/scanner/Makefile.am
==============================================================================
--- trunk/tests/scanner/Makefile.am	(original)
+++ trunk/tests/scanner/Makefile.am	Fri Aug 22 21:14:31 2008
@@ -84,7 +84,7 @@
 	@diff -u -U 10 $(srcdir)/$*-expected.gir $*.gir && echo "* $*.gir"
 
 %.typelib: %.gir
-	$(top_builddir)/tools/g-ir-compiler $< --raw -o $@
+	$(top_builddir)/tools/g-ir-compiler $< -o $@
 	$(SCANNER) --typelib-xml $< > $<.tmp && mv $<.tmp $<.txml
 
 check-%.typelib: %.typelib

Modified: trunk/tools/compiler.c
==============================================================================
--- trunk/tools/compiler.c	(original)
+++ trunk/tools/compiler.c	Fri Aug 22 21:14:31 2008
@@ -29,7 +29,7 @@
 #include "girparser.h"
 #include "gtypelib.h"
 
-gboolean raw = FALSE;
+gboolean code = FALSE;
 gboolean no_init = FALSE;
 gchar **input = NULL;
 gchar *output = NULL;
@@ -119,7 +119,7 @@
       g_free (filename);
     }
 
-  if (raw)
+  if (!code)
     fwrite (typelib->data, 1, typelib->len, file);
   else
     {
@@ -148,8 +148,7 @@
 
 static GOptionEntry options[] = 
 {
-  { "raw", 0, 0, G_OPTION_ARG_NONE, &raw, "emit raw typelib", NULL },
-  { "code", 0, G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, &raw, "emit C code", NULL },
+  { "code", 0, 0, G_OPTION_ARG_NONE, &code, "emit C code", NULL },
   { "no-init", 0, 0, G_OPTION_ARG_NONE, &no_init, "do not create _init() function", NULL },
   { "output", 'o', 0, G_OPTION_ARG_FILENAME, &output, "output file", "FILE" }, 
   { "module", 'm', 0, G_OPTION_ARG_STRING, &mname, "module to compile", "NAME" }, 

Modified: trunk/tools/generate.c
==============================================================================
--- trunk/tools/generate.c	(original)
+++ trunk/tools/generate.c	Fri Aug 22 21:14:31 2008
@@ -1159,7 +1159,7 @@
 int 
 main (int argc, char *argv[])
 {  
-  gboolean raw = FALSE;
+  gboolean shlib = FALSE;
   gchar **input = NULL;
   GOptionContext *context;
   GError *error = NULL;
@@ -1168,7 +1168,7 @@
   GTypelib *data;
   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" }, 
       { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &input, NULL, NULL },
       { NULL, }
@@ -1195,7 +1195,7 @@
       const guchar *typelib;
       gsize len;
 
-      if (raw)
+      if (!shlib)
 	{
 	  if (!g_file_get_contents (input[i], (gchar **)&typelib, &len, &error))
 	    {