github/melpa
1
0
Fork 0
mirror of https://github.com/correl/melpa.git synced 2024-11-28 11:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Moved config argument to the end

Browse source
This commit is contained in:
David Leatherman 2012-04-12 09:12:40 -04:00
parent aad9c41d76
commit 252137632d
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
package-build.el
View file

@ -370,7 +370,7 @@ The file is written to `package-build-working-dir'."
(let ((default-directory dir)) (let ((default-directory dir))
(mapcan 'file-expand-wildcards files))) (mapcan 'file-expand-wildcards files)))
(defun pb/merge-package-info (config pkg-info name version) (defun pb/merge-package-info (pkg-info name version config)
"Return a version of PKG-INFO updated with NAME and VERSION. "Return a version of PKG-INFO updated with NAME and VERSION.
If PKG-INFO is nil, an empty one is created." If PKG-INFO is nil, an empty one is created."
(let* ((merged (or (copy-seq pkg-info) (let* ((merged (or (copy-seq pkg-info)
@ -438,10 +438,10 @@ If PKG-INFO is nil, an empty one is created."
(concat file-name "-" version ".el") (concat file-name "-" version ".el")
package-build-archive-dir)) package-build-archive-dir))
(pkg-info (pb/merge-package-info (pkg-info (pb/merge-package-info
cfg
(pb/get-package-info pkgsrc) (pb/get-package-info pkgsrc)
file-name file-name
version))) version
cfg)))
(print pkg-info) (print pkg-info)
(when (file-exists-p pkgdst) (when (file-exists-p pkgdst)
(delete-file pkgdst t)) (delete-file pkgdst t))
@ -452,13 +452,14 @@ If PKG-INFO is nil, an empty one is created."
(pkg-file (concat file-name "-pkg.el")) (pkg-file (concat file-name "-pkg.el"))
(pkg-info (pkg-info
(pb/merge-package-info (pb/merge-package-info
cfg
(let ((default-directory pkg-cwd)) (let ((default-directory pkg-cwd))
(or (pb/get-pkg-file-info pkg-file) (or (pb/get-pkg-file-info pkg-file)
;; some packages (like magit) provide name-pkg.el.in ;; some packages (like magit) provide name-pkg.el.in
(pb/get-pkg-file-info (concat pkg-file ".in")) (pb/get-pkg-file-info (concat pkg-file ".in"))
(pb/get-package-info (concat file-name ".el")))) (pb/get-package-info (concat file-name ".el"))))
file-name version))) file-name
version
cfg)))
(print pkg-info) (print pkg-info)
(copy-directory file-name pkg-dir) (copy-directory file-name pkg-dir)