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

simplify dependencies and docs handling

Browse Source
This commit is contained in:
XeroOl 2025-07-08 19:40:48 -05:00
parent 777083f12f
commit 3855e59cbf
2 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Makefile
View File

@ -11,17 +11,24 @@ PREFIX ?= /usr/local
BINDIR ?= $(PREFIX)/bin BINDIR ?= $(PREFIX)/bin
MANDIR ?= $(PREFIX)/share/man/man1 MANDIR ?= $(PREFIX)/share/man/man1
FENNELFLAGS ?= --add-package-path "deps/?.lua" --add-fennel-path "src/?.fnl;deps/?.fnl" VENDOR ?= true
REQUIRE_AS_INCLUDE_SETTINGS=$(shell $(FENNEL) tools/require-flags.fnl)
.PHONY: all clean test repl install docs docs-love2d install-deps ci selflint \ ifeq ($(VENDOR), true)
deps rm-docs rm-deps count testall check-deps FENNELFLAGS ?= --add-package-path "deps/?.lua" --add-fennel-path "src/?.fnl;deps/?.fnl"
REQUIRE_AS_INCLUDE_FLAGS = --require-as-include --skip-include fennel.compiler
else
FENNELFLAGS ?= --add-fennel-path "src/?.fnl"
REQUIRE_AS_INCLUDE_FLAGS = --require-as-include --skip-include fennel.compiler,fennel,dkjson
endif
.PHONY: all clean test repl install docs docs-love2d ci selflint \
deps count testall check-deps check-docs
all: $(EXE) all: $(EXE)
$(EXE): $(SRC) $(EXE): $(SRC)
echo "#!/usr/bin/env $(LUA)" > $@ echo "#!/usr/bin/env $(LUA)" > $@
$(FENNEL) $(FENNELFLAGS) $(REQUIRE_AS_INCLUDE_SETTINGS) --require-as-include \ $(FENNEL) $(FENNELFLAGS) $(REQUIRE_AS_INCLUDE_FLAGS) \
--compile src/fennel-ls.fnl >> $@ --compile src/fennel-ls.fnl >> $@
chmod 755 $@ chmod 755 $@
@ -46,9 +53,6 @@ docs-love2d:
@echo "https://wiki.fennel-lang.org/LanguageServer" @echo "https://wiki.fennel-lang.org/LanguageServer"
@exit 1 @exit 1
rm-docs:
rm -rf src/fennel-ls/docs/
build/fennel-ls.1: build/fennel-ls.1:
mkdir -p build/ mkdir -p build/
echo ".TH FENNEL-LS 1" > $@ echo ".TH FENNEL-LS 1" > $@
@ -58,9 +62,6 @@ build/fennel-ls.1:
deps: deps:
$(FENNEL) $(FENNELFLAGS) tools/get-deps.fnl $(FENNEL) $(FENNELFLAGS) tools/get-deps.fnl
rm-deps:
rm -rf fennel deps/
selflint: selflint:
$(FENNEL) $(FENNELFLAGS) src/fennel-ls.fnl --lint $(SRC) $(FENNEL) $(FENNELFLAGS) src/fennel-ls.fnl --lint $(SRC)
@ -91,10 +92,17 @@ check-deps:
diff -r fennel old-fennel diff -r fennel old-fennel
rm -rf old-deps old-fennel rm -rf old-deps old-fennel
check-docs:
rm -rf old-docs
mv src/fennel-ls/docs/generated old-docs
$(MAKE) docs
diff -r src/fennel-ls/docs/generated old-docs
rm -rf old-docs
ci: testall selflint ci: testall selflint
clean: clean:
rm -fr $(EXE) old-deps old-fennel build/ rm -fr $(EXE) old-deps old-fennel old-docs build/
# Steps to release a new fennel-ls version # Steps to release a new fennel-ls version

15
tools/require-flags.fnl
View File

@ -1,15 +0,0 @@
;; We only want to include our vendored files
;; If we're falling back to the user's system files, require can find them at runtime; no need to include
(local skip-when-file-not-present [[:fennel :deps/fennel.lua]
[:dkjson :deps/dkjson.lua]])
;; The fennel.compiler module has no file to include
(local always-skip [:fennel.compiler])
(local skip (icollect [_ [module file] (ipairs skip-when-file-not-present)
&into always-skip]
(if (not (io.open file "r"))
module)))
(when (< 0 (length skip))
(print (.. "--skip-include " (table.concat skip ","))))