Rainbows! Rack HTTP server user/dev discussion
 help / color / mirror / code / Atom feed
* [PATCH] Update eventmachine to 1.0.3 which compiles under Ruby 2.0
@ 2013-09-12 16:48 Lin Jen-Shin
       [not found] ` <1379004491-71337-1-git-send-email-godfat-hOE/xeEBYYIdnm+yROfE0A@public.gmane.org>
  0 siblings, 1 reply; 4+ messages in thread
From: Lin Jen-Shin @ 2013-09-12 16:48 UTC (permalink / raw)
  To: rainbows-talk-GrnCvJ7WPxnNLxjTenLetw; +Cc: Lin Jen-Shin

---
 t/GNUmakefile     | 10 ++--------
 t/test_isolate.rb |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/t/GNUmakefile b/t/GNUmakefile
index 19aacbe..eaa200a 100644
--- a/t/GNUmakefile
+++ b/t/GNUmakefile
@@ -45,14 +45,8 @@ ifeq ($(RUBY_ENGINE),ruby)
     models += CoolioThreadPool
     models += CoolioThreadSpawn
     models += CoolioFiberSpawn
-
-    # EventMachine 1.0.0 currently does not build on Ruby 2.0.0
-    # NeverBlock depends on 2.0.0
-    RBTWO := $(shell case $(RUBY_VERSION) in 2.0.*$(rp) echo true;;esac)
-    ifeq ($(RBTWO),)
-      models += EventMachine
-      models += NeverBlock
-    endif
+    models += EventMachine
+    models += NeverBlock
   endif
 endif
 
diff --git a/t/test_isolate.rb b/t/test_isolate.rb
index f5f97b1..e86419a 100644
--- a/t/test_isolate.rb
+++ b/t/test_isolate.rb
@@ -26,7 +26,7 @@ Isolate.now!(opts) do
     gem 'sendfile', '1.1.0'
     gem 'cool.io', '1.1.0'
 
-    gem 'eventmachine', '1.0.0'
+    gem 'eventmachine', '1.0.3'
     gem 'sinatra', '1.3.3'
     gem 'async_sinatra', '1.0.0'
 
-- 
1.8.4

_______________________________________________
Rainbows! mailing list - rainbows-talk-GrnCvJ7WPxnNLxjTenLetw@public.gmane.org
http://rubyforge.org/mailman/listinfo/rainbows-talk
Do not quote signatures (like this one) or top post when replying


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2013-09-23 22:44 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-09-12 16:48 [PATCH] Update eventmachine to 1.0.3 which compiles under Ruby 2.0 Lin Jen-Shin
     [not found] ` <1379004491-71337-1-git-send-email-godfat-hOE/xeEBYYIdnm+yROfE0A@public.gmane.org>
2013-09-13 18:19   ` Eric Wong
     [not found]     ` <20130913181933.GA11118-yBiyF41qdooeIZ0/mPfg9Q@public.gmane.org>
2013-09-13 19:13       ` Lin Jen-Shin (godfat)
     [not found]         ` <CAA2_N1sDC2bJd8kQC+V2_M=UAL2xrUYEjWPS5hWBwmXiN6LM6w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-09-23 22:44           ` Cramp support for Ruby 2.0? Eric Wong

Code repositories for project(s) associated with this inbox:

	../../../rainbows.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).