Attachment #612 for bug #981

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 981
Collapse All | Expand All




  tde_message_fatal( "ruby is required, but was not found on your system" )
endif( )

# In ruby 1.9.x, ruby.h is located in a different location than previous releases.
execute_process(
  COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MAJOR'] )"
  OUTPUT_VARIABLE RUBY_VERSION_MAJOR
  RESULT_VARIABLE _result
  OUTPUT_STRIP_TRAILING_WHITESPACE )
if( _result )
  tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )
endif( )
execute_process(
  COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MINOR'] )"
  OUTPUT_VARIABLE RUBY_VERSION_MINOR
  RESULT_VARIABLE _result
  OUTPUT_STRIP_TRAILING_WHITESPACE )
if( _result )
  tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )
endif( )
set( RUBY_VERSION ${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR} )
if ( "${RUBY_VERSION}" GREATER "18" )
  execute_process(
    COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['rubyhdrdir'] )"
    OUTPUT_VARIABLE RUBY_INCLUDE_DIR
    RESULT_VARIABLE _result
    OUTPUT_STRIP_TRAILING_WHITESPACE )
  if( _result )
    tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )
  endif( )
else( )
  execute_process(
    COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['archdir'] )"
    OUTPUT_VARIABLE RUBY_INCLUDE_DIR
    RESULT_VARIABLE _result
    OUTPUT_STRIP_TRAILING_WHITESPACE )
  if( _result )
    tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )
  endif( )
endif( )
execute_process(
  COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['LIBRUBYARG_SHARED'] )"
  OUTPUT_VARIABLE RUBY_LDFLAGS

  message( STATUS "Found RUBY: ${RUBY_EXECUTABLE}" )
  message( STATUS "  RUBY_INCLUDE_DIR: ${RUBY_INCLUDE_DIR}" )
  message( STATUS "  RUBY_LDFLAGS: ${RUBY_LDFLAGS}" )
  message( STATUS "  RUBY_VERSION_MAJOR: ${RUBY_VERSION_MAJOR}")
  message( STATUS "  RUBY_VERSION_MINOR: ${RUBY_VERSION_MINOR}")
endif( )
if ( "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}" VERSION_LESS "19" )
  message( STATUS "  You have an old version of Ruby ! (<1.9)")
  set ( HAVE_OLD_RUBY 1 CACHE INTERNAL "" )
endif( )

Lines 15-20 Link Here

(-)amarok/amarok/src/mediadevice/daap/mongrel/http11/CMakeLists.txt (+1 lines)
15	)	15	)
16		16
17	include_directories(	17	include_directories(
		18	${CMAKE_BINARY_DIR}
18	${RUBY_INCLUDE_DIR}	19	${RUBY_INCLUDE_DIR}
19	)	20	)
20		21

Lines 2-7 Link Here

(-)amarok/amarok/src/mediadevice/daap/mongrel/http11/http11.c (-8 / +35 lines)
2	* Copyright (c) 2005 Zed A. Shaw	2	* Copyright (c) 2005 Zed A. Shaw
3	* You can redistribute it and/or modify it under the same terms as Ruby.	3	* You can redistribute it and/or modify it under the same terms as Ruby.
4	*/	4	*/
		5	#include "config.h"
