gobject-introspection r727 - trunk/tests/scanner
- From: walters svn gnome org
- To: svn-commits-list gnome org
- Subject: gobject-introspection r727 - trunk/tests/scanner
- Date: Thu, 16 Oct 2008 15:00:21 +0000 (UTC)
Author: walters
Date: Thu Oct 16 15:00:21 2008
New Revision: 727
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=727&view=rev
Log:
Don't use --typelib-xml, use g-ir-generate
Modified:
trunk/tests/scanner/Makefile.am
Modified: trunk/tests/scanner/Makefile.am
==============================================================================
--- trunk/tests/scanner/Makefile.am (original)
+++ trunk/tests/scanner/Makefile.am Thu Oct 16 15:00:21 2008
@@ -27,11 +27,10 @@
$(top_srcdir)/giscanner/*.py \
$(top_builddir)/giscanner/libgiscanner.la
TYPELIBS = $(GIRS:.gir=.typelib)
-TXMLS = $(GIRS:.gir=.gir.txml)
CHECKGIRS = $(GIRS:.gir=.gir.check)
EXPECTEDGIRS = $(GIRS:.gir=-expected.gir)
-CLEANFILES = $(TYPELIBS) $(TXMLS) $(GIRS)
-BUILT_SOURCES = $(TYPELIBS) $(TXMLS) $(GIRS)
+CLEANFILES = $(TYPELIBS) $(GIRS)
+BUILT_SOURCES = $(TYPELIBS) $(GIRS)
EXTRA_DIST = $(EXPECTEDGIRS)
annotation-1.0.gir: libannotation.la annotation.c annotation.h utility-1.0.gir $(SCANNER) $(SCANNER_LIBS) Makefile
@@ -104,8 +103,13 @@
%.typelib: %.gir $(top_builddir)/tools/g-ir-compiler$(EXEEXT) Makefile
$(top_builddir)/tools/g-ir-compiler --includedir=. --includedir=$(top_builddir)/gir $< -o $@
- $(SCANNER) --typelib-xml $< > $<.tmp && mv $<.tmp $<.txml
check-local: pre-check
check-local: $(CHECKGIRS) $(TYPELIBS)
+ @for x in $(TYPELIBS); do \
+ echo 1>&2 "$(DEBUG) $(top_builddir)/tools/g-ir-generate --includedir=. $${x} > $${x}.tmp && mv $${x}.tmp $${x}.xml;"; \
+ $(DEBUG) $(top_builddir)/tools/g-ir-generate --includedir=. $${x} > $${x}.tmp && mv $${x}.tmp $${x}.xml; \
+ done
+CLEANFILES += $(TYPELIBS:.typelib:.typelib.xml)
+
check-local: post-check
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]