gobject-introspection r104 - in trunk: . gidl girepository src tests tests/invoke tests/parser tools

From: robtaylor svn gnome org
To: svn-commits-list gnome org
Subject: gobject-introspection r104 - in trunk: . gidl girepository src tests tests/invoke tests/parser tools
Date: Fri, 8 Feb 2008 15:31:04 +0000 (GMT)
Author: robtaylor
Date: Fri Feb  8 15:31:03 2008
New Revision: 104
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=104&view=rev

Log:
2008-02-08  Rob Taylor  <rob taylor codethink co uk>

	* Makefile.am:
	* configure.ac:
	* gidl/Makefile.am: Added:
	* girepository/Makefile.am: Added:
	* src/Makefile.am: Renamed to tools/Makefile.am:
	* src/compiler.c: Renamed to tools/compiler.c:
	* src/g-idl-offsets.pl: Renamed to tools/g-idl-offsets.pl:
	* src/generate.c: Renamed to tools/generate.c:
	* src/gidlmodule.c: Renamed to tools/gidlmodule.c:
	* src/gidlmodule.h: Renamed to tools/gidlmodule.h:
	* src/gidlnode.c: Renamed to tools/gidlnode.c:
	* src/gidlnode.h: Renamed to tools/gidlnode.h:
	* src/gidlparser.c: Renamed to tools/gidlparser.c:
	* src/gidlparser.h: Renamed to tools/gidlparser.h:
	* src/gidlwriter.c: Renamed to tools/gidlwriter.c:
	* src/gidlwriter.h: Renamed to tools/gidlwriter.h:
	* src/ginfo.c: Renamed to girepository/ginfo.c:
	* src/ginvoke.c: Renamed to girepository/ginvoke.c:
	* src/girepository.c: Renamed to girepository/girepository.c:
	* src/girepository.h: Renamed to girepository/girepository.h:
	* src/gmetadata.c: Renamed to girepository/gmetadata.c:
	* src/gmetadata.h: Renamed to girepository/gmetadata.h:
	* src/scanner.c: Renamed to tools/scanner.c:
	* src/scanner.h: Renamed to tools/scanner.h:
	* src/scannerlexer.l: Renamed to tools/scannerlexer.l:
	* src/scannerparser.y: Renamed to tools/scannerparser.y:
	* tests/invoke/Makefile.am:
	Split src/ into girepository/ and tools/

	* Makefile.am:
	* configure.ac:
	* girepository/Makefile.am:
	* tests/Makefile.am:
	* tests/invoke/Makefile.am:
	* tests/parser/Makefile.am:
	* tests/roundtrips.sh:
	* tools/Makefile.am:
	Make distcheck work.


Added:
   trunk/gidl/Makefile.am
   trunk/girepository/
   trunk/girepository/Makefile.am
   trunk/girepository/ginfo.c
      - copied, changed from r103, /trunk/src/ginfo.c
   trunk/girepository/ginvoke.c
      - copied, changed from r103, /trunk/src/ginvoke.c
   trunk/girepository/girepository.c
      - copied, changed from r103, /trunk/src/girepository.c
   trunk/girepository/girepository.h
      - copied, changed from r103, /trunk/src/girepository.h
   trunk/girepository/gmetadata.c
      - copied, changed from r103, /trunk/src/gmetadata.c
   trunk/girepository/gmetadata.h
      - copied, changed from r103, /trunk/src/gmetadata.h
   trunk/tools/
   trunk/tools/Makefile.am
   trunk/tools/compiler.c
      - copied, changed from r103, /trunk/src/compiler.c
   trunk/tools/g-idl-offsets.pl
      - copied, changed from r103, /trunk/src/g-idl-offsets.pl
   trunk/tools/generate.c
      - copied, changed from r103, /trunk/src/generate.c
   trunk/tools/gidlmodule.c
      - copied, changed from r103, /trunk/src/gidlmodule.c
   trunk/tools/gidlmodule.h
      - copied, changed from r103, /trunk/src/gidlmodule.h
   trunk/tools/gidlnode.c
      - copied, changed from r103, /trunk/src/gidlnode.c
   trunk/tools/gidlnode.h
      - copied, changed from r103, /trunk/src/gidlnode.h
   trunk/tools/gidlparser.c
      - copied, changed from r103, /trunk/src/gidlparser.c
   trunk/tools/gidlparser.h
      - copied, changed from r103, /trunk/src/gidlparser.h
   trunk/tools/gidlwriter.c
      - copied, changed from r103, /trunk/src/gidlwriter.c
   trunk/tools/gidlwriter.h
      - copied, changed from r103, /trunk/src/gidlwriter.h
   trunk/tools/scanner.c
      - copied, changed from r103, /trunk/src/scanner.c
   trunk/tools/scanner.h
      - copied, changed from r103, /trunk/src/scanner.h
   trunk/tools/scannerlexer.l
      - copied, changed from r103, /trunk/src/scannerlexer.l
   trunk/tools/scannerparser.y
      - copied, changed from r103, /trunk/src/scannerparser.y
