GNUmakefile in zbatery-0.3.0

- old
+ new

@@ -2,10 +2,11 @@
 
 all::
 
 pid := $(shell echo $$PPID)
 
+MRI = ruby
 RUBY = ruby
 zbatery_lib := $(shell cd ../lib && pwd)
 -include ../local.mk
 ifeq ($(RUBY_VERSION),)
   RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION')
@@ -13,33 +14,37 @@
 
 ifeq ($(RUBY_VERSION),)
   $(error unable to detect RUBY_VERSION)
 endif
 
-ifeq ($(RUBYLIB),)
-  RUBYLIB := $(zbatery_lib)
-else
-  RUBYLIB := $(zbatery_lib):$(RUBYLIB)
-endif
-export RUBYLIB RUBY_VERSION
+RUBY_ENGINE := $(shell $(RUBY) -e 'puts((RUBY_ENGINE rescue "ruby"))')
+export RUBY_VERSION RUBY_ENGINE
 
+models += WriterThreadPool
+models += WriterThreadSpawn
 models += ThreadPool
 models += ThreadSpawn
 models += Rev
 models += EventMachine
 models += NeverBlock
 models += RevThreadSpawn
 models += RevThreadPool
 
-rp := )
-ONENINE := $(shell case $(RUBY_VERSION) in 1.9.*$(rp) echo true;;esac)
-ifeq ($(ONENINE),true)
-  models += Revactor
-  models += FiberSpawn
-  models += RevFiberSpawn
-  models += FiberPool
+ifeq ($(RUBY_ENGINE),ruby)
+  rp := )
+  ONENINE := $(shell case $(RUBY_VERSION) in 1.9.*$(rp) echo true;;esac)
+  ifeq ($(ONENINE),true)
+    models += Revactor
+    models += FiberSpawn
+    models += RevFiberSpawn
+    models += FiberPool
+  endif
 endif
+
+ifeq ($(RUBY_ENGINE),rbx)
+  models += ActorSpawn
+endif
 all_models := $(models) Base
 
 T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
 
 MODEL_T := $(foreach m,$(all_models),$(addprefix $(m).,$(T)))
@@ -61,11 +66,11 @@
 	$(MAKE) $(filter $@.%,$(MODEL_T))
 
 all:: $(T)
 
 # can't rely on "set -o pipefail" since we don't require bash or ksh93 :<
-t_pfx = trash/$@-$(RUBY_VERSION)
+t_pfx = trash/$@-$(RUBY_ENGINE)-$(RUBY_VERSION)
 TEST_OPTS =
 # TRACER = strace -f -o $(t_pfx).strace -s 100000
 # TRACER = /usr/bin/time -o $(t_pfx).time
 
 ifdef V
@@ -74,15 +79,17 @@
   else
     TEST_OPTS += --verbose
   endif
 endif
 
-test-bin-$(RUBY_VERSION)/zbatery: ruby_bin = $(shell which $(RUBY))
-test-bin-$(RUBY_VERSION)/zbatery: ../bin/zbatery
+bindir := $(CURDIR)/bin-$(RUBY_ENGINE)-$(RUBY_VERSION)
+bin_zbatery := $(bindir)/zbatery
+$(bin_zbatery): ruby_bin = $(shell which $(RUBY))
+$(bin_zbatery): ../bin/zbatery
 	mkdir -p $(@D)
 	install -m 755 $^ $@.$(pid)
-	$(RUBY) -i -p -e '$$_.gsub!(%r{^#!.*$$},"#!$(ruby_bin)")' $@.$(pid)
+	$(MRI) -i -p -e '$$_.gsub!(%r{^#!.*$$},"#!$(ruby_bin)")' $@.$(pid)
 	mv $@.$(pid) $@
 
 random_blob:
 	dd if=/dev/urandom bs=1M count=30 of=$@.$(pid)
 	mv $@.$(pid) $@
@@ -95,23 +102,30 @@
 $(deps):
 	@which $(dep_bin) > $@.$(pid) 2>/dev/null || :
 	@test -s $@.$(pid) || \
 	  { echo >&2 "E '$(dep_bin)' not found in PATH=$(PATH)"; exit 1; }
 	@mv $@.$(pid) $@
-dep: $(deps)
 
+libs := tmp/isolate/$(RUBY_ENGINE)-$(RUBY_VERSION)/.libs
+$(libs): test_isolate.rb
+	mkdir -p $(@D)
+	$(RUBY) $< > $@+
+	mv $@+ $@
+t_deps := $(libs) $(deps) $(bin_zbatery) trash/.gitignore
+$(T): $(t_deps)
+
 $(MODEL_T): export model = $(firstword $(subst ., ,$@))
 $(MODEL_T): script = $(subst $(model).,,$@)
-$(MODEL_T): trash/.gitignore
 $(MODEL_T): export RUBY := $(RUBY)
-$(MODEL_T): export PATH := $(CURDIR)/test-bin-$(RUBY_VERSION):$(PATH)
-$(MODEL_T): test-bin-$(RUBY_VERSION)/zbatery dep
-	$(TRACER) $(SHELL) $(SH_TEST_OPTS) $(script) $(TEST_OPTS)
+$(MODEL_T): export PATH := $(bindir):$(PATH)
+$(MODEL_T): $(t_deps)
+	RUBYLIB=$(zbatery_lib):$$(cat $(libs)) \
+	   $(TRACER) $(SHELL) $(SH_TEST_OPTS) $(script) $(TEST_OPTS)
 
 trash/.gitignore:
 	mkdir -p $(@D)
 	echo '*' > $@
 
 clean:
-	$(RM) -r trash/*.log trash/*.code test-bin-$(RUBY_VERSION)
+	$(RM) -r trash/*.log trash/*.code $(bindir)
 
 .PHONY: $(T) clean