diff --git a/Makefile b/Makefile index 510a382..f99ede2 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ REQUIRE_AS_INCLUDE_SETTINGS=$(shell $(FENNEL) tools/require-flags.fnl) ROCKSPEC_LATEST_SCM=rockspecs/fennel-ls-scm-$(shell ls rockspecs | grep -Eo 'scm-[0-9]+' | grep -Eo [0-9]+ | sort -n | tail -1).rockspec -.PHONY: all clean test repl install docs install-deps ci selflint \ +.PHONY: all clean test repl install docs install-deps ci selflint deps \ rm-docs rm-deps count all: $(EXE) @@ -65,13 +65,13 @@ ci: $(MAKE) test LUA=luajit # Make sure the dependency files are correct + rm -rf old-deps old-fennel mv deps old-deps mv fennel old-fennel $(MAKE) FENNEL=./old-fennel deps diff -r deps old-deps diff -r fennel old-fennel - rm -rf old-deps - rm -f old-fennel + rm -rf old-deps old-fennel # test that luarocks builds and runs luarocks install $(ROCKSPEC_LATEST_SCM) --dev --local @@ -79,4 +79,4 @@ ci: fennel-ls --lint clean: - rm -f $(EXE) + rm -fr $(EXE) old-deps old-fennel build/ diff --git a/README.md b/README.md index 62b1704..f8d66e4 100644 --- a/README.md +++ b/README.md @@ -11,12 +11,12 @@ Provides intelligent editing features for fennel files. ## License fennel-ls is licensed under the MIT license. See LICENSE for more info. -This project also contains files from other projects: -* `fennel` and `deps/fennel.lua` are compiled from [fennel](https://git.sr.ht/~technomancy/fennel) [MIT license] -* `deps/faith.lua` is from [faith](https://git.sr.ht/~technomancy/faith) [MIT license] -* `deps/pl/stringio.lua` is from [Penlight](https://github.com/lunarmodules/Penlight) [MIT license] -* `deps/dkjson.lua` is from [dkjson](http://dkolf.de/dkjson-lua/) [MIT license] +This repository also contains files from other projects: +* `fennel` and `deps/fennel.lua` are compiled from [fennel](https://git.sr.ht/~technomancy/fennel) [MIT license] +* `deps/dkjson.lua` is from [dkjson](http://dkolf.de/dkjson-lua/) [MIT license] +* `deps/faith.lua` is from [faith](https://git.sr.ht/~technomancy/faith) [MIT license] (test only) +* `deps/pl/stringio.lua` is from [Penlight](https://github.com/lunarmodules/Penlight) [MIT license] (test only) * `src/fennel-ls/docs/generated/*` contains files generated from other sources. It contains information from: * the [lua](https://lua.org) reference [MIT license] * [TIC80's "learn" webpage](https://tic80.com/learn) [MIT license] diff --git a/tools/get-deps.fnl b/tools/get-deps.fnl index 9024d09..eb067ec 100644 --- a/tools/get-deps.fnl +++ b/tools/get-deps.fnl @@ -5,7 +5,8 @@ (sh :git :clone :-c :advice.detachedHead=false :--depth=1 :--branch tag url location) (sh :git :clone :-c :advice.detachedHead=false :--depth=1 url location))) -(local fennel-version "1.5.1") +;; TODO: currently you have to run make clean after changing any of these +(local fennel-version "1.5.3") (local faith-version "0.2.0") (local penlight-version "1.14.0") (local dkjson-version "2.7")