[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa-admin 34ecb5f 257/439: Respect .elpaignore when compiling
From: |
Philip Kaludercic |
Subject: |
[nongnu] elpa-admin 34ecb5f 257/439: Respect .elpaignore when compiling and optimize compilation. |
Date: |
Sun, 17 Oct 2021 15:48:14 -0400 (EDT) |
branch: elpa-admin
commit 34ecb5f54ee15146f00b7c5bdb6ffbaa907d1e8a
Author: Jackson Ray Hamilton <jackson@jacksonrayhamilton.com>
Commit: Jackson Ray Hamilton <jackson@jacksonrayhamilton.com>
Respect .elpaignore when compiling and optimize compilation.
---
GNUmakefile | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/GNUmakefile b/GNUmakefile
index 7d6d100..6d57fae 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -144,9 +144,22 @@ $(foreach al, $(autoloads), $(eval $(call RULE-srcdeps,
$(al))))
\"$$(pwd)\")"
# Put into elcs the set of elc files we need to keep up-to-date.
-# I.e. one for each .el file except for the -pkg.el, the -autoloads.el, and
-# the .el files that are marked "no-byte-compile".
-els := $(call FILTER-nonsrc, $(wildcard packages/*/*.el))
+# I.e. one for each .el file in each package root, except for the -pkg.el,
+# the -autoloads.el, the .el files that are marked "no-byte-compile", and
+# files matching patterns in packages' .elpaignore files.
+included_els := $(shell \
+ for pt in packages/*; do \
+ if [ -d $$pt ]; then \
+ if [ -f "$${pt}/.elpaignore" ]; then \
+ tar -ch $$pt/*.el --no-recursion \
+ --exclude-vcs -X "$${pt}/.elpaignore" \
+ | tar --list; \
+ else \
+ ls -1 $$pt/*.el; \
+ fi; \
+ fi; \
+ done)
+els := $(call FILTER-nonsrc, $(included_els))
naive_elcs := $(patsubst %.el, %.elc, $(els))
current_elcs := $(wildcard packages/*/*.elc)
@@ -184,9 +197,8 @@ pkg_descs:=$(foreach pkg, $(pkgs), $(pkg)/$(notdir
$(pkg))-pkg.el)
--eval '(package-generate-description-file d "$@")'
.PHONY: all-in-place
-all-in-place: $(extra_elcs) $(autoloads) $(pkg_descs)
- # Do them in a sub-make, so that autoloads are done first.
- $(MAKE) elcs
+# Use order-only prerequisites, so that autoloads are done first.
+all-in-place: | $(extra_elcs) $(autoloads) $(pkg_descs) elcs
############### Rules to prepare the externals ################################
- [nongnu] elpa-admin a9287ff 239/439: Merge commit '48b48807a8917e455b5687945a81375703bd1a6e', (continued)
- [nongnu] elpa-admin a9287ff 239/439: Merge commit '48b48807a8917e455b5687945a81375703bd1a6e', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 8730258 240/439: Merge commit 'ab69dbcccb4d0ed5ec2a7bd6bc7b3cff7e7adbac', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin ac713ed 242/439: Merge commit 'bdbbc65028af8deb55a4e474be43b5b99e6cc539', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 9c513a6 246/439: Merge commit 'db34a79efd068f28643cefd6f16a7329ba24dbf1', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin b14148a 249/439: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 2f122b0 251/439: Merge branch 'master' into new-website, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin b9ba590 252/439: packages/yasnippet: Merge external (v0.11.0), Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin c670f77 253/439: Merge branch 'master' into new-website, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 7626ffa 254/439: Website footer improvement, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 294407d 256/439: README: Fix copyright years., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 34ecb5f 257/439: Respect .elpaignore when compiling and optimize compilation.,
Philip Kaludercic <=
- [nongnu] elpa-admin 82a2bda 259/439: Put tar'd files at the end to fix build in some environments., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 5660f25 261/439: [admin] Add abstraction: archive--read-externals-list, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin c101039 265/439: [admin int] Add abstraction: archive-call, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 98bcea9 268/439: [admin int] Add abstraction: archive--dirname, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 186d10f 269/439: Clear executable bit for Emacs Lisp files., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 336afcd 272/439: Merge commit '8280df5ce6db836559a5c2442b97a2f02b6f7a05', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 9db3516 274/439: Merge branch 'scratch/org-edna', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 0f843a7 275/439: Merge branch 'scratch/dired-du', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 94286b7 276/439: * packages/yasnippet: Merge version 0.12.0 from upstream., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 602f32e 277/439: Merge yasnippet 0.12.1 from upstream, Philip Kaludercic, 2021/10/17