mirror of
https://github.com/correl/melpa.git
synced 2024-11-15 03:00:14 +00:00
Build system works now with new config.
This commit is contained in:
parent
c168725b80
commit
de6026cf85
2 changed files with 48 additions and 22 deletions
|
@ -201,11 +201,16 @@
|
||||||
"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)))
|
||||||
|
|
||||||
(defun package-build-create-tar (dir file)
|
|
||||||
|
(defun package-build-create-tar (dir file &optional files)
|
||||||
"create a tar for the file-name with version"
|
"create a tar for the file-name with version"
|
||||||
(let* ((default-directory package-build-working-dir)
|
(let* ((default-directory package-build-working-dir))
|
||||||
)
|
(if files
|
||||||
(process-file
|
(setq files (mapcar (lambda (fn) (concat dir "/" fn)) files))
|
||||||
|
(setq files (list dir)))
|
||||||
|
(message (prin1-to-string files))
|
||||||
|
(message default-directory)
|
||||||
|
(apply 'process-file
|
||||||
"tar" nil
|
"tar" nil
|
||||||
(get-buffer-create "*package-build-checkout*")
|
(get-buffer-create "*package-build-checkout*")
|
||||||
nil "-cvf"
|
nil "-cvf"
|
||||||
|
@ -213,9 +218,7 @@
|
||||||
"--exclude=.svn"
|
"--exclude=.svn"
|
||||||
"--exclude=.git*"
|
"--exclude=.git*"
|
||||||
"--exclude=_darcs"
|
"--exclude=_darcs"
|
||||||
dir)
|
files)))
|
||||||
))
|
|
||||||
|
|
||||||
|
|
||||||
(defun package-build-archives (&rest pkgs)
|
(defun package-build-archives (&rest pkgs)
|
||||||
"build archives"
|
"build archives"
|
||||||
|
@ -254,11 +257,7 @@
|
||||||
(message "Darcs")
|
(message "Darcs")
|
||||||
(package-build-checkout-darcs repo-url pkg-cwd))))
|
(package-build-checkout-darcs repo-url pkg-cwd))))
|
||||||
(pkg-base-dir (concat file-name "-" version))
|
(pkg-base-dir (concat file-name "-" version))
|
||||||
(pkg-file (expand-file-name
|
(pkg-file (concat file-name "-pkg.el"))
|
||||||
(concat file-name "-pkg.el")
|
|
||||||
(concat
|
|
||||||
(file-name-as-directory package-build-working-dir)
|
|
||||||
(file-name-as-directory pkg-base-dir))))
|
|
||||||
(default-directory package-build-working-dir))
|
(default-directory package-build-working-dir))
|
||||||
|
|
||||||
(cond
|
(cond
|
||||||
|
@ -272,18 +271,28 @@
|
||||||
(t
|
(t
|
||||||
(copy-directory file-name pkg-base-dir)
|
(copy-directory file-name pkg-base-dir)
|
||||||
(setq pkglst
|
(setq pkglst
|
||||||
(package-build-pkg-file pkg-file file-name version summary))
|
(package-build-pkg-file
|
||||||
|
(expand-file-name
|
||||||
|
pkg-file
|
||||||
|
(concat
|
||||||
|
(file-name-as-directory package-build-working-dir)
|
||||||
|
(file-name-as-directory pkg-base-dir)))
|
||||||
|
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))))
|
||||||
|
(when files
|
||||||
|
(add-to-list 'files pkg-file))
|
||||||
(package-build-create-tar
|
(package-build-create-tar
|
||||||
pkg-base-dir
|
pkg-base-dir
|
||||||
(expand-file-name
|
(expand-file-name
|
||||||
(concat file-name "-" version ".tar") package-build-archive-dir))
|
(concat file-name "-" version ".tar") package-build-archive-dir)
|
||||||
|
files)
|
||||||
(delete-directory pkg-base-dir t nil)
|
(delete-directory pkg-base-dir t nil)
|
||||||
(package-build-add-to-archive-contents
|
(package-build-add-to-archive-contents
|
||||||
name version pkgdeps summary 'tar))))))))
|
name version pkgdeps summary 'tar)))))
|
||||||
|
(package-build-dump-archive-contents))))
|
||||||
|
|
||||||
|
|
||||||
(defvar package-build-alist
|
(defvar package-build-alist
|
||||||
|
|
17
pkglist
17
pkglist
|
@ -7,4 +7,21 @@
|
||||||
:url "git://github.com/magit/magit.git"
|
:url "git://github.com/magit/magit.git"
|
||||||
:fetcher git
|
:fetcher git
|
||||||
:summary "Control Git from Emacs")
|
:summary "Control Git from Emacs")
|
||||||
|
(starter-kit
|
||||||
|
:url "git://github.com/technomancy/emacs-starter-kit.git"
|
||||||
|
:fetcher git
|
||||||
|
:summary "Saner defaults and goodies"
|
||||||
|
:files ("starter-kit-defuns.el"
|
||||||
|
"starter-kit-misc.el"
|
||||||
|
"starter-kit.el"))
|
||||||
|
(starter-kit-bindings
|
||||||
|
:url "git://github.com/technomancy/emacs-starter-kit.git"
|
||||||
|
:fetcher git
|
||||||
|
:summary "Saner defaults and goodies: bindings"
|
||||||
|
:files ("modules/starter-kit-bindings.el"))
|
||||||
|
(starter-kit-lisp
|
||||||
|
:url "git://github.com/technomancy/emacs-starter-kit.git"
|
||||||
|
:fetcher git
|
||||||
|
:summary "Saner defaults and goodies for lisp languages"
|
||||||
|
:files ("modules/starter-kit-lisp.el"))
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in a new issue