From: Eric Wong <e@80x24.org>
To: unicorn-public@bogomips.org
Subject: [PATCH 1/3] dev: remove isolate dependency
Date: Sun, 17 Aug 2014 02:33:53 +0000 [thread overview]
Message-ID: <1408242835-21114-2-git-send-email-e@80x24.org> (raw)
In-Reply-To: <1408242835-21114-1-git-send-email-e@80x24.org>
It seems unnecessary with current versions of RubyGems
supporting development dependencies.
---
GNUmakefile | 6 +-----
script/isolate_for_tests | 31 -------------------------------
t/GNUmakefile | 6 +-----
unicorn.gemspec | 1 -
4 files changed, 2 insertions(+), 42 deletions(-)
delete mode 100755 script/isolate_for_tests
diff --git a/GNUmakefile b/GNUmakefile
index 00a6ace..50819fc 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -23,11 +23,7 @@ endif
RUBY_ENGINE := $(shell $(RUBY) -e 'puts((RUBY_ENGINE rescue "ruby"))')
-isolate_libs := tmp/isolate/$(RUBY_ENGINE)-$(RUBY_VERSION).mk
-$(isolate_libs): script/isolate_for_tests
- @$(RUBY) script/isolate_for_tests
--include $(isolate_libs)
-MYLIBS = $(RUBYLIB):$(ISOLATE_LIBS)
+MYLIBS = $(RUBYLIB)
# dunno how to implement this as concisely in Ruby, and hell, I love awk
awk_slow := awk '/def test_/{print FILENAME"--"$$2".n"}' 2>/dev/null
diff --git a/script/isolate_for_tests b/script/isolate_for_tests
deleted file mode 100755
index 6f5dced..0000000
--- a/script/isolate_for_tests
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-# scripts/Makefiles can read and eval the output of this script and
-# use it as RUBYLIB
-require 'rubygems'
-require 'isolate'
-fp = File.open(__FILE__, "rb")
-fp.flock(File::LOCK_EX)
-
-ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
-opts = {
- :system => false,
- # we want "ruby-1.8.7" and not "ruby-1.8", so disable :multiruby
- :multiruby => false,
- :path => "tmp/isolate/#{ruby_engine}-#{RUBY_VERSION}",
-}
-
-pid = fork do
- Isolate.now!(opts) do
- gem 'raindrops', '0.13.0'
- gem 'kgio', '2.9.2'
- gem 'rack', '1.5.2'
- end
-end
-_, status = Process.waitpid2(pid)
-status.success? or abort status.inspect
-lib_paths = Dir["#{opts[:path]}/gems/*-*/lib"].map { |x| File.expand_path(x) }
-dst = "tmp/isolate/#{ruby_engine}-#{RUBY_VERSION}.mk"
-File.open("#{dst}.#$$", "w") do |fp|
- fp.puts "ISOLATE_LIBS=#{lib_paths.join(':')}"
-end
-File.rename("#{dst}.#$$", dst)
diff --git a/t/GNUmakefile b/t/GNUmakefile
index 8f2668c..5f5d9bc 100644
--- a/t/GNUmakefile
+++ b/t/GNUmakefile
@@ -17,11 +17,7 @@ endif
RUBY_ENGINE := $(shell $(RUBY) -e 'puts((RUBY_ENGINE rescue "ruby"))')
export RUBY_ENGINE
-isolate_libs := ../tmp/isolate/$(RUBY_ENGINE)-$(RUBY_VERSION).mk
-$(isolate_libs): ../script/isolate_for_tests
- @cd .. && $(RUBY) script/isolate_for_tests
--include $(isolate_libs)
-MYLIBS := $(RUBYLIB):$(ISOLATE_LIBS)
+MYLIBS := $(RUBYLIB)
T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
diff --git a/unicorn.gemspec b/unicorn.gemspec
index c0c8092..b24b1ac 100644
--- a/unicorn.gemspec
+++ b/unicorn.gemspec
@@ -37,7 +37,6 @@ Gem::Specification.new do |s|
s.add_dependency(%q<kgio>, '~> 2.6')
s.add_dependency(%q<raindrops>, '~> 0.7')
- s.add_development_dependency('isolate', '~> 3.2')
s.add_development_dependency('wrongdoc', '~> 1.8')
s.licenses = ["GPLv2+", "Ruby 1.8"]
--
EW
next prev parent reply other threads:[~2014-08-17 2:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-17 2:33 more house-cleaning for unicorn 5 Eric Wong
2014-08-17 2:33 ` Eric Wong [this message]
2014-08-17 2:33 ` [PATCH 2/3] unicorn.gemspec: depend on test-unit 3.0 Eric Wong
2014-08-17 2:33 ` [PATCH 3/3] http_response: remove Status: header 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/unicorn/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1408242835-21114-2-git-send-email-e@80x24.org \
--to=e@80x24.org \
--cc=unicorn-public@bogomips.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/unicorn.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).