From e290d4fa9831db51a016b86f9f5da3b63a0d3081 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 4 Feb 2017 12:31:48 +0100 Subject: [PATCH] Add Makefile setup for building libimagruby + thermite bundling --- Makefile | 4 ++-- libimagruby/Makefile | 26 ++++++++++++++------------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 9d104368..b46a852a 100644 --- a/Makefile +++ b/Makefile @@ -53,9 +53,9 @@ lib: $(LIB_TARGETS) lib-test: $(LIB_TARGETS_TEST) lib-imag-ruby-test: - @$(MAKE) -C libimagruby + @$(MAKE) -C libimagruby test -test: bin-test lib-test +test: bin-test lib-test lib-imag-ruby-test install: $(INSTALL_TARGETS) imag-bin-install @$(ECHO) "\t[INSTALL]" diff --git a/libimagruby/Makefile b/libimagruby/Makefile index f7ed82d6..f597909a 100644 --- a/libimagruby/Makefile +++ b/libimagruby/Makefile @@ -1,20 +1,22 @@ ECHO=$(shell which echo) -e RUBY=$(shell which ruby) -RUBY_TESTS=$(shell find ./test -maxdepth 1 -name "*.rb" -type f) -RUBY_TEST_TARGETS=$(foreach x,$(subst ,,$(RUBY_TESTS)),$(x)) +BUNDLE=$(shell which bundle) -all: lib +all: + @$(ECHO) "There is no default target here" -lib: - $(MAKE) -C .. libimagruby +bundle: + @$(ECHO) "[BUNDLE]" + @$(BUNDLE) install --path vendor/bundle -lib-release: - $(MAKE) -C .. libimagruby-release +bundle-rake-thermite-test: + @$(ECHO) "[RAKE ][thermite]" + @CARGO_TARGET=debug $(BUNDLE) exec rake thermite:tarball -test: lib $(RUBY_TEST_TARGETS) - -$(RUBY_TEST_TARGETS): %: lib .FORCE - @$(ECHO) "\t[TEST ]:\t$@" - @$(RUBY) $(subst -test,,$@) +test: lib bundle-rake-thermite-test + @$(ECHO) "[TEST ]" .FORCE: + +.PHONY: all +