gir_ffi 0.0.6 → 0.0.7

data/test/i_object_info_test.rb

@@ -6,8 +6,8 @@ module GirFFI
 
       setup do
 	gir = IRepository.default
-	gir.require 'Everything', nil
-	@info = gir.find_by_name 'Everything', 'TestObj'
+	gir.require 'Regress', nil
+	@info = gir.find_by_name 'Regress', 'TestObj'
       end
 
       should "find a vfunc by name" do

data/test/i_repository_test.rb

@@ -30,13 +30,13 @@ module GirFFI
 
       should "allow version to be nil" do
 	assert_nothing_raised do
-	  IRepository.default.require 'Everything', nil
+	  IRepository.default.require 'GObject', nil
 	end
       end
 
       should "allow version to be left out" do
 	assert_nothing_raised do
-	  IRepository.default.require 'Everything'
+	  IRepository.default.require 'GObject'
 	end
       end
     end

data/test/lib/Makefile.am

@@ -0,0 +1,30 @@
+ACLOCAL_AMFLAGS = -I m4
+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
+
+testlibdir = $(prefix)/unused
+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)
+
+# 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 \
+	--warn-all --warn-error \
+	--library=libregress.la \
+	--libtool="$(top_builddir)/libtool" \
+	--output $@ \
+	$(libregress_la_SOURCES)
+Regress-1.0.typelib: Regress-1.0.gir Makefile
+	$(AM_V_GEN) g-ir-compiler $< -o $@
+
+.la.so:
+	test -L $@ || $(LN_S) .libs/$@ $@
+
+all: $(testlib_LTLIBRARIES:.la=.so) Regress-1.0.typelib

data/test/lib/autogen.sh

