Attachment #218 for bug #735

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 735
Collapse All | Expand All




# Check for Ruby

if test "x$compile_kross" = "xyes" ; then
  AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18 ruby1.9 ruby19], ruby)

  if test -n "$RUBY"; then
    AC_MSG_CHECKING(for Ruby dirs)
    RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
    RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
    RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
    if test -n "$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
      # Ruby 1.9
      RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'`
      RUBY_VERSION_H=ruby/version.h
    else
      # not Ruby 1.9
      RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'`
      RUBY_VERSION_H=version.h
    fi
    RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
    RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
    RUBY_ENABLESHARED=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"ENABLE_SHARED"@:>@)'`

          [
            AC_TRY_COMPILE([
                #include <ruby.h>
                #include <$RUBY_VERSION_H>
            ],[
            
#if(RUBY_VERSION_MAJOR==1 && RUBY_VERSION_MINOR == 8 && RUBY_VERSION_TEENY <= 1)




# Check for Ruby

if test "x$compile_kross" = "xyes" ; then
  AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18 ruby1.9 ruby19], ruby)

  if test -n "$RUBY"; then
    AC_MSG_CHECKING(for Ruby dirs)
    RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
    RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
    RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
    if test -n "$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
      # Ruby 1.9
      RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'`
      RUBY_VERSION_H=ruby/version.h
    else
      # not Ruby 1.9
      RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'`
      RUBY_VERSION_H=version.h
    fi
    RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
    RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
    RUBY_ENABLESHARED=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"ENABLE_SHARED"@:>@)'`

          [
            AC_TRY_COMPILE([
                #include <ruby.h>
                #include <$RUBY_VERSION_H>
            ],[
            
#if(RUBY_VERSION_MAJOR==1 && RUBY_VERSION_MINOR == 8 && RUBY_VERSION_TEENY <= 1)

Lines 18-24 Link Here

(-)koffice/lib/kross/ruby/rubyextension.cpp (-2 / +2 lines)
18	***************************************************************************/	18	***************************************************************************/
19	#include "rubyextension.h"	19	#include "rubyextension.h"
20		20
21	#include <st.h>	21	#include <ruby/st.h>
22		22
23	#include <tqmap.h>	23	#include <tqmap.h>
24	#include <tqstring.h>	24	#include <tqstring.h>
Lines 211-217 Link Here
211	case T_ARRAY:	211	case T_ARRAY:
212	{	212	{
213	TQValueList<Kross::Api::Object::Ptr> l;	213	TQValueList<Kross::Api::Object::Ptr> l;
214	for(int i = 0; i < RARRAY(value)->len; i++)	214	for(int i = 0; i < RARRAY_LEN(value); i++)
215	{	215	{
216	Kross::Api::Object::Ptr o = toObject( rb_ary_entry( value , i ) );	216	Kross::Api::Object::Ptr o = toObject( rb_ary_entry( value , i ) );
217	if(o) l.append(o);	217	if(o) l.append(o);

Lines 21-28 Link Here

(-)koffice/lib/kross/ruby/rubyscript.cpp (-2 / +4 lines)
21		21
22	#include <ruby.h>	22	#include <ruby.h>
23	#include <env.h>	23	#include <env.h>
24	#include <rubysig.h>	24	#include <ruby/backward/rubysig.h>
25	#include <node.h>	25	#include <ruby/node.h>
26		26
27	#include <main/scriptcontainer.h>	27	#include <main/scriptcontainer.h>
28		28
Lines 70-75 Link Here
70	krossdebug("RubyScript::compile()");	70	krossdebug("RubyScript::compile()");
71	#endif	71	#endif
72	int critical;	72	int critical;
		73	int ruby_nerrs;
		74	int ruby_in_eval;
73		75
74	ruby_nerrs = 0;	76	ruby_nerrs = 0;
75	ruby_errinfo = Qnil;	77	ruby_errinfo = Qnil;

Return to bug 735

Lines 1539-1552 Link Here

(-)koffice/configure.in (-3 / +11 lines)
1539	# Check for Ruby	1539	# Check for Ruby
1540		1540
1541	if test "x$compile_kross" = "xyes" ; then	1541	if test "x$compile_kross" = "xyes" ; then
1542	AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18], ruby)	1542	AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18 ruby1.9 ruby19], ruby)
1543		1543
1544	if test -n "$RUBY"; then	1544	if test -n "$RUBY"; then
1545	AC_MSG_CHECKING(for Ruby dirs)	1545	AC_MSG_CHECKING(for Ruby dirs)
1546	RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`	1546	RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
1547	RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`	1547	RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
1548	RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`	1548	RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
1549	RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'`	1549	if test -n "$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
		1550	# Ruby 1.9
		1551	RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'`
		1552	RUBY_VERSION_H=ruby/version.h
		1553	else
		1554	# not Ruby 1.9
		1555	RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'`
		1556	RUBY_VERSION_H=version.h
		1557	fi
1550	RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`	1558	RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
1551	RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`	1559	RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
1552	RUBY_ENABLESHARED=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"ENABLE_SHARED"@:>@)'`	1560	RUBY_ENABLESHARED=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"ENABLE_SHARED"@:>@)'`
Lines 1599-1605 Link Here
1599	[	1607	[
1600	AC_TRY_COMPILE([	1608	AC_TRY_COMPILE([
1601	#include <ruby.h>	1609	#include <ruby.h>
1602	#include <version.h>	1610	#include <$RUBY_VERSION_H>
1603	],[	1611	],[
1604		1612
1605	#if(RUBY_VERSION_MAJOR==1 && RUBY_VERSION_MINOR == 8 && RUBY_VERSION_TEENY <= 1)	1613	#if(RUBY_VERSION_MAJOR==1 && RUBY_VERSION_MINOR == 8 && RUBY_VERSION_TEENY <= 1)

Lines 21-34 Link Here

(-)koffice/lib/kross/configure.in.in (-3 / +11 lines)
21	# Check for Ruby	21	# Check for Ruby
22		22
23	if test "x$compile_kross" = "xyes" ; then	23	if test "x$compile_kross" = "xyes" ; then
24	AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18], ruby)	24	AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18 ruby1.9 ruby19], ruby)
25		25
26	if test -n "$RUBY"; then	26	if test -n "$RUBY"; then
27	AC_MSG_CHECKING(for Ruby dirs)	27	AC_MSG_CHECKING(for Ruby dirs)
28	RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`	28	RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
29	RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`	29	RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
30	RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`	30	RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
31	RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'`	31	if test -n "$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
		32	# Ruby 1.9
		33	RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'`
		34	RUBY_VERSION_H=ruby/version.h
		35	else
		36	# not Ruby 1.9
		37	RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'`
		38	RUBY_VERSION_H=version.h
		39	fi
32	RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`	40	RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
33	RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`	41	RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
34	RUBY_ENABLESHARED=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"ENABLE_SHARED"@:>@)'`	42	RUBY_ENABLESHARED=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"ENABLE_SHARED"@:>@)'`
Lines 81-87 Link Here
81	[	89	[
82	AC_TRY_COMPILE([	90	AC_TRY_COMPILE([
83	#include <ruby.h>	91	#include <ruby.h>
84	#include <version.h>	92	#include <$RUBY_VERSION_H>
85	],[	93	],[
86		94
87	#if(RUBY_VERSION_MAJOR==1 && RUBY_VERSION_MINOR == 8 && RUBY_VERSION_TEENY <= 1)	95	#if(RUBY_VERSION_MAJOR==1 && RUBY_VERSION_MINOR == 8 && RUBY_VERSION_TEENY <= 1)