rice 2.1.0 → 3.0.0

data/sample/callbacks/test.rb

@@ -0,0 +1,28 @@
+require 'sample_callbacks'
+
+def hello(message)
+  "Hello #{message}"
+end
+
+cb1 = CallbackHolder.new
+cb2 = CallbackHolder.new
+cb3 = CallbackHolder.new
+
+cb1.register_callback(lambda do |param|
+  "Callback 1 got param #{param}"
+end)
+
+cb2.register_callback(lambda do |param|
+  "Callback 2 got param #{param}"
+end)
+
+cb3.register_callback method(:hello)
+
+puts "Calling Callback 1"
+puts cb1.fire_callback("Hello")
+
+puts "Calling Callback 2"
+puts cb2.fire_callback("World")
+
+puts "Calling Callback 3"
+puts cb3.fire_callback("Ruby")

data/test/Makefile.am

@@ -30,6 +30,7 @@ run_multiple_extensions_same_class_test:
 
 
 unittest_SOURCES = \
+	embed_ruby.cpp \
 	unittest.cpp \
 	test_Address_Registration_Guard.cpp \
 	test_Array.cpp \

data/test/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -92,7 +92,7 @@ noinst_PROGRAMS = unittest$(EXEEXT)
 TESTS = unittest$(EXEEXT)
 subdir = test
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/check_stdcxx_11.ac \
+am__aclocal_m4_deps = $(top_srcdir)/ax_cxx_compile_stdcxx.m4 \
 	$(top_srcdir)/ruby.ac $(top_srcdir)/doxygen.ac \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -103,7 +103,7 @@ CONFIG_HEADER = $(top_builddir)/rice/config.hpp
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
-am_unittest_OBJECTS = unittest.$(OBJEXT) \
+am_unittest_OBJECTS = embed_ruby.$(OBJEXT) unittest.$(OBJEXT) \
 	test_Address_Registration_Guard.$(OBJEXT) test_Array.$(OBJEXT) \
 	test_Builtin_Object.$(OBJEXT) test_Class.$(OBJEXT) \
 	test_Constructor.$(OBJEXT) test_Data_Object.$(OBJEXT) \
@@ -131,7 +131,20 @@ am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/rice
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/embed_ruby.Po \
+	./$(DEPDIR)/test_Address_Registration_Guard.Po \
+	./$(DEPDIR)/test_Array.Po ./$(DEPDIR)/test_Builtin_Object.Po \
+	./$(DEPDIR)/test_Class.Po ./$(DEPDIR)/test_Constructor.Po \
+	./$(DEPDIR)/test_Data_Object.Po ./$(DEPDIR)/test_Data_Type.Po \
+	./$(DEPDIR)/test_Director.Po ./$(DEPDIR)/test_Enum.Po \
+	./$(DEPDIR)/test_Exception.Po ./$(DEPDIR)/test_Hash.Po \
+	./$(DEPDIR)/test_Identifier.Po ./$(DEPDIR)/test_Jump_Tag.Po \
+	./$(DEPDIR)/test_Memory_Management.Po \
+	./$(DEPDIR)/test_Module.Po ./$(DEPDIR)/test_Object.Po \
+	./$(DEPDIR)/test_String.Po ./$(DEPDIR)/test_Struct.Po \
+	./$(DEPDIR)/test_Symbol.Po ./$(DEPDIR)/test_To_From_Ruby.Po \
+	./$(DEPDIR)/test_global_functions.Po ./$(DEPDIR)/unittest.Po
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -168,7 +181,7 @@ am__recursive_targets = \
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	check recheck distdir
+	check recheck distdir distdir-am
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -370,6 +383,7 @@ am__set_TESTS_bases = \
   bases='$(TEST_LOGS)'; \
   bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
   bases=`echo $$bases`
+AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
 RECHECK_LOGS = $(TEST_LOGS)
 TEST_SUITE_LOG = test-suite.log
 TEST_EXTENSIONS = @EXEEXT@ .test
@@ -462,7 +476,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EXEEXT = @EXEEXT@
-HAVE_CXX11 = @HAVE_CXX11@
+HAVE_CXX14 = @HAVE_CXX14@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -559,6 +573,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = ext
 unittest_SOURCES = \
+	embed_ruby.cpp \
 	unittest.cpp \
 	test_Address_Registration_Guard.cpp \
 	test_Array.cpp \
