fey.naomi/fennel-ls
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

defeat grep, and make FENNEL depend on vendor instead of file presence

Browse Source
This commit is contained in:
XeroOl 2025-07-30 14:24:53 -05:00
parent 4167e02c30
commit ce2b390f8d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -1,10 +1,9 @@
LUA ?= lua LUA ?= lua
# If ./fennel is present, use `lua fennel` to run the locally vendored fennel # If ./fennel is present, use `lua fennel` to run the locally vendored fennel
# otherwise # otherwise
FENNEL=$(if $(wildcard fennel),$(LUA) fennel,fennel)
EXE=fennel-ls EXE=fennel-ls
SRC:=$(shell find src -name "*.fnl" | grep -v "/generated/") SRC:=$(shell find src -name "*.fnl" ! -path "*/generated/*")
TOOLS:=$(shell find tools -name "*.fnl") TOOLS:=$(shell find tools -name "*.fnl")
DESTDIR ?= DESTDIR ?=
@ -15,11 +14,13 @@ MANDIR ?= $(PREFIX)/share/man/man1
VENDOR ?= true VENDOR ?= true
ifeq ($(VENDOR), true) ifeq ($(VENDOR), true)
FENNEL ?= $(LUA) fennel
FENNELFLAGS ?= --add-package-path "deps/?.lua" --add-fennel-path "src/?.fnl;deps/?.fnl" FENNELFLAGS ?= --add-package-path "deps/?.lua" --add-fennel-path "src/?.fnl;deps/?.fnl"
REQUIRE_AS_INCLUDE_FLAGS = --require-as-include --skip-include fennel.compiler REQUIRE_AS_INCLUDE_FLAGS = --require-as-include --skip-include fennel.compiler,fennel.specials
else else
FENNEL ?= fennel
FENNELFLAGS ?= --add-fennel-path "src/?.fnl" FENNELFLAGS ?= --add-fennel-path "src/?.fnl"
REQUIRE_AS_INCLUDE_FLAGS = --require-as-include --skip-include fennel.compiler,fennel,dkjson REQUIRE_AS_INCLUDE_FLAGS = --require-as-include --skip-include fennel.compiler,fennel.specials,fennel,dkjson
endif endif
.PHONY: all clean test repl install docs docs-love2d ci selflint \ .PHONY: all clean test repl install docs docs-love2d ci selflint \
@ -76,7 +77,7 @@ selflint:
$(FENNEL) $(FENNELFLAGS) src/fennel-ls.fnl --lint $(SRC) $(shell find test -name "*.fnl") $(FENNEL) $(FENNELFLAGS) src/fennel-ls.fnl --lint $(SRC) $(shell find test -name "*.fnl")
count: count:
cloc $(shell find src -name "*.fnl" | grep -v "generated") cloc $(shell find src -name "*.fnl" ! -path "*/generated/*")
repl: repl:
DEV=y $(FENNEL) $(FENNELFLAGS) DEV=y $(FENNEL) $(FENNELFLAGS)