branch: externals/detached
commit ea590ba0b84d8ad2e772fb8f15ece88d09b03d40
Author: Niklas Eklund <niklas.ekl...@posteo.net>
Commit: Niklas Eklund <niklas.ekl...@posteo.net>
Replace build-package script with Makefile
---
.build.yml | 3 ++-
.dir-locals.el | 2 +-
Makefile | 17 +++++++++++++++++
build-package | 14 --------------
4 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/.build.yml b/.build.yml
index 90c2325a67..9bb1e0d0d2 100644
--- a/.build.yml
+++ b/.build.yml
@@ -3,9 +3,10 @@ packages:
- dtach
- emacs-minimal
- texinfo
+- make
environment:
project: detached.el
tasks:
- guix: |
cd $project
- ./build-package
+ make all
diff --git a/.dir-locals.el b/.dir-locals.el
index 50a4c2976f..b7ef2fcc84 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,3 +1,3 @@
-((nil . ((compile-command . "guix shell bash emacs-minimal git texinfo --
./build-package")))
+((nil . ((compile-command . "guix shell bash emacs-minimal git texinfo -- make
all")))
(prog-mode (eval flymake-mode))
(magit-status-mode (magit-todos-exclude-globs)))
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000..a066eaa06f
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,17 @@
+byte-compile:
+ emacs --batch --load=detached.el --eval='(progn (setq
byte-compile-error-on-warn t) (batch-byte-compile))' ./*.el
+
+autoloads:
+ emacs --batch --eval='(progn (setq make-backup-files nil)
(make-directory-autoloads default-directory "detached-autoloads.el"))'
+
+tests:
+ emacs --batch --load=detached.el --load=test/detached-test.el
--funcall=ert-run-tests-batch-and-exit
+
+docs:
+ emacs --batch --eval='(progn (setq make-backup-files nil) (find-file
"doc/detached.org") (org-texinfo-export-to-info))'
+
+clean:
+ rm *.elc
+ rm doc/*.texi
+
+all: byte-compile autoloads tests docs clean
diff --git a/build-package b/build-package
deleted file mode 100755
index 9d1c9ef327..0000000000
--- a/build-package
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-# ; -*- mode: sh;-*-
-
-# 1) Byte compile
-emacs --batch --load=detached.el -f batch-byte-compile ./*.el
-
-# 2) Make autoloads
-emacs --batch --eval='(progn (setq make-backup-files nil)
(make-directory-autoloads default-directory "detached-autoloads.el"))'
-
-# 3) Run tests
-emacs --batch --load=detached.el --load=test/detached-test.el
--funcall=ert-run-tests-batch-and-exit
-
-# 4) Generate info manual
-emacs --batch --eval='(progn (setq make-backup-files nil) (find-file
"doc/detached.org") (org-texinfo-export-to-info))'
