mirror of
https://github.com/correl/melpa.git
synced 2024-11-15 03:00:14 +00:00
Group the internal functions and public interface functions together
This commit is contained in:
parent
932c878f66
commit
b4856f8f3d
1 changed files with 36 additions and 36 deletions
|
@ -69,6 +69,7 @@
|
||||||
(defvar package-build-archive-alist nil
|
(defvar package-build-archive-alist nil
|
||||||
"List of already-built packages, in the standard package.el format.")
|
"List of already-built packages, in the standard package.el format.")
|
||||||
|
|
||||||
|
;;; Internal functions
|
||||||
|
|
||||||
(defun pb/find-parse-time (regex)
|
(defun pb/find-parse-time (regex)
|
||||||
"Find REGEX in current buffer and format as a proper time version."
|
"Find REGEX in current buffer and format as a proper time version."
|
||||||
|
@ -161,7 +162,6 @@ the same arguments."
|
||||||
(pb/find-parse-time
|
(pb/find-parse-time
|
||||||
"\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\)"))))
|
"\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\)"))))
|
||||||
|
|
||||||
|
|
||||||
(defun pb/dump (data file)
|
(defun pb/dump (data file)
|
||||||
"Write DATA to FILE as a pretty-printed Lisp sexp."
|
"Write DATA to FILE as a pretty-printed Lisp sexp."
|
||||||
(write-region (concat (pp-to-string data) "\n") nil file))
|
(write-region (concat (pp-to-string data) "\n") nil file))
|
||||||
|
@ -242,17 +242,6 @@ The file is written to `package-build-working-dir'."
|
||||||
(nth 1 pkgfile-info)))))
|
(nth 1 pkgfile-info)))))
|
||||||
|
|
||||||
|
|
||||||
(defun package-build-all ()
|
|
||||||
"Build all packages in the `package-build-alist'."
|
|
||||||
(interactive)
|
|
||||||
(apply 'package-build-archives
|
|
||||||
(mapcar 'symbol-name (mapcar 'car package-build-alist))))
|
|
||||||
|
|
||||||
(defun package-build-archives (&rest pkgs)
|
|
||||||
"Build archives for packages PKGS."
|
|
||||||
(interactive)
|
|
||||||
(mapc 'package-build-archive pkgs))
|
|
||||||
|
|
||||||
(defun pb/expand-file-list (dir files)
|
(defun pb/expand-file-list (dir files)
|
||||||
"In DIR, expand FILES, some of which may be shell-style wildcards."
|
"In DIR, expand FILES, some of which may be shell-style wildcards."
|
||||||
(let ((default-directory dir))
|
(let ((default-directory dir))
|
||||||
|
@ -267,6 +256,32 @@ If PKG-INFO is nil, an empty one is created."
|
||||||
(aset merged 0 (downcase name))
|
(aset merged 0 (downcase name))
|
||||||
merged))
|
merged))
|
||||||
|
|
||||||
|
(defun pb/dump-archive-contents ()
|
||||||
|
"Dump the list of built packages back to the archive-contents file."
|
||||||
|
(pb/dump (cons 1 package-build-archive-alist)
|
||||||
|
(expand-file-name "archive-contents"
|
||||||
|
package-build-archive-dir)))
|
||||||
|
|
||||||
|
(defun pb/add-to-archive-contents (pkg-info type)
|
||||||
|
"Add the built archive with info PKG-INFO and TYPE to `package-build-archive-alist'."
|
||||||
|
(let* ((name (intern (aref pkg-info 0)))
|
||||||
|
(requires (aref pkg-info 1))
|
||||||
|
(desc (or (aref pkg-info 2) "No description available."))
|
||||||
|
(version (aref pkg-info 3))
|
||||||
|
(existing (assq name package-build-archive-alist)))
|
||||||
|
(when existing
|
||||||
|
(setq package-build-archive-alist
|
||||||
|
(delq existing package-build-archive-alist)))
|
||||||
|
(add-to-list 'package-build-archive-alist
|
||||||
|
(cons name
|
||||||
|
(vector
|
||||||
|
(version-to-list version)
|
||||||
|
requires
|
||||||
|
desc
|
||||||
|
type)))))
|
||||||
|
|
||||||
|
;;; Public interface
|
||||||
|
|
||||||
(defun package-build-archive (file-name)
|
(defun package-build-archive (file-name)
|
||||||
"Build a package archive for package FILE-NAME."
|
"Build a package archive for package FILE-NAME."
|
||||||
(interactive (list (completing-read "Package: "
|
(interactive (list (completing-read "Package: "
|
||||||
|
@ -339,31 +354,16 @@ If PKG-INFO is nil, an empty one is created."
|
||||||
(pb/dump-archive-contents))
|
(pb/dump-archive-contents))
|
||||||
(message "\nERROR: Cannot find package %s\n" file-name))))
|
(message "\nERROR: Cannot find package %s\n" file-name))))
|
||||||
|
|
||||||
|
(defun package-build-archives (&rest pkgs)
|
||||||
|
"Build archives for packages PKGS."
|
||||||
|
(interactive)
|
||||||
|
(mapc 'package-build-archive pkgs))
|
||||||
|
|
||||||
|
(defun package-build-all ()
|
||||||
(defun pb/dump-archive-contents ()
|
"Build all packages in the `package-build-alist'."
|
||||||
"Dump the list of built packages back to the archive-contents file."
|
(interactive)
|
||||||
(pb/dump (cons 1 package-build-archive-alist)
|
(apply 'package-build-archives
|
||||||
(expand-file-name "archive-contents"
|
(mapcar 'symbol-name (mapcar 'car package-build-alist))))
|
||||||
package-build-archive-dir)))
|
|
||||||
|
|
||||||
(defun pb/add-to-archive-contents (pkg-info type)
|
|
||||||
"Add the built archive with info PKG-INFO and TYPE to `package-build-archive-alist'."
|
|
||||||
(let* ((name (intern (aref pkg-info 0)))
|
|
||||||
(requires (aref pkg-info 1))
|
|
||||||
(desc (or (aref pkg-info 2) "No description available."))
|
|
||||||
(version (aref pkg-info 3))
|
|
||||||
(existing (assq name package-build-archive-alist)))
|
|
||||||
(when existing
|
|
||||||
(setq package-build-archive-alist
|
|
||||||
(delq existing package-build-archive-alist)))
|
|
||||||
(add-to-list 'package-build-archive-alist
|
|
||||||
(cons name
|
|
||||||
(vector
|
|
||||||
(version-to-list version)
|
|
||||||
requires
|
|
||||||
desc
|
|
||||||
type)))))
|
|
||||||
|
|
||||||
(defun package-build-initialize ()
|
(defun package-build-initialize ()
|
||||||
"Load the pkglist and archive-contents files."
|
"Load the pkglist and archive-contents files."
|
||||||
|
|
Loading…
Reference in a new issue