@@ -614,8 +629,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -640,28 +655,35 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Address_Registration_Guard.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Array.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Builtin_Object.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Class.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Constructor.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Data_Object.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Data_Type.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Director.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Enum.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Exception.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Hash.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Identifier.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Jump_Tag.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Memory_Management.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Module.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Object.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_String.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Struct.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Symbol.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_To_From_Ruby.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_global_functions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unittest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/embed_ruby.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Address_Registration_Guard.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Array.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Builtin_Object.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Class.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Constructor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Data_Object.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Data_Type.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Director.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Enum.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Exception.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Hash.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Identifier.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Jump_Tag.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Memory_Management.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Module.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Object.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_String.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Struct.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Symbol.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_To_From_Ruby.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_global_functions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unittest.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -885,7 +907,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
 	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
 	fi;								\
 	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}";	\
 	echo "$${col}$$br$${std}"; 					\
 	create_testsuite_report --maybe-color;				\
 	echo "$$col$$br$$std";						\
@@ -898,7 +920,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
 	fi;								\
 	$$success || exit 1
 
-check-TESTS:
+check-TESTS: 
 	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
 	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -941,7 +963,10 @@ unittest.log: unittest$(EXEEXT)
 @am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
 @am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -1040,7 +1065,29 @@ clean: clean-recursive
 clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-recursive
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/embed_ruby.Po
+	-rm -f ./$(DEPDIR)/test_Address_Registration_Guard.Po
+	-rm -f ./$(DEPDIR)/test_Array.Po
+	-rm -f ./$(DEPDIR)/test_Builtin_Object.Po
+	-rm -f ./$(DEPDIR)/test_Class.Po
+	-rm -f ./$(DEPDIR)/test_Constructor.Po
+	-rm -f ./$(DEPDIR)/test_Data_Object.Po
+	-rm -f ./$(DEPDIR)/test_Data_Type.Po
+	-rm -f ./$(DEPDIR)/test_Director.Po
+	-rm -f ./$(DEPDIR)/test_Enum.Po
+	-rm -f ./$(DEPDIR)/test_Exception.Po
+	-rm -f ./$(DEPDIR)/test_Hash.Po
+	-rm -f ./$(DEPDIR)/test_Identifier.Po
+	-rm -f ./$(DEPDIR)/test_Jump_Tag.Po
+	-rm -f ./$(DEPDIR)/test_Memory_Management.Po
+	-rm -f ./$(DEPDIR)/test_Module.Po
+	-rm -f ./$(DEPDIR)/test_Object.Po
+	-rm -f ./$(DEPDIR)/test_String.Po
+	-rm -f ./$(DEPDIR)/test_Struct.Po
+	-rm -f ./$(DEPDIR)/test_Symbol.Po
+	-rm -f ./$(DEPDIR)/test_To_From_Ruby.Po
+	-rm -f ./$(DEPDIR)/test_global_functions.Po
+	-rm -f ./$(DEPDIR)/unittest.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -1086,7 +1133,29 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/embed_ruby.Po
+	-rm -f ./$(DEPDIR)/test_Address_Registration_Guard.Po
+	-rm -f ./$(DEPDIR)/test_Array.Po
+	-rm -f ./$(DEPDIR)/test_Builtin_Object.Po
+	-rm -f ./$(DEPDIR)/test_Class.Po
+	-rm -f ./$(DEPDIR)/test_Constructor.Po
+	-rm -f ./$(DEPDIR)/test_Data_Object.Po
+	-rm -f ./$(DEPDIR)/test_Data_Type.Po
+	-rm -f ./$(DEPDIR)/test_Director.Po
+	-rm -f ./$(DEPDIR)/test_Enum.Po
+	-rm -f ./$(DEPDIR)/test_Exception.Po
+	-rm -f ./$(DEPDIR)/test_Hash.Po
+	-rm -f ./$(DEPDIR)/test_Identifier.Po
+	-rm -f ./$(DEPDIR)/test_Jump_Tag.Po
+	-rm -f ./$(DEPDIR)/test_Memory_Management.Po
+	-rm -f ./$(DEPDIR)/test_Module.Po
+	-rm -f ./$(DEPDIR)/test_Object.Po
+	-rm -f ./$(DEPDIR)/test_String.Po
+	-rm -f ./$(DEPDIR)/test_Struct.Po
+	-rm -f ./$(DEPDIR)/test_Symbol.Po
+	-rm -f ./$(DEPDIR)/test_To_From_Ruby.Po
+	-rm -f ./$(DEPDIR)/test_global_functions.Po
+	-rm -f ./$(DEPDIR)/unittest.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -1106,19 +1175,19 @@ uninstall-am:
 
 .MAKE: $(am__recursive_targets) check-am install-am install-strip
 
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
-	check-TESTS check-am clean clean-generic clean-noinstPROGRAMS \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am recheck tags tags-am \
-	uninstall uninstall-am
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--depfiles check check-TESTS check-am clean clean-generic \
+	clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	recheck tags tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 

