gobject-introspection r164 - in trunk: . giscanner tools

[johan svn gnome org]

Author: johan
Date: Tue Mar 25 20:53:32 2008
New Revision: 164
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=164&view=rev

Log:
2008-03-25  Johan Dahlin  <johan gnome org>

	* Makefile.am:
	* configure.ac:
	* giscanner/Makefile.am:
	* giscanner/sourcescanner.c:
	* giscanner/sourcescanner.h:
	* tools/Makefile.am:
	* tools/grealpath.h:
	* tools/sourcescanner.c:
	* tools/sourcescanner.h:

	Move the scanner to a separate library.



Added:
   trunk/giscanner/   (props changed)
   trunk/giscanner/Makefile.am
   trunk/giscanner/grealpath.h
      - copied unchanged from r161, /trunk/tools/grealpath.h
   trunk/giscanner/scannerlexer.l
      - copied unchanged from r163, /trunk/tools/scannerlexer.l
   trunk/giscanner/scannerparser.y
      - copied unchanged from r163, /trunk/tools/scannerparser.y
   trunk/giscanner/sourcescanner.c
      - copied, changed from r163, /trunk/tools/sourcescanner.c
   trunk/giscanner/sourcescanner.h
      - copied, changed from r163, /trunk/tools/sourcescanner.h
Removed:
   trunk/tools/grealpath.h
   trunk/tools/sourcescanner.c
   trunk/tools/sourcescanner.h
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.ac
   trunk/tools/   (props changed)
   trunk/tools/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Tue Mar 25 20:53:32 2008
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = gidl girepository tools tests
+SUBDIRS = gidl girepository giscanner tools tests
 DIST_SUBDIRS = m4 $(SUBDIRS)
 
 pkgconfigdir = $(libdir)/pkgconfig

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Mar 25 20:53:32 2008
@@ -94,6 +94,7 @@
 AC_CONFIG_FILES([Makefile
                  gidl/Makefile
                  girepository/Makefile
+                 giscanner/Makefile
                  m4/Makefile
                  tools/Makefile
                  tests/Makefile

Added: trunk/giscanner/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/giscanner/Makefile.am	Tue Mar 25 20:53:32 2008
@@ -0,0 +1,25 @@
+## Process this file with automake to produce Makefile.in
+
+INCLUDES = -I$(top_srcdir)/girepository
+BUILT_SOURCES = scannerparser.c scannerparser.h scannerlexer.c scannerlexer.h
+
+CLEANFILES = scannerparser.c scannerparser.h scannerlexer.c scannerlexer.h
+AM_YFLAGS = -d -t
+
+# Why do I have to do this automake?
+scannerlexer.h: scannerlexer.c
+
+noinst_LTLIBRARIES = libgiscanner.la
+
+libgiscanner_la_SOURCES = \
+	sourcescanner.c				\
+	sourcescanner.h				\
+	scannerlexer.l				\
+	scannerparser.y				\
+	grealpath.h
+libgiscanner_la_LIBADD = $(GOBJECT_LIBS)
+libgiscanner_la_CFLAGS = $(GOBJECT_CFLAGS)
+
+GCOVSOURCES = $(libgiscanner_la_SOURCES)
+
+include $(top_srcdir)/gcov.mak

Copied: trunk/giscanner/sourcescanner.c (from r163, /trunk/tools/sourcescanner.c)
==============================================================================
--- /trunk/tools/sourcescanner.c	(original)
+++ trunk/giscanner/sourcescanner.c	Tue Mar 25 20:53:32 2008
@@ -236,6 +236,13 @@
 }
 
 void
+gi_source_scanner_set_macro_scan (GISourceScanner  *scanner,
+				  gboolean          macro_scan)
+{
+  scanner->macro_scan = macro_scan;
+}
+
+void
 gi_source_scanner_add_symbol (GISourceScanner  *scanner,
 			      GISourceSymbol   *symbol)
 {

Copied: trunk/giscanner/sourcescanner.h (from r163, /trunk/tools/sourcescanner.h)
==============================================================================
--- /trunk/tools/sourcescanner.h	(original)
+++ trunk/giscanner/sourcescanner.h	Tue Mar 25 20:53:32 2008
@@ -125,14 +125,14 @@
   FunctionSpecifier function_specifier;
   char *name;
   GISourceType *base_type;
-  GList *child_list;
+  GList *child_list; /* list of GISourceSymbol */
 };
 
 struct _GISourceDirective
 {
   char *name;
   char *value;
-  GSList *options;
+  GSList *options; /* list of options (key=value) */
 };
 
 GISourceScanner *   gi_source_scanner_new              (void);
@@ -140,6 +140,8 @@
 						        const gchar      *filename);
 gboolean            gi_source_scanner_parse_file       (GISourceScanner  *igenerator,
 						        FILE             *file);
