From 5bcfeece2f55cd8570b1356d9982756e99f90b40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Fri, 18 Sep 2015 14:34:58 +0200 Subject: Test "no .app.src" by default, test legacy with LEGACY=1 Also fixes two bugs with the new "no .app.src" method. All tests now pass with both methods. We can now test specific cases with make check c=$CASE. --- plugins/bootstrap.mk | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'plugins/bootstrap.mk') diff --git a/plugins/bootstrap.mk b/plugins/bootstrap.mk index 7f8331e..44f10ea 100644 --- a/plugins/bootstrap.mk +++ b/plugins/bootstrap.mk @@ -49,6 +49,8 @@ endef ifdef SP define bs_Makefile PROJECT = $(PROJECT) +PROJECT_DESCRIPTION = New project +PROJECT_VERSION = 0.0.1 # Whitespace to be used when creating files from templates. SP = $(SP) @@ -355,7 +357,9 @@ ifneq ($(wildcard src/),) endif $(call render_template,bs_Makefile,Makefile) $(verbose) mkdir src/ +ifdef LEGACY $(call render_template,bs_appsrc,src/$(PROJECT).app.src) +endif $(call render_template,bs_app,src/$(PROJECT)_app.erl) $(eval n := $(PROJECT)_sup) $(call render_template,tpl_supervisor,src/$(PROJECT)_sup.erl) @@ -366,7 +370,9 @@ ifneq ($(wildcard src/),) endif $(call render_template,bs_Makefile,Makefile) $(verbose) mkdir src/ +ifdef LEGACY $(call render_template,bs_appsrc_lib,src/$(PROJECT).app.src) +endif bootstrap-rel: ifneq ($(wildcard relx.config),) -- cgit v1.2.3