From 270beed0505ef47159d94fb162ff4840958f3ce5 Mon Sep 17 00:00:00 2001
From: Andrey Orst <andreyorst@gmail.com>
Date: Tue, 19 Jan 2021 16:46:00 +0000
Subject: fix: Fennel 0.8.0 enhancements

Changelog:

- fixed bug in try
- reworked pretty printing for sets
  - handle cycles in sets
  - use new fennel.view format
- reorganized library to make requiring it easier
---
 Makefile | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 6a313b8..83f78f7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,12 @@
 LUA ?= lua
 FENNEL ?= fennel
-FNLSOURCES = cljlib.fnl
+FNLSOURCES = init.fnl
 LUASOURCES = $(FNLSOURCES:.fnl=.lua)
 FNLTESTS = tests/fn.fnl tests/macros.fnl tests/core.fnl
 LUATESTS = $(FNLTESTS:.fnl=.lua)
+LUA_EXECUTABLES ?= lua luajit
 
-.PHONY: build clean distclean help test luacov luacov-console fenneldoc
+.PHONY: build clean distclean help test luacov luacov-console fenneldoc $(LUA_EXECUTABLES)
 
 build: $(LUASOURCES)
 
@@ -21,10 +22,14 @@ distclean: clean
 	rm -f luacov*
 
 test: $(FNLTESTS)
-	@true$(foreach test, $?, && $(FENNEL) --lua $(LUA) --metadata $(test))
+	@echo "Testing on" $$($(LUA) -v) >&2
+	@$(foreach test,$?,$(FENNEL) --lua $(LUA) --metadata $(test) || exit;)
+
+testall: $(LUA_EXECUTABLES)
+	@$(foreach lua,$?,LUA=$(lua) make test || exit;)
 
 luacov: build $(LUATESTS)
-	@true$(foreach test, $(LUATESTS), && $(LUA) -lluarocks.loader -lluacov $(test))
+	@$(foreach test,$(LUATESTS),$(LUA) -lluarocks.loader -lluacov $(test) || exit;)
 	luacov
 
 luacov-console: luacov
@@ -33,7 +38,7 @@ luacov-console: luacov
 	@$(foreach test, $(LUATESTS), mv $(test).tmp $(test);)
 
 fenneldoc:
-	fenneldoc cljlib.fnl cljlib-macros.fnl tests/test.fnl
+	fenneldoc init.fnl macros.fnl tests/test.fnl
 
 help:
 	@echo "make                -- run tests and create lua library" >&2
-- 
cgit v1.2.3