diff options
author | Eric Wong <normalperson@yhbt.net> | 2015-01-12 07:44:22 +0000 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2015-01-12 07:44:22 +0000 |
commit | c8c0fa4d97499a7db6fbe3f9bd6baf4ee9a66074 (patch) | |
tree | 96feb48df8b798e63a8b42af2080cb0d0ce303b5 | |
parent | 98d594abf5053b70fe16459cb80da042bfcea510 (diff) | |
download | ruby_posix_mq-c8c0fa4d97499a7db6fbe3f9bd6baf4ee9a66074.tar.gz |
* We're not using isolate anymore * support EXTCONF_ARGS env for building * add "make check" as an alias for "make test" (muscle memory for GNU-autotools projects)
-rw-r--r-- | pkg.mk | 17 |
1 files changed, 5 insertions, 12 deletions
@@ -13,14 +13,6 @@ RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION') RUBY_ENGINE := $(shell $(RUBY) -e 'puts((RUBY_ENGINE rescue "ruby"))') lib := lib -ifeq ($(shell test -f script/isolate_for_tests && echo t),t) -isolate_libs := tmp/isolate/$(RUBY_ENGINE)-$(RUBY_VERSION)/isolate.mk -$(isolate_libs): script/isolate_for_tests - @$(RUBY) script/isolate_for_tests --include $(isolate_libs) -lib := $(lib):$(ISOLATE_LIBS) -endif - ext := $(firstword $(wildcard ext/*)) ifneq ($(ext),) ext_pfx := tmp/ext/$(RUBY_ENGINE)-$(RUBY_VERSION) @@ -37,7 +29,7 @@ $(ext_pfx)/$(ext)/%: $(ext)/% $(ext_d) install -m 644 $< $@ $(ext_pfx)/$(ext)/Makefile: $(ext)/extconf.rb $(ext_d) $(ext_h) $(RM) -f $(@D)/*.o - cd $(@D) && $(RUBY) $(CURDIR)/$(ext)/extconf.rb + cd $(@D) && $(RUBY) $(CURDIR)/$(ext)/extconf.rb $(EXTCONF_ARGS) ext_sfx := _ext.$(DLEXT) ext_dl := $(ext_pfx)/$(ext)/$(notdir $(ext)_ext.$(DLEXT)) $(ext_dl): $(ext_src) $(ext_pfx_src) $(ext_pfx)/$(ext)/Makefile @@ -121,9 +113,10 @@ gem install-gem: GIT-VERSION-FILE $(MAKE) $@ VERSION=$(GIT_VERSION) endif -all:: test +all:: check test_units := $(wildcard test/test_*.rb) -test: test-unit +test: check +check: test-unit test-unit: $(test_units) $(test_units): build $(RUBY) -I $(lib) $@ $(RUBY_TEST_OPTS) @@ -153,5 +146,5 @@ $(PLACEHOLDERS): echo olddoc_placeholder > $@ endif -.PHONY: all .FORCE-GIT-VERSION-FILE doc test $(test_units) manifest +.PHONY: all .FORCE-GIT-VERSION-FILE doc check test $(test_units) manifest .PHONY: check-warnings |