@@ -0,0 +1,87 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+PROJECT=GirFFITest
+
+if test ! -f configure.ac ; then
+    echo "You must run this script in the top-level $PROJECT directory"
+    exit 1
+fi
+
+DIE=0
+
+have_libtool=false
+if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
+    libtool_version=`libtoolize --version |
+             head -1 |
+             sed -e 's/^\(.*\)([^)]*)\(.*\)$/\1\2/g' \
+                 -e 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+    case $libtool_version in
+        2.2*)
+        have_libtool=true
+        ;;
+        2.4*)
+        have_libtool=true
+        ;;
+    esac
+fi
+if $have_libtool ; then : ; else
+    echo
+    echo "You must have libtool >= 2.2 installed to compile $PROJECT."
+    echo "Install the appropriate package for your distribution,"
+    echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
+    DIE=1
+fi
+
+if autoconf --version < /dev/null > /dev/null 2>&1 ; then : ; else
+    echo
+    echo "You must have autoconf installed to compile $PROJECT."
+    echo "Install the appropriate package for your distribution,"
+    echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
+    DIE=1
+fi
+
+if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then
+    AUTOMAKE=automake-1.11
+    ACLOCAL=aclocal-1.11
+else if automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then
+    AUTOMAKE=automake-1.10
+    ACLOCAL=aclocal-1.10
+else
+    echo
+    echo "You must have automake 1.10.x or 1.11.x installed to compile $PROJECT."
+    echo "Install the appropriate package for your distribution,"
+    echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
+    DIE=1
+fi
+fi
+
+if test "$DIE" -eq 1; then
+    exit 1
+fi
+
+
+libtoolize --force || exit $?
+
+$ACLOCAL -I m4 || exit $?
+
+autoconf || exit $?
+
+$AUTOMAKE --add-missing || exit $?
+
+# NOCONFIGURE is used by gnome-common; support both
+if ! test -z "$AUTOGEN_SUBDIR_MODE"; then
+    NOCONFIGURE=1
+fi
+
+if test -z "$NOCONFIGURE"; then
+    if test -z "$*"; then
+        echo "I am going to run ./configure with no arguments - if you wish "
+        echo "to pass any to it, please specify them on the $0 command line."
+    fi
+
+    ./configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
+
+    echo
+    echo "Now type 'make' to compile $PROJECT."
+fi

data/test/lib/configure.ac

@@ -0,0 +1,30 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.59)
+AC_INIT(dummy_test_lib, 0.0.1)
+AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE([1.7 foreign])
+AM_MAINTAINER_MODE
+
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)
+
+# Checks for programs.
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_PROG_LIBTOOL
+PKG_PROG_PKG_CONFIG
+
+if test "$GCC" = "yes"; then
+  JH_ADD_CFLAG([-Wall])
+  JH_ADD_CFLAG([-fno-strict-aliasing])
+fi
+
+PKG_CHECK_MODULES(GIO, [gio-2.0])
+PKG_CHECK_MODULES(CAIRO, [cairo])
+
+GI_DATADIR=$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0)
+AC_SUBST(GI_DATADIR)
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT

data/test/lib/m4/jhflags.m4

@@ -0,0 +1,21 @@
+dnl
+dnl JH_ADD_CFLAG(FLAG)
+dnl checks whether the C compiler supports the given flag, and if so, adds
+dnl it to $CFLAGS.  If the flag is already present in the list, then the
+dnl check is not performed.
+AC_DEFUN([JH_ADD_CFLAG],
+[
+case " $CFLAGS " in
+*@<:@\	\ @:>@$1@<:@\	\ @:>@*)
+  ;;
+*)
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS $1"
+  AC_MSG_CHECKING([whether [$]CC understands $1])
+  AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])
+  AC_MSG_RESULT($jh_has_option)
+  if test $jh_has_option = no; then
+    CFLAGS="$save_CFLAGS"
+  fi
+  ;;
+esac])

data/test/module_builder_test.rb

@@ -1,10 +1,10 @@
 require File.expand_path('test_helper.rb', File.dirname(__FILE__))
 
 class ModuleBuilderTest < Test::Unit::TestCase
-  context "The ModuleBuilder" do
+  context "The Builder::Module object" do
     context "for Gtk" do
       setup do
-	@mbuilder = GirFFI::ModuleBuilder.new('Gtk')
+	@mbuilder = GirFFI::Builder::Module.new('Gtk')
       end
 
       context "looking at Gtk.main" do
@@ -24,27 +24,27 @@ class ModuleBuilderTest < Test::Unit::TestCase
 	  @go = get_function_introspection_data 'Gtk', 'init'
 	end
 
-	should "delegate definition to FunctionDefinitionBuilder" do
+	should "delegate definition to Builder::Function" do
 	  code = @mbuilder.send :function_definition, @go, Lib
-	  expected = GirFFI::FunctionDefinitionBuilder.new(@go, Lib).generate
+	  expected = GirFFI::Builder::Function.new(@go, Lib).generate
 	  assert_equal cws(expected), cws(code)
 	end
       end
     end
 
-    context "for GObject" do
+    context "for Regress" do
       setup do
-	@mbuilder = GirFFI::ModuleBuilder.new('GObject')
+	@mbuilder = GirFFI::Builder::Module.new('Regress')
       end
 
-      context "looking at GObject.signal_connect_data" do
+      context "looking at Regress.test_callback_destroy_notify" do
 	setup do
-	  @go = get_function_introspection_data 'GObject', 'signal_connect_data'
+	  @go = get_function_introspection_data 'Regress', 'test_callback_destroy_notify'
 	end
 
-	should "delegate definition to FunctionDefinitionBuilder" do
+	should "delegate definition to Builder::Function" do
 	  code = @mbuilder.send :function_definition, @go, Lib
-	  expected = GirFFI::FunctionDefinitionBuilder.new(@go, Lib).generate
+	  expected = GirFFI::Builder::Function.new(@go, Lib).generate
 	  assert_equal cws(expected), cws(code)
 	end
       end

data/test/test_helper.rb

@@ -12,21 +12,25 @@ if RUBY_PLATFORM == 'java'
 end
 
 # Since the tests will call Gtk+ functions, Gtk+ must be initialized.
-module DummyGtk
-  module Lib
-    extend FFI::Library
+GirFFI.setup :Gtk
+Gtk.init
 
-    ffi_lib "gtk-x11-2.0"
-    attach_function :gtk_init, [:pointer, :pointer], :void
-  end
+GirFFI::IRepository.prepend_search_path File.join(File.dirname(__FILE__), 'lib')
+module GirFFI
+  class IRepository
+    def shared_library_with_regress namespace
+      if namespace == "Regress"
+	return File.join(File.dirname(__FILE__), 'lib', 'libregress.so')
+      else
+	return shared_library_without_regress namespace
+      end
+    end
 
-  def self.init
-    Lib.gtk_init nil, nil
+    alias shared_library_without_regress shared_library
+    alias shared_library shared_library_with_regress
   end
 end
 
-DummyGtk.init
-
 # Need a dummy module for some tests.
 module Lib
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gir_ffi
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Matijs van Zuijlen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 +01:00
+date: 2011-04-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,6 +87,10 @@ files:
 - lib/gir_ffi/g_error.rb
 - lib/gir_ffi/i_object_info.rb
 - lib/gir_ffi/builder.rb
+- lib/gir_ffi/builder/module.rb
+- lib/gir_ffi/builder/function.rb
+- lib/gir_ffi/builder/class.rb
+- lib/gir_ffi/builder/argument.rb
 - lib/gir_ffi/i_enum_info.rb
 - lib/gir_ffi/i_value_info.rb
 - lib/gir_ffi/module_base.rb
@@ -101,34 +105,35 @@ files:
 - lib/gir_ffi/class_base.rb
 - lib/gir_ffi/i_struct_info.rb
 - lib/gir_ffi/i_callable_info.rb
-- lib/gir_ffi/function_definition_builder.rb
 - lib/gir_ffi/i_function_info.rb
 - lib/gir_ffi/i_error_domain_info.rb
 - lib/gir_ffi/version.rb
+- lib/gir_ffi/overrides/glib.rb
 - lib/gir_ffi/overrides/gtk.rb
 - lib/gir_ffi/overrides/gobject.rb
 - lib/gir_ffi/allocation_helper.rb
 - lib/gir_ffi/i_base_info.rb
-- lib/gir_ffi/module_builder.rb
 - lib/gir_ffi/arg_helper.rb
-- lib/gir_ffi/argument_builder.rb
 - lib/gir_ffi/g_object.rb
 - lib/gir_ffi/i_union_info.rb
-- lib/gir_ffi/class_builder.rb
 - lib/gir_ffi/i_interface_info.rb
 - lib/gir_ffi/i_arg_info.rb
 - lib/gir_ffi/i_type_info.rb
 - test/i_repository_test.rb
+- test/generated_regress_test.rb
 - test/function_definition_builder_test.rb
 - test/g_object_test.rb
 - test/arg_helper_test.rb
+- test/lib/Makefile.am
+- test/lib/autogen.sh
+- test/lib/configure.ac
+- test/lib/m4/jhflags.m4
 - test/class_base_test.rb
 - test/test_helper.rb
 - test/class_builder_test.rb
 - test/girffi_test.rb
 - test/module_builder_test.rb
 - test/i_object_info_test.rb
-- test/generated_everything_test.rb
 - test/g_object_overrides_test.rb
 - test/generated_gtk_test.rb
 - test/builder_test.rb
@@ -138,6 +143,7 @@ files:
 - tasks/setup.rb
 - tasks/notes.rake
 - examples/demo_ffi_safe_inherited_layout.rb
+- examples/04_webkit.rb
 - examples/demo_ffi_nested_struct.rb
 - examples/demo_ffi_inherited_layout.rb
 - examples/hard_coded.rb
@@ -180,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby-FFI-based binding of the GObject Introspection Repository
@@ -192,12 +198,16 @@ test_files:
 - test/function_definition_builder_test.rb
 - test/g_object_overrides_test.rb
 - test/g_object_test.rb
-- test/generated_everything_test.rb
 - test/generated_gio_test.rb
 - test/generated_gtk_test.rb
+- test/generated_regress_test.rb
 - test/girffi_test.rb
 - test/gtk_overrides_test.rb
 - test/i_object_info_test.rb
 - test/i_repository_test.rb
+- test/lib/Makefile.am
+- test/lib/autogen.sh
+- test/lib/configure.ac
+- test/lib/m4/jhflags.m4
 - test/module_builder_test.rb
 - test/test_helper.rb