Rainbows! Rack HTTP server user/dev discussion
 help / color / mirror / code / Atom feed
From: Lin Jen-Shin <godfat-hOE/xeEBYYIdnm+yROfE0A@public.gmane.org>
To: rainbows-talk-GrnCvJ7WPxnNLxjTenLetw@public.gmane.org
Cc: Lin Jen-Shin <godfat-hOE/xeEBYYIdnm+yROfE0A@public.gmane.org>
Subject: [PATCH] Update eventmachine to 1.0.3 which compiles under Ruby 2.0
Date: Fri, 13 Sep 2013 00:48:11 +0800	[thread overview]
Message-ID: <1379004491-71337-1-git-send-email-godfat@godfat.org> (raw)

---
 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


             reply	other threads:[~2013-09-12 16:55 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-12 16:48 Lin Jen-Shin [this message]
     [not found] ` <1379004491-71337-1-git-send-email-godfat-hOE/xeEBYYIdnm+yROfE0A@public.gmane.org>
2013-09-13 18:19   ` [PATCH] Update eventmachine to 1.0.3 which compiles under Ruby 2.0 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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://yhbt.net/rainbows/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1379004491-71337-1-git-send-email-godfat@godfat.org \
    --to=godfat-hoe/xeebyyidnm+yrofe0a@public.gmane.org \
    --cc=rainbows-talk-GrnCvJ7WPxnNLxjTenLetw@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhbt.net/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).