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

use "source" and "target" consistently

Browse source
This commit is contained in:
Donald Curtis 2012-05-03 20:44:17 -05:00
parent e6f81bf99a
commit 65aaef511a
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
package-build.el
View file

@ -542,18 +542,18 @@ TARGET-SUBDIR is a directory relative to TARGET."
((not version) ((not version)
(message "Unable to check out repository for %s" name)) (message "Unable to check out repository for %s" name))
((= 1 (length files)) ((= 1 (length files))
(let* ((pkgsrc (expand-file-name (car files) pkg-cwd)) (let* ((pkg-source (expand-file-name (car files) pkg-cwd))
(pkgdst (expand-file-name (pkg-target (expand-file-name
(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
(pb/get-package-info pkgsrc) (pb/get-package-info pkg-source)
file-name file-name
version version
cfg))) cfg)))
(when (file-exists-p pkgdst) (when (file-exists-p pkg-target)
(delete-file pkgdst t)) (delete-file pkg-target t))
(copy-file pkgsrc pkgdst) (copy-file pkg-source pkg-target)
(pb/add-to-archive-contents pkg-info 'single))) (pb/add-to-archive-contents pkg-info 'single)))
((< 1 (length files)) ((< 1 (length files))
(let* ((pkg-files (pb/target-file-list files)) (let* ((pkg-files (pb/target-file-list files))
@ -582,8 +582,8 @@ TARGET-SUBDIR is a directory relative to TARGET."
package-build-working-dir))) package-build-working-dir)))
pkg-info) pkg-info)
(when files (print pkg-files)
(add-to-list 'pkg-files pkg-file)) (add-to-list 'pkg-files pkg-file)
(pb/create-tar (pb/create-tar
(expand-file-name (expand-file-name
@ -593,6 +593,7 @@ TARGET-SUBDIR is a directory relative to TARGET."
(delete-directory pkg-dir t nil) (delete-directory pkg-dir t nil)
(pb/add-to-archive-contents pkg-info 'tar))) (pb/add-to-archive-contents pkg-info 'tar)))
(t (error "Unable to find files matching recipe patterns"))) (t (error "Unable to find files matching recipe patterns")))
(pb/dump-archive-contents) (pb/dump-archive-contents)
file-name))) file-name)))