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

Fixed some problems with updated epkgs repository.

Browse source 
Now uses both the .config and master files.
This commit is contained in:
Donald Ephraim Curtis 2011-12-03 00:40:52 -06:00
parent 0f8bbb6ce8
commit c2cde4998b
2 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
epkgs

@ -1 +1 @@
Subproject commit ad3160bc041ce0a977b0bd0bd72179bff30760c9 Subproject commit 6f590af6c53cebeb563ce7d40afd4ba9f24e04a7

53
package-build.el
View file

@ -73,7 +73,7 @@
"darcs" nil "darcs" nil
(current-buffer) (current-buffer)
t "changes" "--last" "1")) t "changes" "--last" "1"))
(message (message
(format-time-string (format-time-string
"%Y%m%d" "%Y%m%d"
(date-to-time (date-to-time
@ -104,7 +104,7 @@
"svn" nil "svn" nil
(current-buffer) (current-buffer)
t "info")) t "info"))
(message (message
(format-time-string (format-time-string
"%Y%m%d" "%Y%m%d"
(date-to-time (date-to-time
@ -136,7 +136,7 @@
"git" nil "git" nil
(current-buffer) (current-buffer)
t "show" "-s" "--format='\%ci'" "HEAD")) t "show" "-s" "--format='\%ci'" "HEAD"))
(message (message
(format-time-string (format-time-string
"%Y%m%d" "%Y%m%d"
(date-to-time (date-to-time
@ -154,19 +154,18 @@
"build the pkg file" "build the pkg file"
(let ((print-level nil) (let ((print-level nil)
(print-length nil) (print-length nil)
(pkglst (or (package-read-from-file pkg-file) (pkglst
(list 'define-package (or (package-read-from-file pkg-file)
file-name (list 'define-package
version file-name
homepage version
;; (list 'quote homepage
;; ;; Turn version lists into string form. (list 'quote (mapcar
(list 'quote (mapcar (lambda (elt)
(lambda (elt) (list (car elt)
(list (car elt) (package-version-join (cadr elt))))
(package-version-join (cadr elt)))) nil))))))
nil))))))
;; set the packages version ;; set the packages version
(setq pkglst (package-change-list-elt pkglst 2 version)) (setq pkglst (package-change-list-elt pkglst 2 version))
@ -193,6 +192,10 @@
(buffer-substring-no-properties (point-min) (point-max)))))))) (buffer-substring-no-properties (point-min) (point-max))))))))
(defun package-build-get-config (file-name) (defun package-build-get-config (file-name)
"get the configuration information for the given file-name"
(package-read-from-file (format "epkgs/%s/.config" file-name)))
(defun package-build-get-master (file-name)
"get the configuration information for the given file-name" "get the configuration information for the given file-name"
(package-read-from-file (format "epkgs/%s/master" file-name))) (package-read-from-file (format "epkgs/%s/master" file-name)))
@ -227,16 +230,16 @@
(defun package-build-archive (file-name) (defun package-build-archive (file-name)
"build a git package archive" "build a git package archive"
(interactive) (interactive)
(let* ((desc (package-build-get-config file-name)) (let* ((desc (package-build-get-master file-name))
(cfg (package-build-get-config file-name))
(name (intern file-name)) (name (intern file-name))
(local-dir (file-name-as-directory (expand-file-name file-name package-build-working-dir)))) (local-dir (file-name-as-directory (expand-file-name file-name package-build-working-dir))))
(when desc (when desc
(let* ((repo (plist-get desc :repository)) (let* ((repo-type (plist-get cfg :fetcher))
(repo-type (car repo)) (repo-url (plist-get cfg :url))
(repo-url (cdr repo))
(summary (plist-get desc :summary))) (summary (plist-get desc :summary)))
(package-build-read-archive-contents) (package-build-read-archive-contents)
(let* ((pkglst) (let* ((pkglst)
(pkgdeps) (pkgdeps)
(version (version
@ -256,14 +259,14 @@
(concat (file-name-as-directory package-build-working-dir) (concat (file-name-as-directory package-build-working-dir)
(file-name-as-directory pkg-base-dir)))) (file-name-as-directory pkg-base-dir))))
(default-directory package-build-working-dir)) (default-directory package-build-working-dir))
(when (file-exists-p local-dir) (when (and (file-exists-p local-dir) version)
(copy-directory file-name pkg-base-dir) (copy-directory file-name pkg-base-dir)
(setq pkglst (package-build-pkg-file pkg-file file-name version summary)) (setq pkglst (package-build-pkg-file pkg-file file-name version summary))
(setq pkgdeps (mapcar (setq pkgdeps (mapcar
(lambda (elt) (lambda (elt)
(list (car elt) (version-to-list (cadr elt)))) (list (car elt) (version-to-list (cadr elt))))
(eval (nth 4 pkglst)))) (eval (nth 4 pkglst))))
(message (prin1-to-string pkgdeps)) (message "deps: %s"(prin1-to-string pkgdeps))
(package-build-create-tar (package-build-create-tar
pkg-base-dir pkg-base-dir
(expand-file-name (expand-file-name
@ -271,9 +274,7 @@
(delete-directory pkg-base-dir t nil) (delete-directory pkg-base-dir t nil)
(package-build-add-to-archive-contents name version pkgdeps summary 'tar) (package-build-add-to-archive-contents name version pkgdeps summary 'tar)
(package-build-dump-archive-contents) (package-build-dump-archive-contents)
) (message "Success!")))))))
)
))))
(defun package-build-dump-archive-contents () (defun package-build-dump-archive-contents ()
"dump the archive contents back to the file" "dump the archive contents back to the file"