diff --git a/.dir-locals.el b/.dir-locals.el deleted file mode 100644 index 73d430e..0000000 --- a/.dir-locals.el +++ /dev/null @@ -1,4 +0,0 @@ -;;; Directory Local Variables -*- no-byte-compile: t -*- -;;; For more information see (info "(emacs) Directory Variables") - -(("nil-mode" . ((compile-command . "make -f el.make")))) diff --git a/README.org b/README.org index c1490d8..24e8357 100644 --- a/README.org +++ b/README.org @@ -1,7 +1,7 @@ -[[https://github.com/bastibe/org-journal/actions/workflows/test.yml][file:https://github.com/bastibe/org-journal/actions/workflows/test.yml/badge.svg?branch=master]] [[https://elpa.nongnu.org/nongnu/org-journal.html][https://elpa.nongnu.org/nongnu/org-journal.svg]] [[http://melpa.org/#/org-journal][file:http://melpa.org/packages/org-journal-badge.svg]] [[http://stable.melpa.org/#/org-journal][file:http://stable.melpa.org/packages/org-journal-badge.svg]] [[contributors][file:https://img.shields.io/github/contributors/bastibe/org-journal.svg]] [[license][file:https://img.shields.io/github/license/bastibe/org-journal.svg]] +[[https://github.com/bastibe/org-journal/actions/workflows/test.yml][file:https://github.com/bastibe/org-journal/actions/workflows/test.yml/badge.svg?branch=master]] [[https://elpa.nongnu.org/nongnu/org-journal.html][https://elpa.nongnu.org/nongnu/org-journal.svg]] [[http://melpa.org/#/org-journal][file:http://melpa.org/packages/org-journal-badge.svg]] [[http://stable.melpa.org/#/org-journal][file:http://stable.melpa.org/packages/org-journal-badge.svg]] [[contributors][file:https://img.shields.io/github/contributors/bastibe/logo.svg]] [[license][file:https://img.shields.io/github/license/bastibe/logo.svg]] #+CAPTION: The org-journal logo -[[./org-journal.svg]] +[[./logo.svg]] * org-journal @@ -12,7 +12,7 @@ Feel free to use, modify and improve the code! — mtvoid, bastibe -[[open-issues][file:https://img.shields.io/github/issues/bastibe/org-journal.svg]] [[closed-issues][file:https://img.shields.io/github/issues-closed/bastibe/org-journal.svg]] [[open-pull-requests][file:https://img.shields.io/github/issues-pr/bastibe/org-journal.svg]] [[closed-pull-requests][file:https://img.shields.io/github/issues-pr-closed/bastibe/org-journal.svg]] +[[open-issues][file:https://img.shields.io/github/issues/bastibe/logo.svg]] [[closed-issues][file:https://img.shields.io/github/issues-closed/bastibe/logo.svg]] [[open-pull-requests][file:https://img.shields.io/github/issues-pr/bastibe/logo.svg]] [[closed-pull-requests][file:https://img.shields.io/github/issues-pr-closed/bastibe/logo.svg]] ** Synopsis diff --git a/el.make b/el.make index 7c4f516..0d39376 100644 --- a/el.make +++ b/el.make @@ -1,9 +1,10 @@ ## # this file is part of el.make +## # # copyright: 2024- christian schwarzgruber (c.schwarzgruber.cs@gmail.com) # -# version: 0.1.0 +# version: 0.2.0 # # source: https://github.com/casch-at/el.make # @@ -30,44 +31,42 @@ # # el.make # -# an emacs lisp `make` file +# an emacs¹ lisp `make` file +## +# ¹) Emacs -- also known for being a "Text Editor" ## # todo(cschwarzgruber): hmm? export LC_ALL = C -emacs = emacs -flags = -Q --batch --no-site-file -batch = $(emacs) $(flags) - -## test directory -test-d = tests - -## source directory -src-d = src +# quiet mode +q = @ +log = $(q)echo -## all source files -el-f = $(wildcard $(src-d)/*.el) +emacs = emacs +batch = $(q)$(emacs) -Q --batch --no-site-file -## all test files -test-f = $(wildcard $(test-d)/*.el) +src = src +src-el = $(wildcard $(src)/*.el) +src-elc = $(addprefix $(src)/, $(notdir $(src-el:.el=.elc))) -## all compiled files -elc-f = $(addprefix $(src-d)/, $(notdir $(el-f:.el=.elc))) +tests = tests +tests-el = $(wildcard $(tests)/*.el) -.phony: all compile test clean +# .elc pattern rule +$(src)/%.elc: $(src)/%.el + $(log) "\nbyte-compiling... \n $<" + $(batch) -f batch-byte-compile $< -all: compile test +.phony: all byte-compile test clean -compile: $(elc-f) +all: byte-compile test -test: $(elc-f) - @echo "running tests... " - @$(batch) -L $(src-d) -l $(test-f) -f ert-run-tests-batch-and-exit +byte-compile: $(src-elc) -$(src-d)/%.elc: $(src-d)/%.el - @echo "compiling $<..." - @$(batch) -f batch-byte-compile $< +test: $(src-el) + $(log) "\nrunning tests...\n" + $(batch) -L $(src) -l $(tests-el) -f ert-run-tests-batch-and-exit clean: - rm -f $(elc-f) + rm -f $(src-elc) diff --git a/org-journal.svg b/logo.svg similarity index 98% rename from org-journal.svg rename to logo.svg index ed89648..b879574 100755 --- a/org-journal.svg +++ b/logo.svg @@ -2,34 +2,31 @@ + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> Org-Journal icon + id="title1157">org-journal.el logo + inkscape:snap-global="true" + inkscape:pagecheckerboard="0" /> Openclipart - Org-Journal icon + org-journal.el logo 2018-12-0 Icon/logo for the Emacs “org-journal” mode. By Tina Russell, based on original clipart by gsagri04, and incorporating the Org Mode unicorn art by Christophe Bataillon and Greg Newman. (The Org Mode unicorn was originally conceived by Bastien Guerry.)