gir_ffi 0.8.3 → 0.8.4

data/test/integration/generated_warnlib_test.rb

@@ -0,0 +1,47 @@
+require 'gir_ffi_test_helper'
+
+describe 'The generated WarnLib module' do
+  before do
+    begin
+      GirFFI.setup :WarnLib
+    rescue
+      skip 'WarnLib GIR not available'
+    end
+  end
+
+  describe 'WarnLib::Whatever' do
+    let(:derived_klass) do
+      Object.const_set("DerivedClass#{Sequence.next}", Class.new(GObject::Object))
+    end
+
+    before do
+      @result = nil
+      derived_klass.class_eval { include WarnLib::Whatever }
+      GirFFI.define_type derived_klass do |info|
+        info.install_vfunc_implementation :do_boo, proc { |obj, x, y| @result = "boo#{x}" }
+        info.install_vfunc_implementation :do_moo, proc { |obj, x, y| @result = "moo#{x}" }
+      end
+    end
+
+    let(:instance) { derived_klass.new }
+
+    it 'has a working method #do_boo' do
+      instance.do_boo 42, nil
+      @result.must_equal 'boo42'
+    end
+
+    it 'has a working method #do_moo' do
+      instance.do_moo 23, nil
+      @result.must_equal 'moo23'
+    end
+  end
+
+  it 'has a working function #throw_unpaired' do
+    proc { WarnLib.throw_unpaired }.must_raise GirFFI::GLibError
+  end
+
+  it 'has a working function #unpaired_error_quark' do
+    result = WarnLib.unpaired_error_quark
+    GLib.quark_to_string(result).must_equal 'warnlib-unpaired-error'
+  end
+end

data/test/introspection_test_helper.rb

@@ -3,6 +3,8 @@ require 'base_test_helper'
 require 'ffi-gobject_introspection'
 
 module IntrospectionTestExtensions
+  module_function
+
   def get_introspection_data(namespace, name)
     gir = GObjectIntrospection::IRepository.default
     gir.require namespace, nil

data/test/lib/Makefile.am

@@ -3,32 +3,58 @@ AUTOMAKE_OPTIONS = 1.7
 
 # We need to build a shared library, which can be dlopened
 # it does not work with noinst_LTLIBRARIES
-testlib_LTLIBRARIES = libregress.la libgimarshallingtests.la
+testlib_LTLIBRARIES = \
+	libeverything.la \
+	libgimarshallingtests.la libregress.la libutility.la libwarnlib.la
 
 testlibdir = $(prefix)/unused
+GI_TESTDIR = $(GI_DATADIR)/tests
 install-testlibLTLIBRARIES: # prevent it from being installed
 
-libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h
-libregress_la_CFLAGS = $(GIO_CFLAGS) $(CAIRO_CFLAGS)
-libregress_la_LDFLAGS = -module -avoid-version $(GIO_LIBS) $(CAIRO_LIBS)
+libeverything_la_SOURCES = $(GI_DATADIR)/tests/everything.c $(GI_DATADIR)/tests/everything.h
+libeverything_la_CFLAGS = $(GLIB_CFLAGS)
+libeverything_la_LDFLAGS = -module -avoid-version
 
 libgimarshallingtests_la_SOURCES = $(GI_DATADIR)/tests/gimarshallingtests.c $(GI_DATADIR)/tests/gimarshallingtests.h
 libgimarshallingtests_la_CFLAGS = $(GIO_CFLAGS)
 libgimarshallingtests_la_LDFLAGS = -module -avoid-version
 
-# g-i doesn't ship these as shared libraries anymore; we build them here
-Regress-1.0.gir: libregress.la Makefile
-	$(AM_V_GEN) g-ir-scanner --include=cairo-1.0 --include=Gio-2.0 \
-	--namespace=Regress --nsversion=1.0 --pkg=cairo-gobject \
+libregress_la_SOURCES = $(GI_TESTDIR)/regress.c $(GI_TESTDIR)/regress.h
+
+if HAVE_EXTRA_TEST_FILES
+libregress_la_SOURCES += \
+	$(GI_TESTDIR)/annotation.c $(GI_TESTDIR)/annotation.h \
+	$(GI_TESTDIR)/foo.c $(GI_TESTDIR)/foo.h \
+	$(GI_TESTDIR)/drawable.c $(GI_TESTDIR)/drawable.h
+endif
+
+libregress_la_CFLAGS = $(GIO_CFLAGS) $(CAIRO_CFLAGS)
+libregress_la_LDFLAGS = -module -avoid-version $(GIO_LIBS) $(CAIRO_LIBS)
+
+if HAVE_EXTRA_TEST_FILES
+libutility_la_SOURCES = $(GI_DATADIR)/tests/utility.c $(GI_DATADIR)/tests/utility.h \
+			$(GI_DATADIR)/tests/gitestmacros.h
+libutility_la_CFLAGS = $(GLIB_CFLAGS)
+libutility_la_LDFLAGS = -module -avoid-version
+
+libwarnlib_la_SOURCES = $(GI_DATADIR)/tests/warnlib.c $(GI_DATADIR)/tests/warnlib.h \
+			$(GI_DATADIR)/tests/gitestmacros.h
+libwarnlib_la_CFLAGS = $(GIO_CFLAGS)
+libwarnlib_la_LDFLAGS = -module -avoid-version
+endif
+
+GIRS = Everything-1.0.gir GIMarshallingTests-1.0.gir Regress-1.0.gir
+
+Everything-1.0.gir: libeverything.la
+	$(AM_V_GEN) g-ir-scanner --include=GLib-2.0 \
+	--namespace=$(@:-1.0.gir=) --nsversion=1.0 \
 	--warn-all --warn-error \
