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

Explicitly default :files to "*.el", expanded after check-out.

Browse source 
This resolves the inconsistency wherein an empty :files value meant "every
file" for git packages, but just "package-name.el" for wiki packages.

It also allows the removal of most :files values in the pkglist, since
"*.el" is almost always the Right Value.
This commit is contained in:
Steve Purcell 2012-03-20 19:33:09 +00:00 committed by Donald Curtis
parent af3d24129b
commit 3bf025e659
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
package-build.el
View file

@ -357,17 +357,15 @@ If PKG-INFO is nil, an empty one is created."
(expand-file-name file-name package-build-working-dir)))) (expand-file-name file-name package-build-working-dir))))
(let* ((version (pb/checkout name cfg pkg-cwd)) (let* ((version (pb/checkout name cfg pkg-cwd))
(files (pb/expand-file-list pkg-cwd (plist-get cfg :files))) (files (pb/expand-file-list pkg-cwd
(or (plist-get cfg :files)
(list "*.el"))))
(default-directory package-build-working-dir)) (default-directory package-build-working-dir))
(cond (cond
((not version) ((not version)
(print (format "Unable to check out repository for %s" name))) (print (format "Unable to check out repository for %s" name)))
((or (and (eq 'wiki (plist-get cfg :fetcher)) ((= 1 (length files))
(< (length files) 2)) (let* ((pkgsrc (expand-file-name (car files) pkg-cwd))
(= 1 (length files)))
(let* ((pkgsrc (expand-file-name (or (car files)
(concat file-name ".el"))
pkg-cwd))
(pkgdst (expand-file-name (pkgdst (expand-file-name
(concat file-name "-" version ".el") (concat file-name "-" version ".el")
package-build-archive-dir)) package-build-archive-dir))