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

cleanup the info building code

Browse source 
use dolist instead of cl-loop

don't overwrite info files

remove texi files in the destination directory
This commit is contained in:
Donald Curtis 2013-05-27 12:04:32 -05:00
parent 65d2daafe5
commit ba57a4e35f
1 changed files with 33 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
package-build.el
View file

@ -682,34 +682,42 @@ file path and DEST is the relative path to which it should be copied."
"Create .info files from any .texi files listed in FILES in SOURCE-DIR in TARGET-DIR.
Deletes the .texi(nfo) files if they exist."
(cl-loop for (source-file . dest-file) in files
for target-file = (concat (file-name-sans-extension dest-file)
".info")
if (and (string-match ".texi\\(nfo\\)?$" source-file)
(not (file-exists-p target-file)))
do (ignore-errors
(pb/run-process
nil
"makeinfo"
(expand-file-name source-file source-dir)
"-o"
(expand-file-name target-file
target-dir)))
and do (delete-file (message (expand-file-name dest-file target-dir)))))
(dolist (spec files)
(let* ((source-file (car spec))
(dest-file (cdr spec))
(info-path (expand-file-name
(concat (file-name-sans-extension dest-file) ".info")
target-dir)))
(when (string-match ".texi\\(nfo\\)?$" source-file)
(when (not (file-exists-p info-path))
(ignore-errors
(pb/run-process
nil
"makeinfo"
(expand-file-name source-file source-dir)
"-o"
info-path)
(message "Created %s" info-path)))
(message "Removing %s" (expand-file-name dest-file target-dir))
(delete-file (expand-file-name dest-file target-dir))))))
(defun pb/generate-dir-file (files target-dir)
"Create dir file from any .info files listed in FILES in TARGET-DIR."
(cl-loop for (source-file . dest-file) in files
if (or (string-match ".info$" source-file)
(string-match ".texi\\(nfo\\)?$" source-file))
do (ignore-errors
(pb/run-process
nil
"install-info"
(concat "--dir=" (expand-file-name "dir" target-dir))
(expand-file-name (concat (file-name-sans-extension dest-file)
".info")
target-dir)))))
(dolist (spec files)
(let* ((source-file (car spec))
(dest-file (cdr spec))
(info-path (expand-file-name
(concat (file-name-sans-extension dest-file) ".info")
target-dir)))
(when (and (or (string-match ".info$" source-file)
(string-match ".texi\\(nfo\\)?$" source-file))
(file-exists-p info-path))
(ignore-errors
(pb/run-process
nil
"install-info"
(concat "--dir=" (expand-file-name "dir" target-dir))
info-path))))))
(defun pb/copy-package-files (files source-dir target-dir)
"Copy FILES from SOURCE-DIR to TARGET-DIR.