rice 1.7.0 → 2.0.0

data/missing

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -160,7 +160,7 @@ give_advice ()
       ;;
    autom4te*)
       echo "You might have modified some maintainer files that require"
-      echo "the 'automa4te' program to be rebuilt."
+      echo "the 'autom4te' program to be rebuilt."
       program_details 'autom4te'
       ;;
     bison*|yacc*)

data/rice/Makefile.am

@@ -11,7 +11,6 @@ Object.cpp \
 String.cpp \
 Struct.cpp \
 Symbol.cpp \
-VM.cpp \
 Arg_operators.cpp \
 Address_Registration_Guard.cpp \
 detail/check_ruby_type.cpp \
@@ -35,8 +34,6 @@ Class.hpp \
 Class.ipp \
 Class_defn.hpp \
 Constructor.hpp \
-Critical_Guard.hpp \
-Critical_Guard.ipp \
 Data_Object.hpp \
 Data_Object.ipp \
 Data_Object_defn.hpp \
@@ -72,7 +69,6 @@ Struct.hpp \
 Struct.ipp \
 Symbol.hpp \
 Symbol.ipp \
-VM.hpp \
 global_function.hpp \
 global_function.ipp \
 protect.hpp \
@@ -111,7 +107,6 @@ detail/object_call.hpp \
 detail/object_call.ipp \
 detail/protect.hpp \
 detail/ruby.hpp \
-detail/rubysig.hpp \
 detail/st.hpp \
 detail/traits.hpp \
 detail/to_ruby.hpp \

