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

let* cleanup madness

Browse source
This commit is contained in:
Donald Ephraim Curtis 2012-01-21 16:55:24 -06:00
parent dedfbe1be5
commit d6136c239d
1 changed files with 48 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
package-build.el
View file

@ -241,57 +241,56 @@
(let* ((repo-type (plist-get cfg :fetcher))
(repo-url (plist-get cfg :url))
(summary (plist-get cfg :summary))
(files (plist-get cfg :files)))
(files (plist-get cfg :files))
(pkglst)
(pkgdeps)
(version
(cond
((eq repo-type 'svn)
(print 'Subversion)
(package-build-checkout-svn repo-url pkg-cwd))
((eq repo-type 'git)
(print 'Git)
(package-build-checkout-git repo-url pkg-cwd))
((eq repo-type 'darcs)
(print 'Darcs)
(package-build-checkout-darcs repo-url pkg-cwd))))
(pkg-base-dir (concat file-name "-" version))
(pkg-file (concat file-name "-pkg.el"))
(default-directory package-build-working-dir))
(let* ((pkglst)
(pkgdeps)
(version
(cond
((eq repo-type 'svn)
(print 'Subversion)
(package-build-checkout-svn repo-url pkg-cwd))
((eq repo-type 'git)
(print 'Git)
(package-build-checkout-git repo-url pkg-cwd))
((eq repo-type 'darcs)
(print 'Darcs)
(package-build-checkout-darcs repo-url pkg-cwd))))
(pkg-base-dir (concat file-name "-" version))
(pkg-file (concat file-name "-pkg.el"))
(default-directory package-build-working-dir))
(cond
((= 1 (length files))
(copy-file (expand-file-name (car files) pkg-cwd)
(expand-file-name (concat file-name "-" version ".el")
package-build-archive-dir))
(package-build-add-to-archive-contents
name version pkgdeps summary 'single))
(cond
((= 1 (length files))
(copy-file (expand-file-name (car files) pkg-cwd)
(expand-file-name (concat file-name "-" version ".el")
package-build-archive-dir))
(package-build-add-to-archive-contents
name version pkgdeps summary 'single))
(t
(copy-directory file-name pkg-base-dir)
(setq pkglst
(package-build-pkg-file
(expand-file-name
pkg-file
(concat
(file-name-as-directory package-build-working-dir)
(file-name-as-directory pkg-base-dir)))
file-name version summary))
(setq pkgdeps (mapcar
(lambda (elt)
(list (car elt) (version-to-list (cadr elt))))
(eval (nth 4 pkglst))))
(when files
(add-to-list 'files pkg-file))
(package-build-create-tar
pkg-base-dir
(expand-file-name
(concat file-name "-" version ".tar") package-build-archive-dir)
files)
(delete-directory pkg-base-dir t nil)
(package-build-add-to-archive-contents
name version pkgdeps summary 'tar)))))
(t
(copy-directory file-name pkg-base-dir)
(setq pkglst
(package-build-pkg-file
(expand-file-name
pkg-file
(concat
(file-name-as-directory package-build-working-dir)
(file-name-as-directory pkg-base-dir)))
file-name version summary))
(setq pkgdeps (mapcar
(lambda (elt)
(list (car elt) (version-to-list (cadr elt))))
(eval (nth 4 pkglst))))
(when files
(add-to-list 'files pkg-file))
(package-build-create-tar
pkg-base-dir
(expand-file-name
(concat file-name "-" version ".tar") package-build-archive-dir)
files)
(delete-directory pkg-base-dir t nil)
(package-build-add-to-archive-contents
name version pkgdeps summary 'tar))))
(package-build-dump-archive-contents))))