-	--library=libregress.la \
-	--libtool="$(top_builddir)/libtool" \
-	--output $@ \
-	$(libregress_la_SOURCES)
-Regress-1.0.typelib: Regress-1.0.gir Makefile
+	--library=$< --libtool="$(top_builddir)/libtool" \
+	--output $@ $(libeverything_la_SOURCES)
+Everything-1.0.typelib: Everything-1.0.gir
 	$(AM_V_GEN) g-ir-compiler $< -o $@
 
-GIMarshallingTests-1.0.gir: libgimarshallingtests.la Makefile
+GIMarshallingTests-1.0.gir: libgimarshallingtests.la
 	$(AM_V_GEN) g-ir-scanner --include=Gio-2.0 \
 	--namespace=GIMarshallingTests --nsversion=1.0 \
 	--symbol-prefix=gi_marshalling_tests \
@@ -37,10 +63,50 @@ GIMarshallingTests-1.0.gir: libgimarshallingtests.la Makefile
 	--libtool="$(top_builddir)/libtool" \
 	--output $@ \
 	$(libgimarshallingtests_la_SOURCES)
-GIMarshallingTests-1.0.typelib: GIMarshallingTests-1.0.gir Makefile
+GIMarshallingTests-1.0.typelib: GIMarshallingTests-1.0.gir
+	$(AM_V_GEN) g-ir-compiler $< -o $@
+
+regress_SCANNER_INCLUDES= --include=cairo-1.0 --include=Gio-2.0
+
+Regress-1.0.gir: libregress.la
+	$(AM_V_GEN) g-ir-scanner $(regress_SCANNER_INCLUDES) \
+	--namespace=Regress --nsversion=1.0 --pkg=cairo-gobject \
+	--warn-all --warn-error \
+	--library=libregress.la \
+	--libtool="$(top_builddir)/libtool" \
+	--output $@ \
+	$(libregress_la_SOURCES)
+Regress-1.0.typelib: Regress-1.0.gir
+	$(AM_V_GEN) g-ir-compiler --includedir=. $< -o $@
+
+if HAVE_EXTRA_TEST_FILES
+
+GIRS += Utility-1.0.gir WarnLib-1.0.gir
+Regress-1.0.gir: Utility-1.0.gir
+regress_SCANNER_INCLUDES += --include-uninstalled=Utility-1.0.gir
+
+Utility-1.0.gir: libutility.la
+	$(AM_V_GEN) g-ir-scanner --include=GLib-2.0 \
+	--namespace=$(@:-1.0.gir=) --nsversion=1.0 \
+	--warn-all --warn-error \
+	--library=$< --libtool="$(top_builddir)/libtool" \
+	--output $@ $(libutility_la_SOURCES)
+Utility-1.0.typelib: Utility-1.0.gir
 	$(AM_V_GEN) g-ir-compiler $< -o $@
 
+WarnLib-1.0.gir: libwarnlib.la
+	$(AM_V_GEN) g-ir-scanner --include=Gio-2.0 \
+	--namespace=$(@:-1.0.gir=) --nsversion=1.0 \
+	--symbol-prefix=warnlib \
+	--warn-all \
+	--library=$< --libtool="$(top_builddir)/libtool" \
+	--output $@ $(libwarnlib_la_SOURCES)
+WarnLib-1.0.typelib: WarnLib-1.0.gir
+	$(AM_V_GEN) g-ir-compiler $< -o $@
+
+endif
+
 .la.so:
 	test -L $@ || $(LN_S) .libs/$@ $@
 
-all: $(testlib_LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.typelib
+all: $(testlib_LTLIBRARIES:.la=.so) $(GIRS:.gir=.typelib)

data/test/lib/configure.ac

@@ -22,10 +22,13 @@ if test "$GCC" = "yes"; then
 fi
 
 PKG_CHECK_MODULES(GIO, [gio-2.0])
+PKG_CHECK_MODULES(GLIB, [glib-2.0])
 PKG_CHECK_MODULES(CAIRO, [cairo])
 
 GI_DATADIR=$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0)
 AC_SUBST(GI_DATADIR)
+AC_CHECK_FILE($GI_DATADIR/tests/annotation.c, have_annotation=true, have_annotation=false)
+AM_CONDITIONAL(HAVE_EXTRA_TEST_FILES, test x$have_annotation = xtrue)
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -347,14 +347,17 @@ files:
 - test/gir_ffi_test.rb
 - test/gir_ffi_test_helper.rb
 - test/integration/derived_classes_test.rb
+- test/integration/generated_everything_test.rb
 - test/integration/generated_gimarshallingtests_test.rb
 - test/integration/generated_gio_test.rb
 - test/integration/generated_glib_test.rb
 - test/integration/generated_gobject_test.rb
+- test/integration/generated_gtop_test.rb
 - test/integration/generated_pango_ft2_test.rb
 - test/integration/generated_pango_test.rb
 - test/integration/generated_regress_test.rb
 - test/integration/generated_secret_test.rb
+- test/integration/generated_warnlib_test.rb
 - test/integration/method_lookup_test.rb
 - test/introspection_test_helper.rb
 - test/lib/Makefile.am