[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/integrated-elpa 4b0cf9d 06/23: Various path hacks
From: |
Phillip Lord |
Subject: |
[Emacs-diffs] feature/integrated-elpa 4b0cf9d 06/23: Various path hacks |
Date: |
Fri, 16 Sep 2016 20:34:15 +0000 (UTC) |
branch: feature/integrated-elpa
commit 4b0cf9d44907d046348f3e2ab36821ea3c831747
Author: Phillip Lord <address@hidden>
Commit: Phillip Lord <address@hidden>
Various path hacks
---
Makefile.in | 5 +++++
packages/GNUmakefile | 2 ++
packages/package-test.el | 16 ++++++++++------
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 3381387..4e83cb3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -380,6 +380,11 @@ src: lib-src
# We need to build 'emacs' in 'src' to compile the *.elc files in 'lisp'.
lisp: src
+# We should assume that all files in core are byte compiled before we
+# start to build packages. And we assume that src is build because we
+# need 'emacs'.
+packages: lisp src
+
# These targets should be "${SUBDIR} without 'src'".
lib lib-src lisp nt packages: Makefile
$(MAKE) -C $@ all
diff --git a/packages/GNUmakefile b/packages/GNUmakefile
index 4a2aac6..21dfd12 100644
--- a/packages/GNUmakefile
+++ b/packages/GNUmakefile
@@ -7,6 +7,8 @@ EMACS=../src/emacs
DIRS=$(filter-out .,$(subst ./,,$(shell find . -maxdepth 1 -type d)))
## alas "all" is an ELPA package, so this is going to break
+all: build-all
+
build-all: $(DIRS) $(EMACS)
diff --git a/packages/package-test.el b/packages/package-test.el
index c453f29..75bd07f 100644
--- a/packages/package-test.el
+++ b/packages/package-test.el
@@ -19,14 +19,14 @@ tests directory."
(directory-files directory nil ".*-tests.el$")
(directory-files directory nil "test-.*.el$")
(let ((dir-test
- (concat directory "test/")))
+ (concat directory "/test/")))
(when (file-exists-p dir-test)
(mapcar
(lambda (file)
(concat dir-test file))
(directory-files dir-test nil ".*.el"))))
(let ((dir-tests
- (concat directory "tests/")))
+ (concat directory "/tests/")))
(when (file-exists-p dir-tests)
(mapcar
(lambda (file)
@@ -34,9 +34,11 @@ tests directory."
(directory-files dir-tests nil ".*.el"))))))
(defun assess-discover--load-all-tests (directory)
- (mapc
- 'load
- (assess-discover-tests directory)))
+ (let ((loads
+ (assess-discover-tests directory)))
+ (mapc
+ 'load
+ loads)))
(defun assess-discover-load-tests ()
(interactive)
@@ -52,5 +54,7 @@ tests directory."
(assess-discover-run-and-exit-batch-dir default-directory))
(defun assess-discover-run-and-exit-batch-dir (directory &optional selector)
- (assess-discover--load-all-tests directory)
+ (assess-discover--load-all-tests
+ (concat default-directory
+ directory))
(ert-run-tests-batch-and-exit selector))
- [Emacs-diffs] feature/integrated-elpa b99bbf5 04/23: Merge branch 'feature/integrated-elpa' of vm-npl25.ncl.ac.uk:git/emacs into feature/integrated-elpa, (continued)
- [Emacs-diffs] feature/integrated-elpa b99bbf5 04/23: Merge branch 'feature/integrated-elpa' of vm-npl25.ncl.ac.uk:git/emacs into feature/integrated-elpa, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa fb9a7bf 07/23: Example test, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 0b70bfc 08/23: Build and test ELPA packages also, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 679fde7 17/23: Fix include in makefile, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 48e846d 12/23: Build system now in generated makefile, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 6b13eac 03/23: Initial Support for ELPA packages in core, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa cf1d196 21/23: ELPA as an environment variable, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 73afa20 02/23: Starting to add test support, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 031233d 05/23: build-all depends on emacs, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 937c695 18/23: Add bug report about multifile packages, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 4b0cf9d 06/23: Various path hacks,
Phillip Lord <=
- [Emacs-diffs] feature/integrated-elpa 4f6df43 15/23: README added, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 5a2fa7a 11/23: Lots of changes, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa d208ef5 13/23: Makefile generator for tests, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 2456488 09/23: Start to factor out, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 5d0232b 19/23: Multifile packages now work, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa b2f34a4 20/23: ELPA support, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa dad684e 10/23: Refactor new files, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa 8b53bb8 14/23: Summarization happening and some ELPA support, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa db2bcc6 22/23: Merge branch into feature/integrated-elpa, Phillip Lord, 2016/09/16
- [Emacs-diffs] feature/integrated-elpa bfe28f0 23/23: Better handling of ELPA env var, Phillip Lord, 2016/09/16