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

Don't assume *-readme.txt files should always be written to package-build-archive-dir

Browse source 
Fixes #1463
This commit is contained in:
Steve Purcell 2014-02-04 16:43:13 +00:00
parent 7c16c08c38
commit 70ddd52881
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
package-build.el
View file

@ -503,8 +503,8 @@ Optionally PRETTY-PRINT the data."
(insert-file-contents file-path)
(lm-commentary))))
(defun pb/write-pkg-readme (commentary file-name)
"Write COMMENTARY to the FILE-NAME-readme.txt file."
(defun pb/write-pkg-readme (target-dir commentary file-name)
"Write COMMENTARY to the FILE-NAME-readme.txt file in TARGET-DIR."
(when commentary
(with-temp-buffer
(insert commentary)
@ -521,12 +521,12 @@ Optionally PRETTY-PRINT the data."
(delete-trailing-whitespace)
(let ((coding-system-for-write buffer-file-coding-system))
(write-region nil nil
(pb/readme-file-name file-name))))))
(pb/readme-file-name target-dir file-name))))))
(defun pb/readme-file-name (file-name)
"Name of the readme file for the package FILE-NAME."
(defun pb/readme-file-name (target-dir file-name)
"Name of the readme file in TARGET-DIR for the package FILE-NAME."
(expand-file-name (concat file-name "-readme.txt")
package-build-archive-dir))
target-dir))
(defun pb/update-or-insert-version (version)
"Ensure current buffer has a \"Version: VERSION\" header."
@ -876,7 +876,8 @@ Returns the archive entry for the package."
(pb/message "Warning: %S" err)))
(kill-buffer)))
(pb/write-pkg-readme (and (> (length pkg-info) 4) (aref pkg-info 4))
(pb/write-pkg-readme target-dir
(and (> (length pkg-info) 4) (aref pkg-info 4))
package-name)
(pb/archive-entry pkg-info 'single)))
((< 1 (length files))
@ -915,7 +916,8 @@ Returns the archive entry for the package."
pkg-dir-name))
(let ((default-directory source-dir))
(pb/write-pkg-readme (pb/find-package-commentary pkg-source)
(pb/write-pkg-readme target-dir
(pb/find-package-commentary pkg-source)
package-name))
(delete-directory pkg-tmp-dir t nil)