[elpa] master eb0913a: * admin/archive-contents.el (archive-refresh-pkg-file): Resurrect.

[Stefan Monnier]

branch: master
commit eb0913ae4dedd3ae9eee6802971bdb806bbdf878
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>

    * admin/archive-contents.el (archive-refresh-pkg-file): Resurrect.
    
    Was called archive--refresh-pkg-file previously.
    
    * GNUmakefile (%-autoloads.el): Use new name.
---
 GNUmakefile               | 8 ++++----
 admin/archive-contents.el | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 8bfd49b..5d2095f 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -138,10 +138,10 @@ autoloads := $(foreach pkg, $(pkgs), $(pkg)/$(notdir 
$(pkg))-autoloads.el)
 $(foreach al, $(autoloads), $(eval $(call RULE-srcdeps, $(al))))
 %-autoloads.el:
        @echo 'Generating autoloads for $@'
-       @cd $(dir $@) && \
-         $(EMACS) -l $(CURDIR)/admin/archive-contents.el \
-             --eval "(archive--refresh-pkg-file)" \
-             --eval "(require 'package)" \
+       @cd $(dir $@) &&                                                   \
+         $(EMACS) -l $(CURDIR)/admin/archive-contents.el                  \
+             --eval "(archive-refresh-pkg-file)"                          \
+             --eval "(require 'package)"                                  \
              --eval "(load (expand-file-name \"../names/names-autoloads.el\") 
t t)" \
              --eval "(package-generate-autoloads \"$$(basename $$(pwd))\" \
                                                  \"$$(pwd)\")"
diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index bebf5e4..56f2b27 100644
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -341,6 +341,12 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
       (error "File not found: %s" pkg-file))
     (archive--form-from-file-contents pkg-file)))
 
+(defun archive-refresh-pkg-file ()
+  ;; Note: Used via --batch by GNUmakefile rule.
+  (let* ((dir (directory-file-name default-directory))
+         (pkg (file-name-nondirectory dir)))
+    (archive--write-pkg-file dir pkg (archive--metadata dir pkg))))
+
 (defun archive--write-pkg-file (pkg-dir name metadata)
   ;; FIXME: Use package-generate-description-file!
   (let ((pkg-file (expand-file-name (concat name "-pkg.el") pkg-dir))