branch: elpa/casual
commit 3f77f981dace538a1e91b7ee09fc4dd2a03b5acc
Author: Charles Choi <[email protected]>
Commit: Charles Choi <[email protected]>
Amendments per input from pkal
* lisp/casual-csv-utils.el: Using setopt as convention for modifying
customizable variables.
* Makefile Improvements and Commentary
- CASUAL_BASE_DIR changed to not use absolute path.
- Use more sensible variable naming.
- CASUAL_LIB_DIR removed
- CASUAL_LIB_LISP_DIR renamed to CASUAL_LISP_DIR
-
* lisp/Makefile-agenda.make: Reply to pkal: Inclusion of compat library is
due
to transient package dependency on it.
---
Makefile | 3 +++
lisp/Makefile--defines.make | 7 +++----
lisp/Makefile--rules.make | 4 ++--
lisp/Makefile-agenda.make | 4 ++--
lisp/Makefile-bibtex.make | 2 +-
lisp/Makefile-bookmarks.make | 2 +-
lisp/Makefile-calc.make | 2 +-
lisp/Makefile-calendar.make | 2 +-
lisp/Makefile-compile.make | 2 +-
lisp/Makefile-css.make | 2 +-
lisp/Makefile-csv.make | 2 +-
lisp/Makefile-dired.make | 2 +-
lisp/Makefile-ediff.make | 2 +-
lisp/Makefile-editkit.make | 2 +-
lisp/Makefile-elisp.make | 2 +-
lisp/Makefile-eshell.make | 2 +-
lisp/Makefile-eww.make | 2 +-
lisp/Makefile-help.make | 2 +-
lisp/Makefile-html.make | 2 +-
lisp/Makefile-ibuffer.make | 2 +-
lisp/Makefile-image.make | 2 +-
lisp/Makefile-info.make | 2 +-
lisp/Makefile-isearch.make | 6 +++---
lisp/Makefile-lib.make | 2 +-
lisp/Makefile-make-mode.make | 2 +-
lisp/Makefile-man.make | 2 +-
lisp/Makefile-org.make | 2 +-
lisp/Makefile-re-builder.make | 2 +-
lisp/Makefile-timezone.make | 2 +-
lisp/casual-csv-utils.el | 2 +-
templates/lisp/Makefile-MODULE.make | 2 +-
31 files changed, 39 insertions(+), 37 deletions(-)
diff --git a/Makefile b/Makefile
index d873e91f07..6dbd028804 100644
--- a/Makefile
+++ b/Makefile
@@ -72,6 +72,9 @@ status
tests:
$(MAKE) -C $(LISP_DIR) tests
+tests/%:
+ $(MAKE) -C tests $*
+
## Bump Patch Version
bump-casual:
sed -i 's/;; Version: $(VERSION)/;; Version: $(VERSION_BUMP)/'
$(MAIN_EL)
diff --git a/lisp/Makefile--defines.make b/lisp/Makefile--defines.make
index 1b00e131fd..2e5b341255 100644
--- a/lisp/Makefile--defines.make
+++ b/lisp/Makefile--defines.make
@@ -31,8 +31,7 @@ else
EXEC_NAME=emacs
endif
-CASUAL_BASE_DIR=$(PWD)/..
-CASUAL_LIB_DIR=$(CASUAL_BASE_DIR)/casual
-CASUAL_LIB_LISP_DIR=$(CASUAL_LIB_DIR)/lisp
-CASUAL_LIB_TEST_INCLUDES=$(CASUAL_LIB_DIR)/tests/casual-lib-test-utils.el
+CASUAL_BASE_DIR=$(abspath $(shell pwd)/..)
+CASUAL_LISP_DIR=$(CASUAL_BASE_DIR)/lisp
+CASUAL_TEST_INCLUDES=$(CASUAL_BASE_DIR)/tests/casual-lib-test-utils.el
EMACS_ELPA_DIR=$(HOME)/.config/emacs/elpa
diff --git a/lisp/Makefile--rules.make b/lisp/Makefile--rules.make
index 98e14bf15c..c1c5d18fe3 100644
--- a/lisp/Makefile--rules.make
+++ b/lisp/Makefile--rules.make
@@ -27,7 +27,7 @@
$(PACKAGE_PATHS) \
$(patsubst %, -l %, $(ELISP_INCLUDES)) \
-l $< \
--l $(CASUAL_LIB_TEST_INCLUDES) \
+-l $(CASUAL_TEST_INCLUDES) \
-l $(patsubst %, ../tests/%, $(ELISP_TEST_INCLUDES)) \
-l $(patsubst %, ../tests/test-%, $<) \
-f ert-run-tests-batch-and-exit
@@ -48,7 +48,7 @@ $(PACKAGE_PATHS) \
$(patsubst %, -l %, $(ELISP_INCLUDES)) \
$(patsubst %, -l %, $(ELISP_PACKAGES)) \
-l $< \
--l $(CASUAL_LIB_TEST_INCLUDES) \
+-l $(CASUAL_TEST_INCLUDES) \
-l ../tests/$(ELISP_TEST_INCLUDES) \
-l $(patsubst %, ../tests/test-%, $<) \
-f ert-run-tests-batch-and-exit
diff --git a/lisp/Makefile-agenda.make b/lisp/Makefile-agenda.make
index 34b785d4cf..cce8b237d6 100644
--- a/lisp/Makefile-agenda.make
+++ b/lisp/Makefile-agenda.make
@@ -22,10 +22,10 @@ casual-agenda-settings.el
ELISP_PACKAGES=
ELISP_TEST_INCLUDES=casual-agenda-test-utils.el
PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \ #why do you test for compat
if you don't use it?
+-L $(EMACS_ELPA_DIR)/compat-current \
-L $(EMACS_ELPA_DIR)/seq-current \
-L $(EMACS_ELPA_DIR)/transient-current \
-L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-bibtex.make b/lisp/Makefile-bibtex.make
index 4960bfb80a..96e6a6c691 100644
--- a/lisp/Makefile-bibtex.make
+++ b/lisp/Makefile-bibtex.make
@@ -26,6 +26,6 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/seq-current \
-L $(EMACS_ELPA_DIR)/transient-current \
-L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-bookmarks.make b/lisp/Makefile-bookmarks.make
index e1716f617f..bc0cd0cfbe 100644
--- a/lisp/Makefile-bookmarks.make
+++ b/lisp/Makefile-bookmarks.make
@@ -26,6 +26,6 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/seq-current \
-L $(EMACS_ELPA_DIR)/transient-current \
-L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-calc.make b/lisp/Makefile-calc.make
index 8b9bb41b8e..aed9a1318e 100644
--- a/lisp/Makefile-calc.make
+++ b/lisp/Makefile-calc.make
@@ -59,7 +59,7 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/dash-current \
-L $(EMACS_ELPA_DIR)/with-editor-current \
-L $(EMACS_ELPA_DIR)/symbol-overlay-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-calendar.make b/lisp/Makefile-calendar.make
index 1d80048aa2..0e73bbc8e9 100644
--- a/lisp/Makefile-calendar.make
+++ b/lisp/Makefile-calendar.make
@@ -33,7 +33,7 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/dash-current \
-L $(EMACS_ELPA_DIR)/with-editor-current \
-L $(EMACS_ELPA_DIR)/symbol-overlay-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-compile.make b/lisp/Makefile-compile.make
index 6cf74554a0..b0da4a8112 100644
--- a/lisp/Makefile-compile.make
+++ b/lisp/Makefile-compile.make
@@ -26,6 +26,6 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/seq-current \
-L $(EMACS_ELPA_DIR)/transient-current \
-L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-css.make b/lisp/Makefile-css.make
index f14bd6b773..65fb4f9c3f 100644
--- a/lisp/Makefile-css.make
+++ b/lisp/Makefile-css.make
@@ -26,6 +26,6 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/seq-current \
-L $(EMACS_ELPA_DIR)/transient-current \
-L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-csv.make b/lisp/Makefile-csv.make
index 8709566e06..ee3d08d72e 100644
--- a/lisp/Makefile-csv.make
+++ b/lisp/Makefile-csv.make
@@ -27,6 +27,6 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/transient-current \
-L $(EMACS_ELPA_DIR)/cond-let-current \
-L $(EMACS_ELPA_DIR)/csv-mode-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-dired.make b/lisp/Makefile-dired.make
index 94bcfd9f65..c910d558b5 100644
--- a/lisp/Makefile-dired.make
+++ b/lisp/Makefile-dired.make
@@ -24,7 +24,7 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/seq-current \
-L $(EMACS_ELPA_DIR)/transient-current \
-L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-ediff.make b/lisp/Makefile-ediff.make
index faa6772349..431171fa4b 100644
--- a/lisp/Makefile-ediff.make
+++ b/lisp/Makefile-ediff.make
@@ -31,6 +31,6 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/dash-current \
-L $(EMACS_ELPA_DIR)/with-editor-current \
-L $(EMACS_ELPA_DIR)/llama-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-editkit.make b/lisp/Makefile-editkit.make
index ab3350e96a..27e351cdc4 100644
--- a/lisp/Makefile-editkit.make
+++ b/lisp/Makefile-editkit.make
@@ -32,6 +32,6 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/dash-current \
-L $(EMACS_ELPA_DIR)/with-editor-current \
-L $(EMACS_ELPA_DIR)/symbol-overlay-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-elisp.make b/lisp/Makefile-elisp.make
index 45052935a4..a20c276404 100644
--- a/lisp/Makefile-elisp.make
+++ b/lisp/Makefile-elisp.make
@@ -26,6 +26,6 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/seq-current \
-L $(EMACS_ELPA_DIR)/transient-current \
-L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-eshell.make b/lisp/Makefile-eshell.make
index d3e178ea2f..f110ceaa77 100644
--- a/lisp/Makefile-eshell.make
+++ b/lisp/Makefile-eshell.make
@@ -31,6 +31,6 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/dash-current \
-L $(EMACS_ELPA_DIR)/with-editor-current \
-L $(EMACS_ELPA_DIR)/llama-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-eww.make b/lisp/Makefile-eww.make
index 7ff4b138b6..63080deb25 100644
--- a/lisp/Makefile-eww.make
+++ b/lisp/Makefile-eww.make
@@ -26,6 +26,6 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/seq-current \
-L $(EMACS_ELPA_DIR)/transient-current \
-L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-help.make b/lisp/Makefile-help.make
index 8de0cca5ea..d7e9f47819 100644
--- a/lisp/Makefile-help.make
+++ b/lisp/Makefile-help.make
@@ -26,6 +26,6 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/seq-current \
-L $(EMACS_ELPA_DIR)/transient-current \
-L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-html.make b/lisp/Makefile-html.make
index 92632be7b1..c0d8a64f52 100644
--- a/lisp/Makefile-html.make
+++ b/lisp/Makefile-html.make
@@ -26,6 +26,6 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/seq-current \
-L $(EMACS_ELPA_DIR)/transient-current \
-L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-ibuffer.make b/lisp/Makefile-ibuffer.make
index d524770e6f..755de69baa 100644
--- a/lisp/Makefile-ibuffer.make
+++ b/lisp/Makefile-ibuffer.make
@@ -25,6 +25,6 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/seq-current \
-L $(EMACS_ELPA_DIR)/transient-current \
-L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-image.make b/lisp/Makefile-image.make
index 1f000821e9..fccf82de16 100644
--- a/lisp/Makefile-image.make
+++ b/lisp/Makefile-image.make
@@ -25,6 +25,6 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/seq-current \
-L $(EMACS_ELPA_DIR)/transient-current \
-L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-info.make b/lisp/Makefile-info.make
index 3b8c343ca5..3e74fee570 100644
--- a/lisp/Makefile-info.make
+++ b/lisp/Makefile-info.make
@@ -25,7 +25,7 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/seq-current \
-L $(EMACS_ELPA_DIR)/transient-current \
-L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-isearch.make b/lisp/Makefile-isearch.make
index 01ece3c994..33d918d5fa 100644
--- a/lisp/Makefile-isearch.make
+++ b/lisp/Makefile-isearch.make
@@ -26,7 +26,7 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/seq-current \
-L $(EMACS_ELPA_DIR)/transient-current \
-L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
.PHONY: tests compile regression
@@ -41,7 +41,7 @@ PACKAGE_PATHS= \
$(PACKAGE_PATHS) \
$(patsubst %, -l %, $(ELISP_INCLUDES)) \
-l $< \
--l $(CASUAL_LIB_TEST_INCLUDES) \
+-l $(CASUAL_TEST_INCLUDES) \
-l $(patsubst %, ../tests/%, $(ELISP_TEST_INCLUDES)) \
-l $(patsubst %, ../tests/test-%, $<) \
-f ert-run-tests-batch-and-exit
@@ -62,7 +62,7 @@ $(PACKAGE_PATHS) \
$(patsubst %, -l %, $(ELISP_INCLUDES)) \
$(patsubst %, -l %, $(ELISP_PACKAGES)) \
-l $< \
--l $(CASUAL_LIB_TEST_INCLUDES) \
+-l $(CASUAL_TEST_INCLUDES) \
-l ../tests/$(ELISP_TEST_INCLUDES) \
-l $(patsubst %, ../tests/test-%, $<) \
-f ert-run-tests-batch-and-exit
diff --git a/lisp/Makefile-lib.make b/lisp/Makefile-lib.make
index c26f3fc6e3..468936eedb 100644
--- a/lisp/Makefile-lib.make
+++ b/lisp/Makefile-lib.make
@@ -25,7 +25,7 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/seq-current \
-L $(EMACS_ELPA_DIR)/transient-current \
-L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
.PHONY: tests compile regression
diff --git a/lisp/Makefile-make-mode.make b/lisp/Makefile-make-mode.make
index 26d3697949..3ba66d08eb 100644
--- a/lisp/Makefile-make-mode.make
+++ b/lisp/Makefile-make-mode.make
@@ -26,6 +26,6 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/seq-current \
-L $(EMACS_ELPA_DIR)/transient-current \
-L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-man.make b/lisp/Makefile-man.make
index 5bb4f4a1d6..87abee4dec 100644
--- a/lisp/Makefile-man.make
+++ b/lisp/Makefile-man.make
@@ -26,6 +26,6 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/seq-current \
-L $(EMACS_ELPA_DIR)/transient-current \
-L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-org.make b/lisp/Makefile-org.make
index a1b21f5c84..a05615ad14 100644
--- a/lisp/Makefile-org.make
+++ b/lisp/Makefile-org.make
@@ -27,6 +27,6 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/transient-current \
-L $(EMACS_ELPA_DIR)/cond-let-current \
-L $(EMACS_ELPA_DIR)/org-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-re-builder.make b/lisp/Makefile-re-builder.make
index ff2000bcee..b60f62640d 100644
--- a/lisp/Makefile-re-builder.make
+++ b/lisp/Makefile-re-builder.make
@@ -26,6 +26,6 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/seq-current \
-L $(EMACS_ELPA_DIR)/transient-current \
-L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-timezone.make b/lisp/Makefile-timezone.make
index d8b2fb1c04..a28266d75b 100644
--- a/lisp/Makefile-timezone.make
+++ b/lisp/Makefile-timezone.make
@@ -26,6 +26,6 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/seq-current \
-L $(EMACS_ELPA_DIR)/transient-current \
-L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/casual-csv-utils.el b/lisp/casual-csv-utils.el
index 6ba4384e1a..7805d575e9 100644
--- a/lisp/casual-csv-utils.el
+++ b/lisp/casual-csv-utils.el
@@ -59,7 +59,7 @@ plain ASCII-range string."
(defun casual-csv-align-auto ()
"Auto align CSV fields."
(interactive)
- (setopt csv-align-style 'auto) ;why are you using `setopt' here?
+ (setopt csv-align-style 'auto)
(call-interactively #'csv-align-fields))
(defun casual-csv-align-left ()
diff --git a/templates/lisp/Makefile-MODULE.make
b/templates/lisp/Makefile-MODULE.make
index 1771c022f8..c50e25ad7a 100644
--- a/templates/lisp/Makefile-MODULE.make
+++ b/templates/lisp/Makefile-MODULE.make
@@ -26,6 +26,6 @@ PACKAGE_PATHS= \
-L $(EMACS_ELPA_DIR)/seq-current \
-L $(EMACS_ELPA_DIR)/transient-current \
-L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LIB_LISP_DIR)
+-L $(CASUAL_LISP_DIR)
include Makefile--rules.make