5	#include "ruby.h"	6	#include "ruby.h"
6	#include "ext_help.h"	7	#include "ext_help.h"
7	#include <assert.h>	8	#include <assert.h>
Lines 74-80 Link Here
74	f = rb_str_dup(global_http_prefix);	75	f = rb_str_dup(global_http_prefix);
75	f = rb_str_buf_cat(f, field, flen);	76	f = rb_str_buf_cat(f, field, flen);
76		77
77	for(ch = RSTRING(f)->ptr, end = ch + RSTRING(f)->len; ch < end; ch++) {	78	#ifdef HAVE_OLD_RUBY
		79	for(ch = RSTRING(f)->ptr, end = ch + RSTRING(f)->len; ch < end; ch++) {
		80	#else
		81	for(ch = RSTRING_PTR(f), end = ch + RSTRING_LEN(f); ch < end; ch++) {
		82	#endif
78	if(*ch == '-') {	83	if(*ch == '-') {
79	*ch = '_';	84	*ch = '_';
80	} else {	85	} else {
Lines 157-168 Link Here
157		162
158	rb_hash_aset(req, global_gateway_interface, global_gateway_interface_value);	163	rb_hash_aset(req, global_gateway_interface, global_gateway_interface_value);
159	if((temp = rb_hash_aref(req, global_http_host)) != Qnil) {	164	if((temp = rb_hash_aref(req, global_http_host)) != Qnil) {
160	colon = strchr(RSTRING(temp)->ptr, ':');	165	#ifdef HAVE_OLD_RUBY
		166	colon = strchr(RSTRING(temp)->ptr, ':');
		167	#else
		168	colon = strchr(RSTRING_PTR(temp), ':');
		169	#endif
161	if(colon != NULL) {	170	if(colon != NULL) {
162	rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING(temp)->ptr));	171	#ifdef HAVE_OLD_RUBY
		172	rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING(temp)->ptr));
		173	#else
		174	rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING_PTR(temp)));
		175	#endif
163	rb_hash_aset(req, global_server_port,	176	rb_hash_aset(req, global_server_port,
164	rb_str_substr(temp, colon - RSTRING(temp)->ptr+1,	177	#ifdef HAVE_OLD_RUBY
165	RSTRING(temp)->len));	178	rb_str_substr(temp, colon - RSTRING(temp)->ptr+1,
		179	RSTRING(temp)->len));
		180	#else
		181	rb_str_substr(temp, colon - RSTRING_PTR(temp)+1,
		182	RSTRING_LEN(temp)));
		183	#endif
166	} else {	184	} else {
167	rb_hash_aset(req, global_server_name, temp);	185	rb_hash_aset(req, global_server_name, temp);
168	rb_hash_aset(req, global_server_port, global_port_80);	186	rb_hash_aset(req, global_server_port, global_port_80);
Lines 281-288 Link Here
281	DATA_GET(self, http_parser, http);	299	DATA_GET(self, http_parser, http);
282		300
283	from = FIX2INT(start);	301	from = FIX2INT(start);
284	dptr = RSTRING(data)->ptr;	302	#ifdef HAVE_OLD_RUBY
285	dlen = RSTRING(data)->len;	303	dptr = RSTRING(data)->ptr;
		304	dlen = RSTRING(data)->len;
		305	#else
		306	dptr = RSTRING_PTR(data);
		307	dlen = RSTRING_LEN(data);
		308	#endif
286		309
287	if(from >= dlen) {	310	if(from >= dlen) {
288	rb_raise(eHttpParserError, "Requested start is after data buffer end.");	311	rb_raise(eHttpParserError, "Requested start is after data buffer end.");
Lines 512-518 Link Here
512	if(pref_len == 1 && uri_str[0] == '/') {	535	if(pref_len == 1 && uri_str[0] == '/') {
513	rb_ary_push(result, uri);	536	rb_ary_push(result, uri);
514	} else {	537	} else {
515	rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING(uri)->len));	538	#ifdef HAVE_OLD_RUBY
		539	rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING(uri)->len));
		540	#else
		541	rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING_LEN(uri)));
		542	#endif
516	}	543	}
517		544
518	rb_ary_push(result, (VALUE)handler);	545	rb_ary_push(result, (VALUE)handler);

Lines 16-18 Link Here

(-)amarok/config.h.cmake (+1 lines)
16		16
17	#cmakedefine TAGLIB_15 1	17	#cmakedefine TAGLIB_15 1
18	#cmakedefine HAVE_QGLWIDGET 1	18	#cmakedefine HAVE_QGLWIDGET 1
		19	#cmakedefine HAVE_OLD_RUBY @HAVE_OLD_RUBY@

Lines 1162-1168 Link Here

(-)amarok/configure.in (-1 / +8 lines)
1162		1162
1163	AC_PATH_PROG(RUBY, ruby, no)	1163	AC_PATH_PROG(RUBY, ruby, no)
1164		1164
1165	ruby_includes=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["archdir"] )'`]	1165	if test -n "$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
		1166	# Ruby 1.9
		1167	ruby_includes=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'`
		1168	else
		1169	# not Ruby 1.9
		1170	ruby_includes=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["archdir"] )'`]
		1171	fi
		1172
