branch: elpa-admin
commit 480283ade7af774a9fa1c005c6b02f6336161761
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
Move check_copyright to the makefile
---
GNUmakefile | 21 +++++++++++++++++++++
admin/archive-contents.el | 2 +-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/GNUmakefile b/GNUmakefile
index d1baf58..1067e4c 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -9,6 +9,25 @@ SITE_DIR=site
all: all-in-place
+CR_EXCEPTIONS=copyright_exceptions
+.PHONY: check_copyrights
+check_copyrights:
+ @echo "Compute exceptions >$(CR_EXCEPTIONS)~"
+ @(cd packages; \
+ export LANG=C; \
+ find . -name '*.el' -print0 | \
+ xargs -0 grep -L 'Free Software Foundation, Inc' | \
+ grep -v '\(\.dir-locals\|.-\(pkg\|autoloads\)\)\.el$$'; \
+ find . -name '*.el' -print | \
+ while read f; do \
+ fquoted="$$(echo $$f|tr '|' '_')"; \
+ sed -n -e '/[Cc]opyright.*, *[1-9][-0-9]*,\?$$/N' \
+ -e '/Free Software Foundation/d' \
+ -e "s|^\\(.*[Cc]opyright\\)|$$fquoted:\\1|p" \
+ "$$f"; \
+ done) | sort >$(CR_EXCEPTIONS)~
+ diff -u "$(CR_EXCEPTIONS)" "$(CR_EXCEPTIONS)~"
+
## Deploy the package archive to archive/, with packages in
## archive/packages/:
archive: archive-tmp
@@ -46,6 +65,8 @@ archive-full: archive-tmp org-fetch
#mkdir -p archive/admin
#cp admin/* archive/admin/
+# FIXME: Turn it into an `external', which will require adding the notion of
+# "snapshot" packages.
org-fetch: archive-tmp
cd $(ARCHIVE_TMP)/packages; \
pkgname=`curl -s http://orgmode.org/elpa/|perl -ne 'push @f, $$1 if
m/(org-\d{8})\.tar/; END { @f = sort @f; print "$$f[-1]\n"}'`; \
diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index 8ef73aa..863b13e 100644
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -207,7 +207,7 @@ Rename DIR/PKG.el to PKG-VERS.el, delete DIR, and return
the descriptor."
(while (progn (forward-line -1) (>= (point) start))
(insert ";; ")))
(set (make-local-variable 'backup-inhibited) t)
- (save-buffer)
+ (basic-save-buffer) ;Less chatty than save-buffer.
(kill-buffer)))
(delete-directory dir t)
(cons (intern pkg) (vector (version-to-list vers) req desc 'single)))
