Adopt makem.sh for build support (linting, running tests)

.github/workflows/test.yml

@@ -58,7 +58,8 @@ jobs:
     - name: Byte compilation
       run: emacs --eval "(setq byte-compile-error-on-warn (>= emacs-major-version 26))" -L . --batch -f batch-byte-compile ./*.el
     - name: Tests
-      run: nix shell ${{ matrix.ledger_version || 'nixpkgs#ledger' }} --print-build-logs -c make -C test
+      run: nix shell 'nixpkgs#getopt' ${{ matrix.ledger_version || 'nixpkgs#ledger' }} --print-build-logs -c ./makem.sh test -vv
     # This is currently for information only, since a lot of docstrings need fixing up
     - name: Checkdoc
-      run: make -C test checkdoc || true
+      run: make lint-checkdoc || true
+    # TODO: Run other makem.sh lints

.gitignore

@@ -1,6 +1,2 @@
 *.elc
 *~
-CMakeCache.txt
-CMakeFiles/
-/Makefile
-cmake_install.cmake

CONTRIBUTING.md

@@ -2,7 +2,7 @@ Tips for contributors
 ---------------------
 
 * In your local repository, ensure that everything compiles by **running
-  `cmake . && make`** (this will launch byte compilation of lisp files and regression
+  `make`** (this will launch byte compilation of lisp files and regression
   tests).
 * You are then ready to make a **pull request**. Please make pull requests
   **against `master`**.
@@ -30,6 +30,9 @@ description on GitHub.
 
 **./LICENSE.md**: the [GPLv2] license.
 
+**./makem.sh** and **./Makefile**: build scripts for linting and testing this
+project, copied from [makem].
+
 **./*.el**: the [Emacs] ledger-mode lisp code.
 
 **./doc/**: documentation, and tools for generating documents such as the *pdf*
@@ -47,3 +50,4 @@ manual.
 [Emacs]: http://www.gnu.org/software/emacs/
 [GPLv2]: http://www.gnu.org/licenses/gpl-2.0.html
 [github]: https://github.com/ledger/ledger-mode/
+[makem]: https://github.com/alphapapa/makem.sh/

Makefile

@@ -0,0 +1,59 @@
+# * makem.sh/Makefile --- Script to aid building and testing Emacs Lisp packages
+
+# URL: https://github.com/alphapapa/makem.sh
+# Version: 0.5
+
+# * Arguments
+
+# For consistency, we use only var=val options, not hyphen-prefixed options.
+
+# NOTE: I don't like duplicating the arguments here and in makem.sh,
+# but I haven't been able to find a way to pass arguments which
+# conflict with Make's own arguments through Make to the script.
+# Using -- doesn't seem to do it.
+
+ifdef install-deps
+	INSTALL_DEPS = "--install-deps"
+endif
+ifdef install-linters
+	INSTALL_LINTERS = "--install-linters"
+endif
+
+ifdef sandbox
+	ifeq ($(sandbox), t)
+		SANDBOX = --sandbox
+	else
+		SANDBOX = --sandbox=$(sandbox)
+	endif
+endif
+
+ifdef debug
+	DEBUG = "--debug"
+endif
+
+# ** Verbosity
+
+# Since the "-v" in "make -v" gets intercepted by Make itself, we have
+# to use a variable.
+
+verbose = $(v)
+
+ifneq (,$(findstring vvv,$(verbose)))
+	VERBOSE = "-vvv"
+else ifneq (,$(findstring vv,$(verbose)))
+	VERBOSE = "-vv"
+else ifneq (,$(findstring v,$(verbose)))
+	VERBOSE = "-v"
+endif
+
+# * Rules
+
+# TODO: Handle cases in which "test" or "tests" are called and a
+# directory by that name exists, which can confuse Make.
+
+%:
+	@./makem.sh $(DEBUG) $(VERBOSE) $(SANDBOX) $(INSTALL_DEPS) $(INSTALL_LINTERS) $(@)
+
+.DEFAULT: init
+init:
+	@./makem.sh $(DEBUG) $(VERBOSE) $(SANDBOX) $(INSTALL_DEPS) $(INSTALL_LINTERS)

ledger-complete.el

@@ -23,8 +23,7 @@
 ;; Functions providing payee and account auto complete.
 
 (require 'cl-lib)
-(eval-when-compile
-  (require 'subr-x))
+(eval-when-compile (require 'subr-x))
 
 ;; In-place completion support
 

ledger-mode.el

@@ -30,6 +30,7 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'subr-x))
 (require 'ledger-regex)
 (require 'org)
 (require 'ledger-commodities)

ledger-occur.el

@@ -30,6 +30,7 @@
 ;;; Code:
 
 (require 'cl-lib)
+(eval-when-compile (require 'subr-x))
 (require 'ledger-navigate)
 
 (defconst ledger-occur-overlay-property-name 'ledger-occur-custom-buffer-grep)

ledger-post.el

@@ -23,6 +23,7 @@
 ;;; Commentary:
 ;; Utility functions for dealing with postings.
 
+(eval-when-compile (require 'subr-x))
 (require 'ledger-regex)
 (require 'ledger-navigate)
 

ledger-reconcile.el

@@ -27,6 +27,7 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'subr-x))
 (require 'easymenu)
 (require 'ledger-init)
 

ledger-xact.el

@@ -25,6 +25,7 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'subr-x))
 (require 'eshell)
 (require 'ledger-regex)
 (require 'ledger-navigate)