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

Revert "Generate .info and dir files."

Browse source 
This reverts commit 7ce4353889.

Unintentionally pushod to master branch.
This commit is contained in:
Donald Curtis 2013-05-22 17:46:47 -05:00
parent 7ce4353889
commit 3cd2169111
1 changed files with 9 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
package-build.el
View file

@ -84,7 +84,7 @@ function for access to this function")
(defvar pb/archive-alist-initialized nil (defvar pb/archive-alist-initialized nil
"Determines if pb/archive-alist has been initialized.") "Determines if pb/archive-alist has been initialized.")
(defconst pb/default-files-spec '("*.el" "dir" "*.info" "*.texi" "doc/*.info" "doc/*.texi") (defconst pb/default-files-spec '("*.el" "dir" "*.info")
"Default value for :files attribute in recipes.") "Default value for :files attribute in recipes.")
@ -675,32 +675,6 @@ file path and DEST is the relative path to which it should be copied."
"Shorthand way to expand paths in DIR for source files listed in CONFIG." "Shorthand way to expand paths in DIR for source files listed in CONFIG."
(mapcar 'car (pb/expand-config-file-list dir config))) (mapcar 'car (pb/expand-config-file-list dir config)))
(defun pb/generate-info-files (files source-dir target-dir)
"Create .info files from any .texi files listed in FILES in SOURCE-DIR in TARGET-DIR."
(cl-loop for (source-file . dest-file) in files
if (string-match ".texi$" source-file)
do (pb/run-process
nil
"makeinfo"
(expand-file-name source-file source-dir)
"-o"
(expand-file-name (concat (file-name-sans-extension dest-file)
".info")
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$" source-file))
do (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))))
(defun pb/copy-package-files (files source-dir target-dir) (defun pb/copy-package-files (files source-dir target-dir)
"Copy FILES from SOURCE-DIR to TARGET-DIR. "Copy FILES from SOURCE-DIR to TARGET-DIR.
FILES is a list of (SOURCE . DEST) relative filepath pairs." FILES is a list of (SOURCE . DEST) relative filepath pairs."
@ -813,6 +787,9 @@ FILES is a list of (SOURCE . DEST) relative filepath pairs."
version version
cfg))) cfg)))
(let ((default-directory pkg-cwd))
(pb/write-pkg-readme (pb/find-package-commentary pkg-source)
file-name))
(when (file-exists-p pkg-dir) (when (file-exists-p pkg-dir)
(delete-directory pkg-dir t nil)) (delete-directory pkg-dir t nil))
@ -826,16 +803,11 @@ FILES is a list of (SOURCE . DEST) relative filepath pairs."
package-build-working-dir))) package-build-working-dir)))
pkg-info) pkg-info)
(pb/generate-info-files files pkg-cwd pkg-dir) (pb/create-tar
(pb/generate-dir-file files pkg-dir) (expand-file-name
(concat file-name "-" version ".tar") package-build-archive-dir)
(pb/create-tar (expand-file-name (concat file-name "-" version ".tar") pkg-dir
package-build-archive-dir) (delete-dups (append (mapcar 'cdr files) (list pkg-file))))
pkg-dir)
(let ((default-directory pkg-cwd))
(pb/write-pkg-readme (pb/find-package-commentary pkg-source)
file-name))
(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)))