1166	ruby_ldflags=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["LIBRUBYARG_SHARED"] )'`]	1173	ruby_ldflags=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["LIBRUBYARG_SHARED"] )'`]
1167		1174
1168	AC_SUBST(ruby_includes)	1175	AC_SUBST(ruby_includes)

Return to bug 981

Lines 14-28 Link Here

(-)amarok/amarok/src/mediadevice/daap/ConfigureChecks.cmake (-3 / +37 lines)
14	tde_message_fatal( "ruby is required, but was not found on your system" )	14	tde_message_fatal( "ruby is required, but was not found on your system" )
15	endif( )	15	endif( )
16		16
		17	# In ruby 1.9.x, ruby.h is located in a different location than previous releases.
17	execute_process(	18	execute_process(
18	COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['archdir'] )"	19	COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MAJOR'] )"
19	OUTPUT_VARIABLE RUBY_INCLUDE_DIR	20	OUTPUT_VARIABLE RUBY_VERSION_MAJOR
20	RESULT_VARIABLE _result	21	RESULT_VARIABLE _result
21	OUTPUT_STRIP_TRAILING_WHITESPACE )	22	OUTPUT_STRIP_TRAILING_WHITESPACE )
22	if( _result )	23	if( _result )
23	tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )	24	tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )
24	endif( )	25	endif( )
25		26	execute_process(
		27	COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MINOR'] )"
		28	OUTPUT_VARIABLE RUBY_VERSION_MINOR
		29	RESULT_VARIABLE _result
		30	OUTPUT_STRIP_TRAILING_WHITESPACE )
		31	if( _result )
		32	tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )
		33	endif( )
		34	set( RUBY_VERSION ${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR} )
		35	if ( "${RUBY_VERSION}" GREATER "18" )
		36	execute_process(
		37	COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['rubyhdrdir'] )"
		38	OUTPUT_VARIABLE RUBY_INCLUDE_DIR
		39	RESULT_VARIABLE _result
		40	OUTPUT_STRIP_TRAILING_WHITESPACE )
		41	if( _result )
		42	tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )
		43	endif( )
		44	else( )
		45	execute_process(
		46	COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['archdir'] )"
		47	OUTPUT_VARIABLE RUBY_INCLUDE_DIR
		48	RESULT_VARIABLE _result
		49	OUTPUT_STRIP_TRAILING_WHITESPACE )
		50	if( _result )
		51	tde_message_fatal( "Unable to run ${RUBY_EXECUTABLE}!\n RUBY is correctly installed?" )
		52	endif( )
		53	endif( )
26	execute_process(	54	execute_process(
27	COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['LIBRUBYARG_SHARED'] )"	55	COMMAND ${RUBY_EXECUTABLE} -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['LIBRUBYARG_SHARED'] )"
28	OUTPUT_VARIABLE RUBY_LDFLAGS	56	OUTPUT_VARIABLE RUBY_LDFLAGS
Lines 36-39 Link Here
36	message( STATUS "Found RUBY: ${RUBY_EXECUTABLE}" )	64	message( STATUS "Found RUBY: ${RUBY_EXECUTABLE}" )
37	message( STATUS " RUBY_INCLUDE_DIR: ${RUBY_INCLUDE_DIR}" )	65	message( STATUS " RUBY_INCLUDE_DIR: ${RUBY_INCLUDE_DIR}" )
38	message( STATUS " RUBY_LDFLAGS: ${RUBY_LDFLAGS}" )	66	message( STATUS " RUBY_LDFLAGS: ${RUBY_LDFLAGS}" )
		67	message( STATUS " RUBY_VERSION_MAJOR: ${RUBY_VERSION_MAJOR}")
		68	message( STATUS " RUBY_VERSION_MINOR: ${RUBY_VERSION_MINOR}")
		69	endif( )
		70	if ( "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}" VERSION_LESS "19" )
		71	message( STATUS " You have an old version of Ruby ! (<1.9)")
		72	set ( HAVE_OLD_RUBY 1 CACHE INTERNAL "" )
39	endif( )	73	endif( )