Better placement of badge generation code

This commit is contained in:
Steve Purcell 2014-10-22 17:37:27 +01:00
parent 7a86f574a5
commit 1e0f44b043

View file

@ -994,6 +994,8 @@ and a cl struct in Emacs HEAD. This wrapper normalises the results."
pkg-working-dir pkg-working-dir
package-build-archive-dir))) package-build-archive-dir)))
(pb/dump archive-entry (pb/entry-file-name archive-entry)) (pb/dump archive-entry (pb/entry-file-name archive-entry))
(when package-build-write-melpa-badge-images
(pb/write-melpa-badge-image (symbol-name name) version package-build-archive-dir))
(pb/message "Built in %.3fs, finished at %s" (pb/message "Built in %.3fs, finished at %s"
(time-to-seconds (time-since start-time)) (time-to-seconds (time-since start-time))
(current-time-string)) (current-time-string))
@ -1018,7 +1020,6 @@ simply pass `package-build-default-files-spec' in most cases.
Returns the archive entry for the package." Returns the archive entry for the package."
(when (symbolp package-name) (when (symbolp package-name)
(setq package-name (symbol-name package-name))) (setq package-name (symbol-name package-name)))
(prog1
(let ((files (package-build-expand-file-specs source-dir file-specs))) (let ((files (package-build-expand-file-specs source-dir file-specs)))
(unless (equal file-specs package-build-default-files-spec) (unless (equal file-specs package-build-default-files-spec)
(when (equal files (package-build-expand-file-specs (when (equal files (package-build-expand-file-specs
@ -1102,9 +1103,7 @@ Returns the archive entry for the package."
(delete-directory pkg-tmp-dir t nil) (delete-directory pkg-tmp-dir t nil)
(pb/archive-entry pkg-info 'tar))) (pb/archive-entry pkg-info 'tar)))
(t (error "Unable to find files matching recipe patterns")))) (t (error "Unable to find files matching recipe patterns")))))
(when package-build-write-melpa-badge-images
(pb/write-melpa-badge-image package-name version target-dir))))
;; In future we should provide a hook, and perform this step in a separate package. ;; In future we should provide a hook, and perform this step in a separate package.