diff options
| author | Colin Walters <walters@verbum.org> | 2010-07-07 14:07:17 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-07-09 14:15:52 -0400 |
| commit | 5cb925b20739c04e18e94a03a3e4e68041894b03 (patch) | |
| tree | 246f895c0a92ab1afd341170e45908104964ece3 /tests/scanner/Makefile.am | |
| parent | 07a36b499a7db6c65132511dc43f6acd281100ec (diff) | |
| download | gobject-introspection-5cb925b20739c04e18e94a03a3e4e68041894b03.tar.gz | |
Don't include machine-dependent integral types in the typelib
Previously we had both e.g. GI_TYPE_TAG_LONG and GI_TYPE_TAG_INT64,
but in fact the typelib is already machine-specific, so it makes sense
to just encode this as a fixed type. The .gir remains abstract.
We also remove size_t from the typelib; one would never want to treat
it differently than an integer.
time_t is removed as well; while bindings like gjs had special handling
to turn it into e.g. a JS Date object, I don't think we should encourage
people to use these POSIX types in their API. Use GTimeVal or the like
instead.
Because the typelib is now really machine-specific, we need to remove
the -expected.tgirs from git. (We could potentially add a check
which wasn't just a literal diff later)
https://bugzilla.gnome.org/show_bug.cgi?id=623774
Diffstat (limited to 'tests/scanner/Makefile.am')
| -rw-r--r-- | tests/scanner/Makefile.am | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index 522f8a56..42a7f720 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -29,18 +29,15 @@ if OS_WIN32 AM_LDFLAGS += -no-undefined endif -# .gir --[scanner]-> .typelib --[generate]-> .tgir +# .gir --[scanner]-> .typelib GIRS = TYPELIBS = $(GIRS:.gir=.typelib) CHECKGIRS = $(GIRS:.gir=.gir.check) EXPECTEDGIRS = $(GIRS:.gir=-expected.gir) -TGIRS = $(GIRS:.gir=.tgir) -CHECKTGIRS = $(GIRS:.gir=.tgir.check) -EXPECTEDTGIRS = $(GIRS:.gir=-expected.tgir) INTROSPECTION_GIRS = $(GIRS) CLEANFILES = $(TYPELIBS) $(GIRS) -BUILT_SOURCES = $(TYPELIBS) $(GIRS) $(TGIRS) -EXTRA_DIST = $(EXPECTEDGIRS) $(EXPECTEDTGIRS) +BUILT_SOURCES = $(TYPELIBS) $(GIRS) +EXTRA_DIST = $(EXPECTEDGIRS) annotation-1.0.gir: utility-1.0.gir libannotation.la annotation_1_0_gir_PACKAGES = gobject-2.0 @@ -110,28 +107,7 @@ post-check: %.gir.check: %.gir @diff -u -U 10 $(srcdir)/$*-expected.gir $*.gir && echo " TEST $*.gir" -# stop %.typelib rule from building %-expected.tgir (via %-expected.typelib) -%-expected.typelib: - @true - -%.tgir: %.typelib $(top_builddir)/tools/g-ir-generate$(EXEEXT) Makefile - $(AM_V_GEN) $(top_builddir)/tools/g-ir-generate --includedir=. --includedir=$(top_builddir)/gir $< -o $@ - -%.tgir.check: %.tgir - @diff -u -U 10 $(srcdir)/$*-expected.tgir $*.tgir; \ - if test "$$?" = "0"; then \ - echo " TEST $*.tgir"; \ - rm -f $*.tgir; \ - else \ - exit 1; \ - fi - -distclean-local: - @if test "$(top_builddir)" != "$(top_srcdir)"; then \ - rm -f $(top_builddir)/tests/scanner/*.tgir; \ - fi - check-local: pre-check -check-local: $(CHECKGIRS) $(CHECKTGIRS) $(TYPELIBS) +check-local: $(CHECKGIRS) $(TYPELIBS) check-local: post-check |