Removed:
   trunk/src/Makefile.am
   trunk/src/compiler.c
   trunk/src/g-idl-offsets.pl
   trunk/src/generate.c
   trunk/src/gidlmodule.c
   trunk/src/gidlmodule.h
   trunk/src/gidlnode.c
   trunk/src/gidlnode.h
   trunk/src/gidlparser.c
   trunk/src/gidlparser.h
   trunk/src/gidlwriter.c
   trunk/src/gidlwriter.h
   trunk/src/ginfo.c
   trunk/src/ginvoke.c
   trunk/src/girepository.c
   trunk/src/girepository.h
   trunk/src/gmetadata.c
   trunk/src/gmetadata.h
   trunk/src/scanner.c
   trunk/src/scanner.h
   trunk/src/scannerlexer.l
   trunk/src/scannerparser.y
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.ac
   trunk/tests/Makefile.am
   trunk/tests/invoke/Makefile.am
   trunk/tests/parser/Makefile.am
   trunk/tests/roundtrips.sh

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Fri Feb  8 15:31:03 2008
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = src tests
+SUBDIRS = gidl girepository tools tests
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gobject-introspection.pc

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Feb  8 15:31:03 2008
@@ -5,7 +5,7 @@
 AC_INIT(gobject-introspection, 0.1, http://bugzilla.gnome.org/enter_bug.cgi?product=glib)
 AM_INIT_AUTOMAKE([1.7])
 AM_MAINTAINER_MODE
-AC_CONFIG_SRCDIR([src/ginvoke.c])
+AC_CONFIG_SRCDIR([girepository/ginvoke.c])
 AC_CONFIG_HEADER([config.h])
 
 # Checks for programs.
@@ -87,7 +87,9 @@
 AC_CHECK_FUNCS([memchr strchr strspn strstr strtol strtoull])
 
 AC_CONFIG_FILES([Makefile
-                 src/Makefile
+		 gidl/Makefile
+                 girepository/Makefile
+                 tools/Makefile
                  tests/Makefile
                  tests/invoke/Makefile
                  tests/parser/Makefile

Added: trunk/gidl/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/gidl/Makefile.am	Fri Feb  8 15:31:03 2008
@@ -0,0 +1 @@
+EXTRA_DIST = GLib.gidl

Added: trunk/girepository/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/girepository/Makefile.am	Fri Feb  8 15:31:03 2008
@@ -0,0 +1,16 @@
+## Process this file with automake to produce Makefile.in
+
+INCLUDES = -DGIREPO_DEFAULT_SEARCH_PATH="\"$(libdir)\""
+
+lib_LTLIBRARIES = libgirepository.la
+
+libgirepository_la_SOURCES =			\
+	girepository.c				\
+	gmetadata.h				\
+	gmetadata.c				\
+	ginfo.c					\
+	ginvoke.c
+libgirepository_la_CFLAGS = $(GIREPO_CFLAGS)
+
+girepodir = $(includedir)/glib-2.0/gobject-introspection
+girepo_HEADERS = girepository.h

Copied: trunk/girepository/ginfo.c (from r103, /trunk/src/ginfo.c)
==============================================================================

Copied: trunk/girepository/ginvoke.c (from r103, /trunk/src/ginvoke.c)
==============================================================================

Copied: trunk/girepository/girepository.c (from r103, /trunk/src/girepository.c)
==============================================================================

Copied: trunk/girepository/girepository.h (from r103, /trunk/src/girepository.h)
==============================================================================

Copied: trunk/girepository/gmetadata.c (from r103, /trunk/src/gmetadata.c)
==============================================================================

Copied: trunk/girepository/gmetadata.h (from r103, /trunk/src/gmetadata.h)
==============================================================================

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	(original)
+++ trunk/tests/Makefile.am	Fri Feb  8 15:31:03 2008
@@ -1,4 +1,18 @@
 SUBDIRS = . invoke parser
 
-TESTS = roundtrips.sh
+EXTRA_DIST = \
+	roundtrips.sh	\
+	array.test	\
+	boxed.test	\
+	enum.test	\
+	errors.test	\
+	function.test	\
+	gobject.test	\
+	interface.test	\
+	object.test	\
+	struct.test	\
+	union.test	\
+	xref1.test	\
+	xref2.test
 
+TESTS = roundtrips.sh

Modified: trunk/tests/invoke/Makefile.am
==============================================================================
--- trunk/tests/invoke/Makefile.am	(original)
+++ trunk/tests/invoke/Makefile.am	Fri Feb  8 15:31:03 2008
@@ -9,25 +9,25 @@
 testfns_la_SOURCES =				\
 	testfns.c				\
 	testfns-metadata.c
-testfns_la_CFLAGS = $(GIREPO_CFLAGS) -I ../../src
+testfns_la_CFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
 testfns_la_LDFLAGS = -module -avoid-version
-testfns_la_LIBADD = $(GIREPO_LIBS) ../../src/libgirepository.la
+testfns_la_LIBADD = $(GIREPO_LIBS) $(top_builddir)/girepository/libgirepository.la
 
 BUILT_SOURCES = testfns-metadata.c test.repo
 CLEANFILES = testfns-metadata.c test.repo
 
 testfns-metadata.c: testfns.xml
-	../../src/g-idl-compiler $(srcdir)/testfns.xml -o testfns-metadata.c
+	$(top_builddir)/tools/g-idl-compiler $(srcdir)/testfns.xml -o testfns-metadata.c
 
 test.repo: testfns.xml
-	../../src/g-idl-compiler --shared-library testfns.la $< --raw -o $@
+	$(top_builddir)/tools/g-idl-compiler --shared-library testfns.la $< --raw -o $@
 
 invoke_SOURCES = invoke.c
-invoke_CFLAGS = $(GIREPO_CFLAGS) -I ../../src
-invoke_LDADD = $(GIREPO_LIBS) ../../src/libgirepository.la
+invoke_CFLAGS = $(GIREPO_CFLAGS)  -I$(top_srcdir)/girepository
+invoke_LDADD = $(GIREPO_LIBS) $(top_builddir)/girepository/libgirepository.la
 
 TESTS = invoke invoke-namespace-find.sh
 
-EXTRA_DIST = invoke-namespace-find.sh
+EXTRA_DIST = invoke-namespace-find.sh testfns.xml
 
 TESTS_ENVIRONMENT = GIREPOPATH="."

Modified: trunk/tests/parser/Makefile.am
==============================================================================
--- trunk/tests/parser/Makefile.am	(original)
+++ trunk/tests/parser/Makefile.am	Fri Feb  8 15:31:03 2008
@@ -2,7 +2,7 @@
 testlibdir = /tmp
 install-testlibLTLIBRARIES: # prevent it from being installed
 
-libfoo_la_SOURCES = foo.c
+libfoo_la_SOURCES = foo.c foo-object.h
 
 libfoo_la_CFLAGS = $(GOBJECT_CFLAGS)
 libfoo_la_LDFLAGS = -module -avoid-version
@@ -10,17 +10,18 @@
 
 BUILT_SOURCES = Foo.gidl
 CLEANFILES = Foo.gidl
+EXTRA_DIST = Foo-expected.gidl
 
-SCAN_SOURCES = foo-object.h
+SCAN_SOURCES = $(srcdir)/foo-object.h
 
-Foo.gidl: libfoo.la foo-object.h $(top_builddir)/src/g-idl-scanner
-	G_DEBUG=fatal_warnings $(top_builddir)/src/g-idl-scanner -v --namespace=Foo \
+Foo.gidl: libfoo.la foo-object.h $(top_builddir)/tools/g-idl-scanner
+	G_DEBUG=fatal_warnings $(top_builddir)/tools/g-idl-scanner -v --namespace=Foo \
 	--include-idl=$(top_srcdir)/gidl/GLib.gidl \
-	$(SCAN_SOURCES) -I. $(GOBJECT_CFLAGS) \
+	$(SCAN_SOURCES) -I$(srcdir) $(GOBJECT_CFLAGS) \
 	libfoo.la --output $@
 
 check-local:
-	@diff -u Foo-expected.gidl Foo.gidl && echo "Foo.gidl"
+	@diff -u $(srcdir)/Foo-expected.gidl Foo.gidl && echo "Foo.gidl"
 	@echo "======================="
 	@echo "All parser tests passed"
 	@echo "======================="

Modified: trunk/tests/roundtrips.sh
==============================================================================
--- trunk/tests/roundtrips.sh	(original)
+++ trunk/tests/roundtrips.sh	Fri Feb  8 15:31:03 2008
@@ -4,23 +4,23 @@
 
 for i in $SIMPLE_TESTS; do
 	echo $i
-	../src/g-idl-compiler --raw $i > $i.1; 
-	../src/g-idl-generate --raw $i.1 > $i.2; 
-	diff -u $i $i.2 || exit 1; 
+	../tools/g-idl-compiler --raw $srcdir/$i > $i.1; 
+	../tools/g-idl-generate --raw $i.1 > $i.2; 
+	diff -u $srcdir/$i $i.2 || exit 1; 
 	rm $i.1 $i.2
 done
 
-../src/g-idl-compiler --raw --module=Foo object.test gobject.test > object.test.1
-../src/g-idl-generate --raw object.test.1 > object.test.2
-diff -u object.test object.test.2 || exit 1
+../tools/g-idl-compiler --raw --module=Foo $srcdir/object.test $srcdir/gobject.test > object.test.1
+../tools/g-idl-generate --raw object.test.1 > object.test.2
+diff -u $srcdir/object.test object.test.2 || exit 1
 rm object.test.1 object.test.2
 
-../src/g-idl-compiler --raw --module=Foo xref1.test xref2.test > xref1.test.1
-../src/g-idl-generate --raw xref1.test.1 > xref1.test.2
-diff -u xref1.test xref1.test.2 || exit 1
+../tools/g-idl-compiler --raw --module=Foo $srcdir/xref1.test $srcdir/xref2.test > xref1.test.1
+../tools/g-idl-generate --raw xref1.test.1 > xref1.test.2
+diff -u $srcdir/xref1.test xref1.test.2 || exit 1
 rm xref1.test.1 xref1.test.2
 
-../src/g-idl-compiler --raw --module=Bar xref1.test xref2.test > xref2.test.1
-../src/g-idl-generate --raw xref2.test.1 > xref2.test.2
-diff -u xref2.test xref2.test.2 || exit 1
+../tools/g-idl-compiler --raw --module=Bar $srcdir/xref1.test $srcdir/xref2.test > xref2.test.1
+../tools/g-idl-generate --raw xref2.test.1 > xref2.test.2
+diff -u $srcdir/xref2.test xref2.test.2 || exit 1
 rm xref2.test.1 xref2.test.2

Added: trunk/tools/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/tools/Makefile.am	Fri Feb  8 15:31:03 2008
@@ -0,0 +1,39 @@
+## 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
+CLEANFILES = scannerparser.c scannerparser.h scannerlexer.c scannerlexer.h
+AM_YFLAGS = -d
+
+# 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
+
+libgirepository_parser_la_SOURCES =		\
+	gidlmodule.c				\
+	gidlmodule.h				\
+	gidlnode.c				\
+	gidlnode.h				\
+	gidlparser.c				\
+	gidlparser.h
+libgirepository_parser_la_CFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
+
+g_idl_compiler_SOURCES = compiler.c	
+g_idl_compiler_CFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
+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_LDADD = $(GIREPO_LIBS) $(top_builddir)/girepository/libgirepository.la
+
+g_idl_scanner_SOURCES =				\
+	scanner.c				\
+	scanner.h				\
+	scannerlexer.l				\
+	scannerparser.y				\
+	gidlwriter.c				\
+	gidlwriter.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

Copied: trunk/tools/compiler.c (from r103, /trunk/src/compiler.c)
==============================================================================

Copied: trunk/tools/g-idl-offsets.pl (from r103, /trunk/src/g-idl-offsets.pl)
==============================================================================

Copied: trunk/tools/generate.c (from r103, /trunk/src/generate.c)
==============================================================================

Copied: trunk/tools/gidlmodule.c (from r103, /trunk/src/gidlmodule.c)
==============================================================================

Copied: trunk/tools/gidlmodule.h (from r103, /trunk/src/gidlmodule.h)
==============================================================================

Copied: trunk/tools/gidlnode.c (from r103, /trunk/src/gidlnode.c)
==============================================================================

Copied: trunk/tools/gidlnode.h (from r103, /trunk/src/gidlnode.h)
==============================================================================

Copied: trunk/tools/gidlparser.c (from r103, /trunk/src/gidlparser.c)
==============================================================================

Copied: trunk/tools/gidlparser.h (from r103, /trunk/src/gidlparser.h)
==============================================================================

Copied: trunk/tools/gidlwriter.c (from r103, /trunk/src/gidlwriter.c)
==============================================================================

Copied: trunk/tools/gidlwriter.h (from r103, /trunk/src/gidlwriter.h)
==============================================================================

Copied: trunk/tools/scanner.c (from r103, /trunk/src/scanner.c)
==============================================================================

Copied: trunk/tools/scanner.h (from r103, /trunk/src/scanner.h)
==============================================================================

Copied: trunk/tools/scannerlexer.l (from r103, /trunk/src/scannerlexer.l)
==============================================================================

Copied: trunk/tools/scannerparser.y (from r103, /trunk/src/scannerparser.y)
==============================================================================
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]