data/rice/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,17 @@
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -80,15 +90,14 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = rice
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(srcdir)/config.hpp.in $(top_srcdir)/depcomp \
-	$(nobase_include_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/check_stdcxx_11.ac \
 	$(top_srcdir)/ruby.ac $(top_srcdir)/doxygen.ac \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(nobase_include_HEADERS) \
+	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.hpp
 CONFIG_CLEAN_FILES =
@@ -134,8 +143,8 @@ am__dirstamp = $(am__leading_dot)dirstamp
 am_librice_a_OBJECTS = Class.$(OBJEXT) Data_Type.$(OBJEXT) \
 	Director.$(OBJEXT) Exception.$(OBJEXT) Identifier.$(OBJEXT) \
 	Module.$(OBJEXT) Object.$(OBJEXT) String.$(OBJEXT) \
-	Struct.$(OBJEXT) Symbol.$(OBJEXT) VM.$(OBJEXT) \
-	Arg_operators.$(OBJEXT) Address_Registration_Guard.$(OBJEXT) \
+	Struct.$(OBJEXT) Symbol.$(OBJEXT) Arg_operators.$(OBJEXT) \
+	Address_Registration_Guard.$(OBJEXT) \
 	detail/check_ruby_type.$(OBJEXT) detail/demangle.$(OBJEXT) \
 	detail/method_data.$(OBJEXT) detail/protect.$(OBJEXT)
 librice_a_OBJECTS = $(am_librice_a_OBJECTS)
@@ -196,6 +205,8 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.hpp.in \
+	$(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -342,7 +353,6 @@ Object.cpp \
 String.cpp \
 Struct.cpp \
 Symbol.cpp \
-VM.cpp \
 Arg_operators.cpp \
 Address_Registration_Guard.cpp \
 detail/check_ruby_type.cpp \
@@ -366,8 +376,6 @@ Class.hpp \
 Class.ipp \
 Class_defn.hpp \
 Constructor.hpp \
-Critical_Guard.hpp \
-Critical_Guard.ipp \
 Data_Object.hpp \
 Data_Object.ipp \
 Data_Object_defn.hpp \
@@ -403,7 +411,6 @@ Struct.hpp \
 Struct.ipp \
 Symbol.hpp \
 Symbol.ipp \
-VM.hpp \
 global_function.hpp \
 global_function.ipp \
 protect.hpp \
@@ -442,7 +449,6 @@ detail/object_call.hpp \
 detail/object_call.ipp \
 detail/protect.hpp \
 detail/ruby.hpp \
-detail/rubysig.hpp \
 detail/st.hpp \
 detail/traits.hpp \
 detail/to_ruby.hpp \
@@ -471,7 +477,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu rice/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu rice/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -574,7 +579,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/String.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Struct.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Symbol.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VM.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@detail/$(DEPDIR)/check_ruby_type.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@detail/$(DEPDIR)/demangle.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@detail/$(DEPDIR)/method_data.Po@am__quote@
@@ -827,6 +831,8 @@ uninstall-am: uninstall-libLIBRARIES uninstall-nobase_includeHEADERS
 	tags tags-am uninstall uninstall-am uninstall-libLIBRARIES \
 	uninstall-nobase_includeHEADERS
 
+.PRECIOUS: Makefile
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

data/rice/detail/env.hpp

@@ -6,14 +6,6 @@
  * not have extern "C"
  */
 
-// TODO: Won't work on ruby 1.9
-
 #include "ruby_version_code.hpp"
 
-#if RICE__RUBY_VERSION_CODE < 190
-extern "C" {
-  #include "env.h"
-}
-#endif
-
 #endif

data/rice/detail/method_data.cpp

@@ -8,26 +8,6 @@
 #undef PACKAGE_VERSION
 #include "../config.hpp"
 
-/* 1.8.6 compatibility */
-#ifndef RCLASS_M_TBL
-#define RCLASS_M_TBL(x) (RCLASS(x)->m_tbl)
-#endif
-
-
-#ifndef RUBY_VM 
-/* pre-YARV */
-#include <node.h>
-#include "env.hpp"
-
-namespace {
-int rb_frame_method_id_and_class(ID *idp, VALUE *klassp) {
-  *klassp = ruby_frame->last_class;
-  *idp = ruby_frame->last_func;
-  return 1;
-}
-}
-#endif
-
 #define RICE_ID rb_intern("__rice__")
 
 VALUE

data/rice/detail/ruby.hpp

@@ -67,19 +67,6 @@ extern "C" typedef VALUE (*RUBY_VALUE_FUNC)(VALUE);
   #undef bind
 #endif
 
-#if RICE__RUBY_VERSION_CODE < 190
-namespace Rice
-{
-  namespace detail
-  {
-    inline VALUE rb_errinfo() { return ruby_errinfo; }
-    inline void rb_set_errinfo(VALUE exc) { ruby_errinfo = exc; }
-  } // detail
-} // Rice
-#define rb_errinfo() ::Rice::detail::rb_errinfo()
-#define rb_set_errinfo(exc) ::Rice::detail::rb_set_errinfo(exc)
-#endif
-
 #ifdef HAVE_CXX11
 #define std_unique_ptr std::unique_ptr
 #else

data/rice/detail/ruby_version_code.hpp

@@ -1,6 +1,6 @@
 #ifndef Rice__detail__ruby_version_code__hpp
 #define Rice__detail__ruby_version_code__hpp
 
-#define RICE__RUBY_VERSION_CODE 220
+#define RICE__RUBY_VERSION_CODE 223
 
 #endif // Rice__detail__ruby_version_code__hpp

data/ruby.ac

@@ -39,14 +39,9 @@ RUBY_CONFIG_LIBRUBYARG=`RUBY_CONFIG(LIBRUBYARG)`
 RUBY_CONFIG_LIBRUBYARG_STATIC=`RUBY_CONFIG(LIBRUBYARG_STATIC)`
 RUBY_CONFIG_CCDLFLAGS=`RUBY_CONFIG(CCDLFLAGS)`
 
-if test "x${RUBY_CONFIG_RUBYHDRDIR}x" != "xx"; then
-  # 1.9
-  RUBY_CPPFLAGS="-I${RUBY_CONFIG_RUBYHDRDIR}"
-  RUBY_CPPFLAGS="${RUBY_CPPFLAGS} -I${RUBY_CONFIG_RUBYHDRDIR}/${RUBY_CONFIG_ARCH}"
-else
-  # 1.8
-  RUBY_CPPFLAGS="-I${RUBY_CONFIG_ARCHDIR}"
-fi
+RUBY_CPPFLAGS="-I${RUBY_CONFIG_RUBYHDRDIR}"
+RUBY_CPPFLAGS="${RUBY_CPPFLAGS} -I${RUBY_CONFIG_RUBYHDRDIR}/${RUBY_CONFIG_ARCH}"
+
 if test "x${RUBY_CONFIG_RUBYARCHHDRDIR}x" != "xx"; then
   RUBY_CPPFLAGS="${RUBY_CPPFLAGS} -I${RUBY_CONFIG_RUBYARCHHDRDIR}"
 fi

data/ruby/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -78,13 +88,13 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = ruby
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/check_stdcxx_11.ac \
 	$(top_srcdir)/ruby.ac $(top_srcdir)/doxygen.ac \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/rice/config.hpp
 CONFIG_CLEAN_FILES =
@@ -144,6 +154,7 @@ am__define_uniq_tagged_files = \
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -319,7 +330,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ruby/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu ruby/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -607,6 +617,8 @@ uninstall-am:
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am tags tags-am uninstall uninstall-am
 
+.PRECIOUS: Makefile
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

data/ruby/lib/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -79,14 +89,13 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = ruby/lib
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(srcdir)/mkmf-rice.rb.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/check_stdcxx_11.ac \
 	$(top_srcdir)/ruby.ac $(top_srcdir)/doxygen.ac \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/rice/config.hpp
 CONFIG_CLEAN_FILES = mkmf-rice.rb
@@ -140,6 +149,7 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(rubydir)"
 DATA = $(ruby_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/mkmf-rice.rb.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -291,7 +301,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ruby/lib/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu ruby/lib/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -486,6 +495,8 @@ uninstall-am: uninstall-rubyDATA
 	pdf-am ps ps-am tags-am uninstall uninstall-am \
 	uninstall-rubyDATA
 
+.PRECIOUS: Makefile
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

data/ruby/lib/mkmf-rice.rb.in

@@ -1,9 +1,11 @@
-# Make sure that archflags does not include ppc if we're 
-# on Intel x86 processor on Mac, and that we use the proper
-# arch depending on 10.5 or 10.6
+# Make sure that archflags does not include ppc if we're
+# on Intel x86 processor on Mac, and that we use the proper arch
 if `uname`.chomp == "Darwin"
-  arch = 
-    if RUBY_PLATFORM =~ /darwin10/
+  RUBY_PLATFORM =~ /darwin(\d+)/
+  darwin_version = $1.to_i
+
+  arch =
+    if darwin_version >= 10
       'x86_64'
     else
       `uname -p`.chomp
@@ -15,7 +17,7 @@ end
 require 'mkmf'
 require 'rbconfig'
 
-# 
+#
 # A script to override some defaults in mkmf.rb for C++ code
 # compilation.
 #
@@ -31,19 +33,13 @@ def init_mkmf_rice(config = CONFIG)
   $LIBRUBYARG_STATIC = "@RUBY_LIBRUBYARG_STATIC@"
   $RICE_CPPFLAGS = "@RICE_CPPFLAGS@"
   $RICE_LDFLAGS = "@RICE_LDFLAGS@"
-  $RICE_PREFIX = "@prefix@"
+  $RICE_PREFIX = File.join(File.dirname(File.expand_path(__FILE__)))
 
   $RICE_USING_MINGW32 = @RICE_USING_MINGW32@
 
-  # Ruby < 1.8.6 does not have $DEFLIBPATH
-  $DEFLIBPATH ||= []
-
   # We use this for the samples
   $DEFLIBPATH.unshift(with_config('libpath')) if with_config('libpath')
 
-  # Ruby 1.8.6 uses $preload without setting it
-  $preload ||= nil
-
   lib_dirs = []
 
   lib_dir = "#{$RICE_PREFIX}/lib"

data/ruby/lib/version.rb

@@ -1,3 +1,3 @@
 module Rice
-  VERSION = "1.7.0"
+  VERSION = "2.0.0"
 end