rice 1.5.1 → 1.5.2
Sign up to get free protection for your applications and to get access to all the features.
- data/Doxyfile +1758 -731
- data/Makefile.am +1 -1
- data/Makefile.in +57 -24
- data/README +7 -6
- data/aclocal.m4 +153 -69
- data/configure +48 -2
- data/configure.ac +1 -1
- data/extconf.rb +1 -0
- data/rice/Arg_impl.hpp +2 -0
- data/rice/Constructor.hpp +23 -0
- data/rice/Director.hpp +1 -1
- data/rice/Exception.hpp +4 -0
- data/rice/Hash.ipp +0 -1
- data/rice/Makefile.in +79 -90
- data/rice/String.hpp +2 -0
- data/rice/to_from_ruby_defn.hpp +1 -2
- data/ruby/Makefile.in +50 -23
- data/ruby/lib/Makefile.in +44 -16
- data/ruby/lib/version.rb +1 -1
- data/sample/Makefile.in +44 -16
- data/test/Makefile.in +59 -28
- data/test/ext/Makefile.in +44 -16
- data/test/test_Array.cpp +13 -0
- data/test/test_Builtin_Object.cpp +0 -1
- data/test/test_Director.cpp +4 -0
- data/test/test_Hash.cpp +14 -0
- data/test/test_String.cpp +13 -0
- data/test/test_Struct.cpp +13 -0
- metadata +2 -2
data/Makefile.am
CHANGED
@@ -22,5 +22,5 @@ EXTRA_DIST = \
|
|
22
22
|
|
23
23
|
rice/README.doxygen: README
|
24
24
|
@echo Generating documentation
|
25
|
-
@$(RUBY) -e 'File.open("README") { |i| File.open("rice/README.doxygen", "w") { |o| o.puts "/*! #{i.gets}"; i.each_line { |l| o.puts "
|
25
|
+
@$(RUBY) -e 'File.open("README") { |i| File.open("rice/README.doxygen", "w") { |o| o.puts "/*! #{i.gets}"; i.each_line { |l| o.puts " #{l}" if l !~ /^\\comment/ and l !~ /^vim:/ }; o.puts " */" } }'
|
26
26
|
|
data/Makefile.in
CHANGED
@@ -1,7 +1,7 @@
|
|
1
|
-
# Makefile.in generated by automake 1.
|
1
|
+
# Makefile.in generated by automake 1.14 from Makefile.am.
|
2
2
|
# @configure_input@
|
3
3
|
|
4
|
-
# Copyright (C) 1994-
|
4
|
+
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
|
5
5
|
|
6
6
|
# This Makefile.in is free software; the Free Software Foundation
|
7
7
|
# gives unlimited permission to copy and/or distribute it,
|
@@ -44,23 +44,51 @@
|
|
44
44
|
#
|
45
45
|
# This is usually added to MOSTLYCLEANFILES.
|
46
46
|
VPATH = @srcdir@
|
47
|
-
|
48
|
-
|
49
|
-
|
47
|
+
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
|
48
|
+
am__make_running_with_option = \
|
49
|
+
case $${target_option-} in \
|
50
|
+
?) ;; \
|
51
|
+
*) echo "am__make_running_with_option: internal error: invalid" \
|
52
|
+
"target option '$${target_option-}' specified" >&2; \
|
53
|
+
exit 1;; \
|
54
|
+
esac; \
|
55
|
+
has_opt=no; \
|
56
|
+
sane_makeflags=$$MAKEFLAGS; \
|
57
|
+
if $(am__is_gnu_make); then \
|
58
|
+
sane_makeflags=$$MFLAGS; \
|
59
|
+
else \
|
50
60
|
case $$MAKEFLAGS in \
|
51
61
|
*\\[\ \ ]*) \
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
62
|
+
bs=\\; \
|
63
|
+
sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
|
64
|
+
| sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
|
65
|
+
esac; \
|
66
|
+
fi; \
|
67
|
+
skip_next=no; \
|
68
|
+
strip_trailopt () \
|
69
|
+
{ \
|
70
|
+
flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
|
71
|
+
}; \
|
72
|
+
for flg in $$sane_makeflags; do \
|
73
|
+
test $$skip_next = yes && { skip_next=no; continue; }; \
|
74
|
+
case $$flg in \
|
75
|
+
*=*|--*) continue;; \
|
76
|
+
-*I) strip_trailopt 'I'; skip_next=yes;; \
|
77
|
+
-*I?*) strip_trailopt 'I';; \
|
78
|
+
-*O) strip_trailopt 'O'; skip_next=yes;; \
|
79
|
+
-*O?*) strip_trailopt 'O';; \
|
80
|
+
-*l) strip_trailopt 'l'; skip_next=yes;; \
|
81
|
+
-*l?*) strip_trailopt 'l';; \
|
82
|
+
-[dEDm]) skip_next=yes;; \
|
83
|
+
-[JT]) skip_next=yes;; \
|
61
84
|
esac; \
|
62
|
-
|
63
|
-
|
85
|
+
case $$flg in \
|
86
|
+
*$$target_option*) has_opt=yes; break;; \
|
87
|
+
esac; \
|
88
|
+
done; \
|
89
|
+
test $$has_opt = yes
|
90
|
+
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
|
91
|
+
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
|
64
92
|
pkgdatadir = $(datadir)/@PACKAGE@
|
65
93
|
pkgincludedir = $(includedir)/@PACKAGE@
|
66
94
|
pkglibdir = $(libdir)/@PACKAGE@
|
@@ -413,13 +441,12 @@ rice/detail/ruby_version_code.hpp: $(top_builddir)/config.status $(top_srcdir)/r
|
|
413
441
|
# (which will cause the Makefiles to be regenerated when you run 'make');
|
414
442
|
# (2) otherwise, pass the desired values on the 'make' command line.
|
415
443
|
$(am__recursive_targets):
|
416
|
-
@fail
|
417
|
-
|
418
|
-
|
419
|
-
|
420
|
-
|
421
|
-
|
422
|
-
done; \
|
444
|
+
@fail=; \
|
445
|
+
if $(am__make_keepgoing); then \
|
446
|
+
failcom='fail=yes'; \
|
447
|
+
else \
|
448
|
+
failcom='exit 1'; \
|
449
|
+
fi; \
|
423
450
|
dot_seen=no; \
|
424
451
|
target=`echo $@ | sed s/-recursive//`; \
|
425
452
|
case "$@" in \
|
@@ -594,10 +621,16 @@ dist-xz: distdir
|
|
594
621
|
$(am__post_remove_distdir)
|
595
622
|
|
596
623
|
dist-tarZ: distdir
|
624
|
+
@echo WARNING: "Support for shar distribution archives is" \
|
625
|
+
"deprecated." >&2
|
626
|
+
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
|
597
627
|
tardir="$(distdir)" && $(am__tar) | compress -c >"$(distdir)".tar.Z
|
598
628
|
$(am__post_remove_distdir)
|
599
629
|
|
600
630
|
dist-shar: distdir
|
631
|
+
@echo WARNING: "Support for distribution archives compressed with" \
|
632
|
+
"legacy program 'compress' is deprecated." >&2
|
633
|
+
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
|
601
634
|
shar "$(distdir)" | GZIP=$(GZIP_ENV) gzip -c >"$(distdir)".shar.gz
|
602
635
|
$(am__post_remove_distdir)
|
603
636
|
|
@@ -866,7 +899,7 @@ doc: doxygen-doc
|
|
866
899
|
|
867
900
|
rice/README.doxygen: README
|
868
901
|
@echo Generating documentation
|
869
|
-
@$(RUBY) -e 'File.open("README") { |i| File.open("rice/README.doxygen", "w") { |o| o.puts "/*! #{i.gets}"; i.each_line { |l| o.puts "
|
902
|
+
@$(RUBY) -e 'File.open("README") { |i| File.open("rice/README.doxygen", "w") { |o| o.puts "/*! #{i.gets}"; i.each_line { |l| o.puts " #{l}" if l !~ /^\\comment/ and l !~ /^vim:/ }; o.puts " */" } }'
|
870
903
|
|
871
904
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
872
905
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
data/README
CHANGED
@@ -636,7 +636,7 @@ have pass-by-variable-reference (it uses pass-by-object-reference).
|
|
636
636
|
Future versions of Rice will have a cleaner way of dealing with this.
|
637
637
|
|
638
638
|
|
639
|
-
\
|
639
|
+
\subsection default_arguments Default Arguments
|
640
640
|
|
641
641
|
Going back to our initial C++ class example, lets say that hello() now
|
642
642
|
take a few arguments for what to return, one which has a default value:
|
@@ -707,7 +707,7 @@ This will also work with Constructors:
|
|
707
707
|
( Arg("arg1") = 1, Arg("otherArg") = 12 );
|
708
708
|
\endcode
|
709
709
|
|
710
|
-
\
|
710
|
+
\subsection director Director
|
711
711
|
|
712
712
|
As polymorphism is the most important tennant of Object Oriented Programming,
|
713
713
|
it's important that Rice supports polymorphic calls travelling between C++
|
@@ -833,12 +833,13 @@ Rice::Data_Type::define_director, then define methods pointing to the proxy obje
|
|
833
833
|
You must use the Rice::Director proxy class in the Constructor line, this allows proper
|
834
834
|
object construction / destruction of the types in question.
|
835
835
|
|
836
|
-
\
|
836
|
+
\subsection implicit_cast Implicit Casting
|
837
837
|
|
838
838
|
There are times when a library exposes classes that while unrelated are
|
839
839
|
built to be interchangeable across the library. One example of this,
|
840
|
-
taken from
|
841
|
-
|
840
|
+
taken from the Open Source 3d rendering engine <a
|
841
|
+
href="http://www.ogre3d.org/">OGRE</a>, are the Degree and Radian classes.
|
842
|
+
When a given method takes a Radian, you're free to pass in a Degree, and vice versa.
|
842
843
|
|
843
844
|
Rice cannot automatically figure out if this kind of functionality is
|
844
845
|
possible in a given library but it does have a simple API for defining
|
@@ -1060,7 +1061,7 @@ the garbage collector.
|
|
1060
1061
|
|
1061
1062
|
\li If an Object is allocated on the heap or if it is a member of an
|
1062
1063
|
object that might be allocated on the heap, use an
|
1063
|
-
Address_Registration_Guard to register the object with the garbage
|
1064
|
+
Rice::Address_Registration_Guard to register the object with the garbage
|
1064
1065
|
collector.
|
1065
1066
|
|
1066
1067
|
\li If a reference counted object is being wrapped, or if another type
|
data/aclocal.m4
CHANGED
@@ -1,6 +1,6 @@
|
|
1
|
-
# generated automatically by aclocal 1.
|
1
|
+
# generated automatically by aclocal 1.14 -*- Autoconf -*-
|
2
2
|
|
3
|
-
# Copyright (C) 1996-
|
3
|
+
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
|
4
4
|
|
5
5
|
# This file is free software; the Free Software Foundation
|
6
6
|
# gives unlimited permission to copy and/or distribute it,
|
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
|
|
32
32
|
# generated from the m4 files accompanying Automake X.Y.
|
33
33
|
# (This private macro should not be called outside this file.)
|
34
34
|
AC_DEFUN([AM_AUTOMAKE_VERSION],
|
35
|
-
[am__api_version='1.
|
35
|
+
[am__api_version='1.14'
|
36
36
|
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
|
37
37
|
dnl require some minimum version. Point them to the right macro.
|
38
|
-
m4_if([$1], [1.
|
38
|
+
m4_if([$1], [1.14], [],
|
39
39
|
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
|
40
40
|
])
|
41
41
|
|
@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
|
|
51
51
|
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
|
52
52
|
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
|
53
53
|
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
54
|
-
[AM_AUTOMAKE_VERSION([1.
|
54
|
+
[AM_AUTOMAKE_VERSION([1.14])dnl
|
55
55
|
m4_ifndef([AC_AUTOCONF_VERSION],
|
56
56
|
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
57
57
|
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
|
@@ -373,7 +373,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
|
|
373
373
|
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
|
374
374
|
test -z "$DEPDIR" && continue
|
375
375
|
am__include=`sed -n 's/^am__include = //p' < "$mf"`
|
376
|
-
test -z "am__include" && continue
|
376
|
+
test -z "$am__include" && continue
|
377
377
|
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
|
378
378
|
# Find all dependency output files, they are included files with
|
379
379
|
# $(DEPDIR) in their names. We invoke sed twice because it is the
|
@@ -418,6 +418,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
|
|
418
418
|
# This macro actually does too much. Some checks are only needed if
|
419
419
|
# your package does certain things. But this isn't really a big deal.
|
420
420
|
|
421
|
+
dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
|
422
|
+
m4_define([AC_PROG_CC],
|
423
|
+
m4_defn([AC_PROG_CC])
|
424
|
+
[_AM_PROG_CC_C_O
|
425
|
+
])
|
426
|
+
|
421
427
|
# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
|
422
428
|
# AM_INIT_AUTOMAKE([OPTIONS])
|
423
429
|
# -----------------------------------------------
|
@@ -526,7 +532,48 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
|
|
526
532
|
AC_CONFIG_COMMANDS_PRE(dnl
|
527
533
|
[m4_provide_if([_AM_COMPILER_EXEEXT],
|
528
534
|
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
|
529
|
-
|
535
|
+
|
536
|
+
# POSIX will say in a future version that running "rm -f" with no argument
|
537
|
+
# is OK; and we want to be able to make that assumption in our Makefile
|
538
|
+
# recipes. So use an aggressive probe to check that the usage we want is
|
539
|
+
# actually supported "in the wild" to an acceptable degree.
|
540
|
+
# See automake bug#10828.
|
541
|
+
# To make any issue more visible, cause the running configure to be aborted
|
542
|
+
# by default if the 'rm' program in use doesn't match our expectations; the
|
543
|
+
# user can still override this though.
|
544
|
+
if rm -f && rm -fr && rm -rf; then : OK; else
|
545
|
+
cat >&2 <<'END'
|
546
|
+
Oops!
|
547
|
+
|
548
|
+
Your 'rm' program seems unable to run without file operands specified
|
549
|
+
on the command line, even when the '-f' option is present. This is contrary
|
550
|
+
to the behaviour of most rm programs out there, and not conforming with
|
551
|
+
the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
|
552
|
+
|
553
|
+
Please tell bug-automake@gnu.org about your system, including the value
|
554
|
+
of your $PATH and any error possibly output before this message. This
|
555
|
+
can help us improve future automake versions.
|
556
|
+
|
557
|
+
END
|
558
|
+
if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
|
559
|
+
echo 'Configuration will proceed anyway, since you have set the' >&2
|
560
|
+
echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
|
561
|
+
echo >&2
|
562
|
+
else
|
563
|
+
cat >&2 <<'END'
|
564
|
+
Aborting the configuration process, to ensure you take notice of the issue.
|
565
|
+
|
566
|
+
You can download and install GNU coreutils to get an 'rm' implementation
|
567
|
+
that behaves properly: <http://www.gnu.org/software/coreutils/>.
|
568
|
+
|
569
|
+
If you want to complete the configuration process using your problematic
|
570
|
+
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
|
571
|
+
to "yes", and re-run configure.
|
572
|
+
|
573
|
+
END
|
574
|
+
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
|
575
|
+
fi
|
576
|
+
fi])
|
530
577
|
|
531
578
|
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
|
532
579
|
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
|
@@ -534,7 +581,6 @@ dnl mangled by Autoconf and run in a shell conditional statement.
|
|
534
581
|
m4_define([_AC_COMPILER_EXEEXT],
|
535
582
|
m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
|
536
583
|
|
537
|
-
|
538
584
|
# When config.status generates a header, we must update the stamp-h file.
|
539
585
|
# This file resides in the same directory as the config header
|
540
586
|
# that is generated. The stamp files are numbered to have different names.
|
@@ -925,76 +971,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
|
|
925
971
|
# Substitute a variable $(am__untar) that extract such
|
926
972
|
# a tarball read from stdin.
|
927
973
|
# $(am__untar) < result.tar
|
974
|
+
#
|
928
975
|
AC_DEFUN([_AM_PROG_TAR],
|
929
976
|
[# Always define AMTAR for backward compatibility. Yes, it's still used
|
930
977
|
# in the wild :-( We should find a proper way to deprecate it ...
|
931
978
|
AC_SUBST([AMTAR], ['$${TAR-tar}'])
|
932
|
-
|
933
|
-
|
934
|
-
[m4_case([$1], [ustar],, [pax],,
|
935
|
-
[m4_fatal([Unknown tar format])])
|
936
|
-
AC_MSG_CHECKING([how to create a $1 tar archive])
|
937
|
-
# Loop over all known methods to create a tar archive until one works.
|
979
|
+
|
980
|
+
# We'll loop over all known methods to create a tar archive until one works.
|
938
981
|
_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
|
939
|
-
_am_tools=${am_cv_prog_tar_$1-$_am_tools}
|
940
|
-
# Do not fold the above two line into one, because Tru64 sh and
|
941
|
-
# Solaris sh will not grok spaces in the rhs of '-'.
|
942
|
-
for _am_tool in $_am_tools
|
943
|
-
do
|
944
|
-
case $_am_tool in
|
945
|
-
gnutar)
|
946
|
-
for _am_tar in tar gnutar gtar;
|
947
|
-
do
|
948
|
-
AM_RUN_LOG([$_am_tar --version]) && break
|
949
|
-
done
|
950
|
-
am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
|
951
|
-
am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
|
952
|
-
am__untar="$_am_tar -xf -"
|
953
|
-
;;
|
954
|
-
plaintar)
|
955
|
-
# Must skip GNU tar: if it does not support --format= it doesn't create
|
956
|
-
# ustar tarball either.
|
957
|
-
(tar --version) >/dev/null 2>&1 && continue
|
958
|
-
am__tar='tar chf - "$$tardir"'
|
959
|
-
am__tar_='tar chf - "$tardir"'
|
960
|
-
am__untar='tar xf -'
|
961
|
-
;;
|
962
|
-
pax)
|
963
|
-
am__tar='pax -L -x $1 -w "$$tardir"'
|
964
|
-
am__tar_='pax -L -x $1 -w "$tardir"'
|
965
|
-
am__untar='pax -r'
|
966
|
-
;;
|
967
|
-
cpio)
|
968
|
-
am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
|
969
|
-
am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
|
970
|
-
am__untar='cpio -i -H $1 -d'
|
971
|
-
;;
|
972
|
-
none)
|
973
|
-
am__tar=false
|
974
|
-
am__tar_=false
|
975
|
-
am__untar=false
|
976
|
-
;;
|
977
|
-
esac
|
978
982
|
|
979
|
-
|
980
|
-
|
981
|
-
|
983
|
+
m4_if([$1], [v7],
|
984
|
+
[am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
|
985
|
+
|
986
|
+
[m4_case([$1],
|
987
|
+
[ustar],
|
988
|
+
[# The POSIX 1988 'ustar' format is defined with fixed-size fields.
|
989
|
+
# There is notably a 21 bits limit for the UID and the GID. In fact,
|
990
|
+
# the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
|
991
|
+
# and bug#13588).
|
992
|
+
am_max_uid=2097151 # 2^21 - 1
|
993
|
+
am_max_gid=$am_max_uid
|
994
|
+
# The $UID and $GID variables are not portable, so we need to resort
|
995
|
+
# to the POSIX-mandated id(1) utility. Errors in the 'id' calls
|
996
|
+
# below are definitely unexpected, so allow the users to see them
|
997
|
+
# (that is, avoid stderr redirection).
|
998
|
+
am_uid=`id -u || echo unknown`
|
999
|
+
am_gid=`id -g || echo unknown`
|
1000
|
+
AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
|
1001
|
+
if test $am_uid -le $am_max_uid; then
|
1002
|
+
AC_MSG_RESULT([yes])
|
1003
|
+
else
|
1004
|
+
AC_MSG_RESULT([no])
|
1005
|
+
_am_tools=none
|
1006
|
+
fi
|
1007
|
+
AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
|
1008
|
+
if test $am_gid -le $am_max_gid; then
|
1009
|
+
AC_MSG_RESULT([yes])
|
1010
|
+
else
|
1011
|
+
AC_MSG_RESULT([no])
|
1012
|
+
_am_tools=none
|
1013
|
+
fi],
|
1014
|
+
|
1015
|
+
[pax],
|
1016
|
+
[],
|
1017
|
+
|
1018
|
+
[m4_fatal([Unknown tar format])])
|
1019
|
+
|
1020
|
+
AC_MSG_CHECKING([how to create a $1 tar archive])
|
1021
|
+
|
1022
|
+
# Go ahead even if we have the value already cached. We do so because we
|
1023
|
+
# need to set the values for the 'am__tar' and 'am__untar' variables.
|
1024
|
+
_am_tools=${am_cv_prog_tar_$1-$_am_tools}
|
1025
|
+
|
1026
|
+
for _am_tool in $_am_tools; do
|
1027
|
+
case $_am_tool in
|
1028
|
+
gnutar)
|
1029
|
+
for _am_tar in tar gnutar gtar; do
|
1030
|
+
AM_RUN_LOG([$_am_tar --version]) && break
|
1031
|
+
done
|
1032
|
+
am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
|
1033
|
+
am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
|
1034
|
+
am__untar="$_am_tar -xf -"
|
1035
|
+
;;
|
1036
|
+
plaintar)
|
1037
|
+
# Must skip GNU tar: if it does not support --format= it doesn't create
|
1038
|
+
# ustar tarball either.
|
1039
|
+
(tar --version) >/dev/null 2>&1 && continue
|
1040
|
+
am__tar='tar chf - "$$tardir"'
|
1041
|
+
am__tar_='tar chf - "$tardir"'
|
1042
|
+
am__untar='tar xf -'
|
1043
|
+
;;
|
1044
|
+
pax)
|
1045
|
+
am__tar='pax -L -x $1 -w "$$tardir"'
|
1046
|
+
am__tar_='pax -L -x $1 -w "$tardir"'
|
1047
|
+
am__untar='pax -r'
|
1048
|
+
;;
|
1049
|
+
cpio)
|
1050
|
+
am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
|
1051
|
+
am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
|
1052
|
+
am__untar='cpio -i -H $1 -d'
|
1053
|
+
;;
|
1054
|
+
none)
|
1055
|
+
am__tar=false
|
1056
|
+
am__tar_=false
|
1057
|
+
am__untar=false
|
1058
|
+
;;
|
1059
|
+
esac
|
982
1060
|
|
983
|
-
|
984
|
-
|
985
|
-
|
986
|
-
|
987
|
-
|
1061
|
+
# If the value was cached, stop now. We just wanted to have am__tar
|
1062
|
+
# and am__untar set.
|
1063
|
+
test -n "${am_cv_prog_tar_$1}" && break
|
1064
|
+
|
1065
|
+
# tar/untar a dummy directory, and stop if the command works.
|
1066
|
+
rm -rf conftest.dir
|
1067
|
+
mkdir conftest.dir
|
1068
|
+
echo GrepMe > conftest.dir/file
|
1069
|
+
AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
|
1070
|
+
rm -rf conftest.dir
|
1071
|
+
if test -s conftest.tar; then
|
1072
|
+
AM_RUN_LOG([$am__untar <conftest.tar])
|
1073
|
+
AM_RUN_LOG([cat conftest.dir/file])
|
1074
|
+
grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
|
1075
|
+
fi
|
1076
|
+
done
|
988
1077
|
rm -rf conftest.dir
|
989
|
-
if test -s conftest.tar; then
|
990
|
-
AM_RUN_LOG([$am__untar <conftest.tar])
|
991
|
-
grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
|
992
|
-
fi
|
993
|
-
done
|
994
|
-
rm -rf conftest.dir
|
995
1078
|
|
996
|
-
AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
|
997
|
-
AC_MSG_RESULT([$am_cv_prog_tar_$1])])
|
1079
|
+
AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
|
1080
|
+
AC_MSG_RESULT([$am_cv_prog_tar_$1])])
|
1081
|
+
|
998
1082
|
AC_SUBST([am__tar])
|
999
1083
|
AC_SUBST([am__untar])
|
1000
1084
|
]) # _AM_PROG_TAR
|
data/configure
CHANGED
@@ -1921,7 +1921,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
1921
1921
|
|
1922
1922
|
|
1923
1923
|
|
1924
|
-
am__api_version='1.
|
1924
|
+
am__api_version='1.14'
|
1925
1925
|
|
1926
1926
|
ac_aux_dir=
|
1927
1927
|
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
|
@@ -2476,6 +2476,10 @@ mkdir_p='$(MKDIR_P)'
|
|
2476
2476
|
# in the wild :-( We should find a proper way to deprecate it ...
|
2477
2477
|
AMTAR='$${TAR-tar}'
|
2478
2478
|
|
2479
|
+
|
2480
|
+
# We'll loop over all known methods to create a tar archive until one works.
|
2481
|
+
_am_tools='gnutar pax cpio none'
|
2482
|
+
|
2479
2483
|
am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
|
2480
2484
|
|
2481
2485
|
|
@@ -2483,6 +2487,48 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
|
|
2483
2487
|
|
2484
2488
|
|
2485
2489
|
|
2490
|
+
# POSIX will say in a future version that running "rm -f" with no argument
|
2491
|
+
# is OK; and we want to be able to make that assumption in our Makefile
|
2492
|
+
# recipes. So use an aggressive probe to check that the usage we want is
|
2493
|
+
# actually supported "in the wild" to an acceptable degree.
|
2494
|
+
# See automake bug#10828.
|
2495
|
+
# To make any issue more visible, cause the running configure to be aborted
|
2496
|
+
# by default if the 'rm' program in use doesn't match our expectations; the
|
2497
|
+
# user can still override this though.
|
2498
|
+
if rm -f && rm -fr && rm -rf; then : OK; else
|
2499
|
+
cat >&2 <<'END'
|
2500
|
+
Oops!
|
2501
|
+
|
2502
|
+
Your 'rm' program seems unable to run without file operands specified
|
2503
|
+
on the command line, even when the '-f' option is present. This is contrary
|
2504
|
+
to the behaviour of most rm programs out there, and not conforming with
|
2505
|
+
the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
|
2506
|
+
|
2507
|
+
Please tell bug-automake@gnu.org about your system, including the value
|
2508
|
+
of your $PATH and any error possibly output before this message. This
|
2509
|
+
can help us improve future automake versions.
|
2510
|
+
|
2511
|
+
END
|
2512
|
+
if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
|
2513
|
+
echo 'Configuration will proceed anyway, since you have set the' >&2
|
2514
|
+
echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
|
2515
|
+
echo >&2
|
2516
|
+
else
|
2517
|
+
cat >&2 <<'END'
|
2518
|
+
Aborting the configuration process, to ensure you take notice of the issue.
|
2519
|
+
|
2520
|
+
You can download and install GNU coreutils to get an 'rm' implementation
|
2521
|
+
that behaves properly: <http://www.gnu.org/software/coreutils/>.
|
2522
|
+
|
2523
|
+
If you want to complete the configuration process using your problematic
|
2524
|
+
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
|
2525
|
+
to "yes", and re-run configure.
|
2526
|
+
|
2527
|
+
END
|
2528
|
+
as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
|
2529
|
+
fi
|
2530
|
+
fi
|
2531
|
+
|
2486
2532
|
ac_config_headers="$ac_config_headers rice/config.hpp"
|
2487
2533
|
|
2488
2534
|
|
@@ -7113,7 +7159,7 @@ $as_echo X"$mf" |
|
|
7113
7159
|
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
|
7114
7160
|
test -z "$DEPDIR" && continue
|
7115
7161
|
am__include=`sed -n 's/^am__include = //p' < "$mf"`
|
7116
|
-
test -z "am__include" && continue
|
7162
|
+
test -z "$am__include" && continue
|
7117
7163
|
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
|
7118
7164
|
# Find all dependency output files, they are included files with
|
7119
7165
|
# $(DEPDIR) in their names. We invoke sed twice because it is the
|
data/configure.ac
CHANGED
data/extconf.rb
CHANGED
data/rice/Arg_impl.hpp
CHANGED
@@ -8,11 +8,13 @@ namespace Rice {
|
|
8
8
|
* wrapped method. Inspired by how Boost.Python handles keyword and
|
9
9
|
* default arguments, the syntax is simple:
|
10
10
|
*
|
11
|
+
* \code
|
11
12
|
* define_method(
|
12
13
|
* "method",
|
13
14
|
* &method,
|
14
15
|
* (Arg("arg1"), Arg("arg2") = 3, Arg("arg3") = true)
|
15
16
|
* );
|
17
|
+
* \endcode
|
16
18
|
*
|
17
19
|
* which means "for method &method, it takes 3 arguments
|
18
20
|
* [arg1, arg2, arg3]. Of these arguments, arg2's default is 3
|
data/rice/Constructor.hpp
CHANGED
@@ -11,6 +11,27 @@
|
|
11
11
|
#include "detail/method_data.hpp"
|
12
12
|
namespace Rice
|
13
13
|
{
|
14
|
+
#ifdef DOXYGEN
|
15
|
+
//! Define a Type's Constructor and it's arguments.
|
16
|
+
/*! E.g. for the default constructor on a Type:
|
17
|
+
\code
|
18
|
+
define_class<Test>()
|
19
|
+
.define_constructor(Constructor<Test>());
|
20
|
+
\endcode
|
21
|
+
*
|
22
|
+
* The first template type must be the type being wrapped.
|
23
|
+
* Afterwards any extra types must match the appropriate constructor
|
24
|
+
* to be used in C++ when constructing the object.
|
25
|
+
*
|
26
|
+
* For more information, see Rice::Data_Type::define_constructor.
|
27
|
+
*/
|
28
|
+
template<typename T, typename ArgTypes, ...>
|
29
|
+
class Constructor
|
30
|
+
{
|
31
|
+
};
|
32
|
+
|
33
|
+
#else
|
34
|
+
|
14
35
|
template<typename T, typename Arg0_T=void, typename Arg1_T=void, typename Arg2_T=void, typename Arg3_T=void, typename Arg4_T=void, typename Arg5_T=void, typename Arg6_T=void, typename Arg7_T=void, typename Arg8_T=void, typename Arg9_T=void, typename Arg10_T=void, typename Arg11_T=void, typename Arg12_T=void, typename Arg13_T=void, typename Arg14_T=void, typename Arg15_T=void>
|
15
36
|
class Constructor
|
16
37
|
{
|
@@ -361,6 +382,8 @@ namespace Rice
|
|
361
382
|
};
|
362
383
|
|
363
384
|
|
385
|
+
#endif // DOXYGEN
|
386
|
+
|
364
387
|
} // namespace Rice
|
365
388
|
|
366
389
|
|
data/rice/Director.hpp
CHANGED
@@ -8,7 +8,7 @@ namespace Rice {
|
|
8
8
|
/**
|
9
9
|
* A Director works exactly as a SWIG %director works (thus the name).
|
10
10
|
* You use this class to help build proxy classes so that polymorphism
|
11
|
-
* works from C++ into Ruby.
|
11
|
+
* works from C++ into Ruby. See the main README for how this class works.
|
12
12
|
*/
|
13
13
|
class Director
|
14
14
|
{
|
data/rice/Exception.hpp
CHANGED