From 662a0efa423f13cc53ffeb1977a5a636a80f38dc Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Sat, 26 May 2012 20:00:15 +0200 Subject: [PATCH] added missing file --- MRClient/MRubyClientConnection.cpp | 5 +++-- Makefile.files | 2 ++ Makefile.in | 10 +++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/MRClient/MRubyClientConnection.cpp b/MRClient/MRubyClientConnection.cpp index 32ee0ad226..af267f943d 100644 --- a/MRClient/MRubyClientConnection.cpp +++ b/MRClient/MRubyClientConnection.cpp @@ -300,7 +300,8 @@ mrb_value MRubyClientConnection::requestData (int method, if (js != NULL) { // return v8 object - v8::Handle result = TRI_ObjectJson(js); + mrb_value result; + // mrb_value result = TRI_ObjectJson(js); TRI_FreeJson(TRI_UNKNOWN_MEM_ZONE, js); return result; @@ -320,7 +321,7 @@ mrb_value MRubyClientConnection::requestData (int method, mrb_value result; mrb_hash_set(&_mrs->_mrb, result, _mrs->_errorSym, mrb_false_value()); - mrb_hash_set(&_mrs->_mrb, result, _mrs->_codeSym, mrb_int_value(_httpResult->getHttpReturnCode())); + mrb_hash_set(&_mrs->_mrb, result, _mrs->_codeSym, mrb_fixnum_value(_httpResult->getHttpReturnCode())); return result; } diff --git a/Makefile.files b/Makefile.files index 5a3411ac69..7f0381c513 100644 --- a/Makefile.files +++ b/Makefile.files @@ -248,6 +248,8 @@ if ENABLE_MRUBY arangoirb_LDADD = libarango.a $(LIBS) arangoirb_SOURCES = \ + SimpleHttpClient/SimpleHttpClient.cpp \ + SimpleHttpClient/SimpleHttpResult.cpp \ MRClient/MRubyClientConnection.cpp \ MRClient/arangoirb.cpp diff --git a/Makefile.in b/Makefile.in index 7aa3c1e77d..6472d3a144 100644 --- a/Makefile.in +++ b/Makefile.in @@ -418,9 +418,11 @@ am_arangoimp_OBJECTS = SimpleHttpClient/SimpleHttpClient.$(OBJEXT) \ V8Client/arangoimp.$(OBJEXT) arangoimp_OBJECTS = $(am_arangoimp_OBJECTS) arangoimp_DEPENDENCIES = libarango.a $(am__DEPENDENCIES_2) -am__arangoirb_SOURCES_DIST = MRClient/MRubyClientConnection.cpp \ - MRClient/arangoirb.cpp -@ENABLE_MRUBY_TRUE@am_arangoirb_OBJECTS = \ +am__arangoirb_SOURCES_DIST = SimpleHttpClient/SimpleHttpClient.cpp \ + SimpleHttpClient/SimpleHttpResult.cpp \ + MRClient/MRubyClientConnection.cpp MRClient/arangoirb.cpp +@ENABLE_MRUBY_TRUE@am_arangoirb_OBJECTS = SimpleHttpClient/SimpleHttpClient.$(OBJEXT) \ +@ENABLE_MRUBY_TRUE@ SimpleHttpClient/SimpleHttpResult.$(OBJEXT) \ @ENABLE_MRUBY_TRUE@ MRClient/MRubyClientConnection.$(OBJEXT) \ @ENABLE_MRUBY_TRUE@ MRClient/arangoirb.$(OBJEXT) arangoirb_OBJECTS = $(am_arangoirb_OBJECTS) @@ -866,6 +868,8 @@ arangosh_SOURCES = \ ################################################################################ @ENABLE_MRUBY_TRUE@arangoirb_LDADD = libarango.a $(LIBS) @ENABLE_MRUBY_TRUE@arangoirb_SOURCES = \ +@ENABLE_MRUBY_TRUE@ SimpleHttpClient/SimpleHttpClient.cpp \ +@ENABLE_MRUBY_TRUE@ SimpleHttpClient/SimpleHttpResult.cpp \ @ENABLE_MRUBY_TRUE@ MRClient/MRubyClientConnection.cpp \ @ENABLE_MRUBY_TRUE@ MRClient/arangoirb.cpp