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

Pull default "*.el" pattern up into 'pb/expand-file-list

Browse source
This commit is contained in:
Steve Purcell 2012-04-18 11:07:03 +01:00
parent a971eeddd5
commit 106834fc73
1 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
package-build.el
View file

@ -199,10 +199,7 @@ seconds; the server cuts off after 10 requests in 20 seconds.")
(delete-directory dir t nil)) (delete-directory dir t nil))
(print "cloning repository") (print "cloning repository")
(pb/run-process nil "svn" "checkout" repo dir))) (pb/run-process nil "svn" "checkout" repo dir)))
(let ((files (pb/expand-file-list dir (apply 'pb/run-process dir "svn" "info" (pb/expand-file-list dir config))
(or (plist-get config :files)
(list "*.el")))))
(apply 'pb/run-process dir "svn" "info" files))
(while (setq ts (ignore-errors (while (setq ts (ignore-errors
(pb/find-parse-time (pb/find-parse-time
"Last Changed Date: \\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\)" bound))) "Last Changed Date: \\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\}\\)" bound)))
@ -237,10 +234,8 @@ seconds; the server cuts off after 10 requests in 20 seconds.")
(pb/run-process nil "git" "clone" repo dir))) (pb/run-process nil "git" "clone" repo dir)))
(when commit (when commit
(pb/run-process dir "git" "checkout" commit)) (pb/run-process dir "git" "checkout" commit))
(let ((files (pb/expand-file-list dir (apply 'pb/run-process dir "git" "log" "-n1" "--pretty=format:'\%ci'"
(or (plist-get config :files) (pb/expand-file-list dir config))
(list "*.el")))))
(apply 'pb/run-process dir "git" "log" "-n1" "--pretty=format:'\%ci'" files))
(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\\}\\)"))))
@ -273,9 +268,7 @@ seconds; the server cuts off after 10 requests in 20 seconds.")
(print "cloning repository") (print "cloning repository")
(pb/run-process nil "bzr" "branch" repo dir))) (pb/run-process nil "bzr" "branch" repo dir)))
(apply 'pb/run-process dir "bzr" "log" "-l1" (apply 'pb/run-process dir "bzr" "log" "-l1"
(pb/expand-file-list dir (pb/expand-file-list dir config))
(or (plist-get config :files)
(list "*.el"))))
(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\\}\\)"))))
@ -303,10 +296,7 @@ seconds; the server cuts off after 10 requests in 20 seconds.")
(delete-directory dir t nil)) (delete-directory dir t nil))
(print "cloning repository") (print "cloning repository")
(pb/run-process nil "hg" "clone" repo dir))) (pb/run-process nil "hg" "clone" repo dir)))
(apply 'pb/run-process dir "hg" "log" "-l1" (apply 'pb/run-process dir "hg" "log" "-l1" (pb/expand-file-list dir config))
(pb/expand-file-list dir
(or (plist-get config :files)
(list "*.el"))))
(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]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}\\)"))))
@ -381,10 +371,11 @@ The file is written to `package-build-working-dir'."
(nth 2 pkgfile-info) (nth 2 pkgfile-info)
(nth 1 pkgfile-info))))) (nth 1 pkgfile-info)))))
(defun pb/expand-file-list (dir files) (defun pb/expand-file-list (dir config)
"In DIR, expand FILES, some of which may be shell-style wildcards." "In DIR, expand the :files for CONFIG, some of which may be shell-style wildcards."
(let ((default-directory dir)) (let ((default-directory dir))
(mapcan 'file-expand-wildcards files))) (mapcan 'file-expand-wildcards
(or (plist-get config :files) (list "*.el")))))
(defun pb/merge-package-info (pkg-info name version config) (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.
@ -464,9 +455,7 @@ of the same-named package which is to be kept."
(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 (files (pb/expand-file-list pkg-cwd cfg))
(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)