data/test/embed_ruby.cpp

@@ -0,0 +1,21 @@
+#include <ruby.h>
+
+void embed_ruby()
+{
+  static bool initialized__ = false;
+
+  if (!initialized__)
+  {
+    int argc = 0;
+    char* argv = (char*)malloc(1);
+    argv[0] = 0;
+    char** pArgv = &argv;
+
+    ruby_sysinit(&argc, &pArgv);
+    RUBY_INIT_STACK;
+    ruby_init();
+    ruby_init_loadpath();
+
+    initialized__ = true;
+  }
+}

data/test/embed_ruby.hpp

@@ -0,0 +1,4 @@
+#ifndef Rice_embed_ruby
+#define Rice_embed_ruby
+void embed_ruby();
+#endif

data/test/ext/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -89,7 +89,7 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = test/ext
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/check_stdcxx_11.ac \
+am__aclocal_m4_deps = $(top_srcdir)/ax_cxx_compile_stdcxx.m4 \
 	$(top_srcdir)/ruby.ac $(top_srcdir)/doxygen.ac \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -163,7 +163,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EXEEXT = @EXEEXT@
-HAVE_CXX11 = @HAVE_CXX11@
+HAVE_CXX14 = @HAVE_CXX14@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -282,8 +282,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -301,7 +301,10 @@ ctags CTAGS:
 cscope cscopelist:
 
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

data/test/test_Address_Registration_Guard.cpp

@@ -1,4 +1,5 @@
 #include "unittest.hpp"
+#include "embed_ruby.hpp"
 #include "rice/Address_Registration_Guard.hpp"
 
 using namespace Rice;
@@ -7,7 +8,7 @@ TESTSUITE(Address_Registration_Guard);
 
 SETUP(Address_Registration_Guard)
 {
-  ruby_init();
+  embed_ruby();
 }
 
 TESTCASE(register_address)

data/test/test_Array.cpp

@@ -1,4 +1,5 @@
 #include "unittest.hpp"
+#include "embed_ruby.hpp"
 #include "rice/Array.hpp"
 #include "rice/String.hpp"
 #include "rice/global_function.hpp"
@@ -9,7 +10,7 @@ TESTSUITE(Array);
 
 SETUP(Array)
 {
-  ruby_init();
+  embed_ruby();
 }
 
 TESTCASE(default_construct)

data/test/test_Builtin_Object.cpp

@@ -1,4 +1,5 @@
 #include "unittest.hpp"
+#include "embed_ruby.hpp"
 #include "rice/Builtin_Object.hpp"
 #include "rice/Class.hpp"
 
@@ -8,7 +9,7 @@ TESTSUITE(Builtin_Object);
 
 SETUP(Builtin_Object)
 {
-  ruby_init();
+  embed_ruby();
 }
 
 TESTCASE(construct_with_object)

data/test/test_Class.cpp

@@ -1,4 +1,5 @@
 #include "unittest.hpp"
+#include "embed_ruby.hpp"
 #include "rice/Class.hpp"
 #include "rice/Constructor.hpp"
 #include "rice/protect.hpp"
@@ -15,7 +16,7 @@ TESTSUITE(Class);
 
 SETUP(Class)
 {
-  ruby_init();
+  embed_ruby();
 }
 
 TESTCASE(construct)
@@ -303,8 +304,10 @@ public:
   {
   }
 
-  int * begin() { return array_; }
-  int * end() { return array_ + length_; }
+  // Custom names to make sure we call the function pointers rather than
+  // expectable default names.
+  int * beginFoo() { return array_; }
+  int * endBar() { return array_ + length_; }
 
 private:
   int * array_;
@@ -325,7 +328,7 @@ TESTCASE(define_iterator)
 {
   int array[] = { 1, 2, 3 };
   Class c(anonymous_class());
-  c.define_iterator(&Container::begin, &Container::end);
+  c.define_iterator(&Container::beginFoo, &Container::endBar);
   Container * container = new Container(array, 3);
   Object wrapped_container = Data_Wrap_Struct(
       c, 0, Default_Free_Function<Container>::free, container);