[elpa] elpa-admin 4f4a301 104/357: * GNUmakefile: Obey a .elpaignore file in a package's root directory.

[Stefan Monnier]

branch: elpa-admin
commit 4f4a3019d24b3ba5980777dc834adb9da55f5dbe
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    * GNUmakefile: Obey a .elpaignore file in a package's root directory.
    * admin/update-archive.sh: Don't copy .elc files to build/packages.
    * admin/archive-contents.el: Improve error message for invalid versions.
    * externals-list: Change auctex to be external.
    * copyright_exceptions: Update to adapt to AUCTeX-11.87.
    * package/auctex: Move it to an external branch, updated to 11.87.
---
 GNUmakefile               | 24 +++++++++++++++---------
 admin/archive-contents.el |  9 +++++----
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 0fac72b..2b07767 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -42,15 +42,21 @@ process-archive:
        # FIXME, we could probably speed this up significantly with
        # rules like "%.tar: ../%/ChangeLog" so we only rebuild the packages
        # that have indeed changed.
-       cd $(ARCHIVE_TMP)/packages; \
-         $(EMACS) -l $(CURDIR)/admin/archive-contents.el \
-           -f batch-make-archive
-       @cd $(ARCHIVE_TMP)/packages; \
-         for pt in *; do \
-             if [ -d $$pt ]; then \
-                 echo "Creating tarball $${pt}.tar" && \
-                 tar -cf $${pt}.tar $$pt --remove-files; \
-             fi; \
+       cd $(ARCHIVE_TMP)/packages;                             \
+         $(EMACS) -l $(CURDIR)/admin/archive-contents.el       \
+                  -f batch-make-archive
+       @cd $(ARCHIVE_TMP)/packages;                            \
+         for pt in *; do                                       \
+             if [ -f "$${pt}/.elpaignore" ]; then              \
+                 ignore="$${pt}/.elpaignore";                  \
+             else                                              \
+                 ignore="/dev/null";                           \
+             fi;                                               \
+             if [ -d $$pt ]; then                              \
+                 echo "Creating tarball $${pt}.tar" &&         \
+                 tar -cf $${pt}.tar $$pt -X "$$ignore";        \
+                 rm -r $${pt};                                 \
+             fi;                                               \
          done
        mkdir -p archive/packages
        mv archive/packages archive/packages-old
diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index 2d588e9..499728e 100644
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -36,7 +36,8 @@
   (when vers
     (let ((l (version-to-list vers)))
       ;; Signal an error for things like "1.02" which is parsed as "1.2".
-      (assert (equal vers (package-version-join l)))
+      (assert (equal vers (package-version-join l)) nil
+              "Unsupported version syntax %S" vers)
       l)))
 
 (defun archive--convert-require (elt)
@@ -51,9 +52,9 @@ Otherwise return nil."
     (when (string-match "\\`[ \t]*[$]Revision:[ \t]+" str)
       (setq str (substring str (match-end 0))))
     (condition-case nil
-       (if (archive--version-to-list str)
-           str)
-      (error nil))))
+        (if (archive--version-to-list str)
+            str)
+      (error str))))
 
 (defun archive--delete-elc-files (dir &optional only-orphans)
   "Recursively delete all .elc files in DIR.