Be coherent on the name of the package

The package name is lambdapi-mode
Deducteam · Apr 24, 2024 · 51e19d3 · 51e19d3
1 parent 21cdb69
commit 51e19d3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
@@ -1,7 +1,7 @@
 .POSIX:
 
 VERSION = 1.1.0
-NAME = lambdapi
+NAME = lambdapi-mode
 
 EMACS = emacs
 
@@ -11,7 +11,7 @@ SRC += lambdapi-capf.el
 SRC += lambdapi-input.el
 SRC += lambdapi-layout.el
 SRC += lambdapi-mode.el
-SRC += lambdapi-pkg.el
+SRC += lambdapi-mode-pkg.el
 SRC += lambdapi-proofs.el
 SRC += lambdapi-smie.el
 SRC += lambdapi-vars.el
@@ -36,7 +36,7 @@ dist: $(NAME)-$(VERSION).tar
 
 .PHONY: check
 check: dist
-	./test.sh $(VERSION)
+	./test.sh "$(NAME)" "$(VERSION)"
 
 .PHONY: clean
 clean:

diff --git a/editors/emacs/lambdapi-pkg.el → editors/emacs/lambdapi-mode-pkg.el b/editors/emacs/lambdapi-pkg.el → editors/emacs/lambdapi-mode-pkg.el
@@ -1,4 +1,4 @@
-(define-package "lambdapi" "1.1.0"
+(define-package "lambdapi-mode" "1.1.0"
   "A major mode to edit Lambdapi files."
   '((eglot "1.6")
     (math-symbol-lists "1.2.1")

diff --git a/editors/emacs/test.sh b/editors/emacs/test.sh
@@ -4,11 +4,13 @@
 ## directory and launches emacs in it. You  can create a new 'foo.lp' to try the
 ## mode.
 ##
-## Takes the version of the mode as first argument
+## Usage: tests.sh NAME VERSION
 set -eu
+NAME="$1"
+VERSION="$2"
 tmp="$(mktemp -d)"
 make dist
-cp "lambdapi-$1.tar" "${tmp}"
+cp "${NAME}-${VERSION}.tar" "${tmp}"
 (cd "${tmp}" || exit 1
  curl https://sanemacs.com/sanemacs.el > sanemacs.el
  {
@@ -18,5 +20,5 @@ cp "lambdapi-$1.tar" "${tmp}"
      echo '(use-package highlight)';
  } >> sanemacs.el
  emacs --quick -l sanemacs.el \
-     --eval "(package-install-file \"lambdapi-$1.tar\")")
+     --eval "(package-install-file \"${NAME}-${VERSION}.tar\")")
 rm -rf "${tmp}"