+void                gi_source_scanner_set_macro_scan   (GISourceScanner  *scanner,
+							gboolean          macro_scan);
 GSList *            gi_source_scanner_get_symbols      (GISourceScanner  *scanner);
 void                gi_source_scanner_free             (GISourceScanner  *scanner);
 

Modified: trunk/tools/Makefile.am
==============================================================================
--- trunk/tools/Makefile.am	(original)
+++ trunk/tools/Makefile.am	Tue Mar 25 20:53:32 2008
@@ -1,16 +1,14 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -DGIREPO_DEFAULT_SEARCH_PATH="\"$(libdir)\""
-BUILT_SOURCES = scannerparser.c scannerparser.h scannerlexer.c scannerlexer.h \
-		gmetadata-header.c
+INCLUDES = \
+	-DGIREPO_DEFAULT_SEARCH_PATH="\"$(libdir)\"" \
+	-I$(top_srcdir)/girepository \
+	-I$(top_srcdir)/giscanner
+BUILT_SOURCES = gmetadata-header.c
 
-CLEANFILES = scannerparser.c scannerparser.h scannerlexer.c scannerlexer.h gmetadata-header.c
-AM_YFLAGS = -d -t
+CLEANFILES = gmetadata-header.c
 EXTRA_DIST = quote-file.sh
 
-# Why do I have to do this automake?
-scannerlexer.h: scannerlexer.c
-
 noinst_LTLIBRARIES = libgirepository-parser.la
 bin_PROGRAMS = g-idl-compiler g-idl-generate g-idl-scanner
 
@@ -32,28 +30,28 @@
 	gidlcompilertypenode.h			\
 	gmetadata-header.c
 
-libgirepository_parser_la_CFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
+libgirepository_parser_la_CFLAGS = $(GIREPO_CFLAGS)
 
 g_idl_compiler_SOURCES = compiler.c	
-g_idl_compiler_CFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
+g_idl_compiler_CFLAGS = $(GIREPO_CFLAGS)
 g_idl_compiler_LDADD = $(GIREPO_LIBS) $(top_builddir)/girepository/libgirepository.la libgirepository-parser.la
 
 g_idl_generate_SOURCES = generate.c
-g_idl_generate_CFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
+g_idl_generate_CFLAGS = $(GIREPO_CFLAGS)
 g_idl_generate_LDADD = $(GIREPO_LIBS) $(top_builddir)/girepository/libgirepository.la
 
 g_idl_scanner_SOURCES =				\
-	sourcescanner.c				\
-	sourcescanner.h				\
 	scanner.c				\
 	scanner.h				\
-	scannerlexer.l				\
-	scannerparser.y				\
 	gidlwriter.c				\
-	gidlwriter.h				\
-	grealpath.h
-g_idl_scanner_CFLAGS = $(GIREPO_CFLAGS) $(SCANNER_CFLAGS) -I$(top_srcdir)/girepository
-g_idl_scanner_LDADD = $(GIREPO_LIBS) $(SCANNER_LIBS) $(top_builddir)/girepository/libgirepository.la libgirepository-parser.la
+	gidlwriter.h
+g_idl_scanner_CFLAGS = $(GIREPO_CFLAGS) $(SCANNER_CFLAGS)
+g_idl_scanner_LDADD = \
+	$(GIREPO_LIBS) \
+	$(SCANNER_LIBS) \
+	$(top_builddir)/girepository/libgirepository.la \
+	$(top_builddir)/giscanner/libgiscanner.la \
+	libgirepository-parser.la
 
 GCOVSOURCES =					\
 	$(libgirepository_la_SOURCES)		\