From c81190986d954df7d3244b1ab1a950a15768f7d8 Mon Sep 17 00:00:00 2001 From: SANO Masatoshi Date: Sat, 23 Apr 2016 16:14:36 +0900 Subject: [PATCH] forget... that util-install shouldn't include dependency for quicklisp. --- lisp/util-install-quicklisp.lisp | 48 +++++++++++++------------------- lisp/util-install.lisp | 15 ---------- 2 files changed, 20 insertions(+), 43 deletions(-) diff --git a/lisp/util-install-quicklisp.lisp b/lisp/util-install-quicklisp.lisp index 9154f79..61de129 100644 --- a/lisp/util-install-quicklisp.lisp +++ b/lisp/util-install-quicklisp.lisp @@ -177,32 +177,24 @@ :second 0)) ;;(parse-date "22-Aug-2015 18:19 ") -(asdf:defsystem :roswell.install.abcl-bin - :components ((:file "install-abcl-bin"))) +(defun github-version (user project filter) + (let ((file (merge-pathnames (format nil "tmp/~A.html" project) (homedir)))) + (unless (and (probe-file file) + (< (get-universal-time) (+ (* 60 60) (file-write-date file)))) + (download (format nil "https://github.com/~A/~A/releases.atom" user project) file)) + (nreverse + (loop for link in (plump:get-elements-by-tag-name (plump:parse file) "link") + for href = (plump:get-attribute link "href") + when (eql (aref href 0) #\/) + collect (funcall filter href))))) -(asdf:defsystem :roswell.install.ccl-bin - :components ((:file "install-ccl-bin"))) - -(asdf:defsystem :roswell.install.clisp - :components ((:file "install-clisp"))) - -(asdf:defsystem :roswell.install.ecl - :components ((:file "install-ecl"))) - -(asdf:defsystem :roswell.install.sbcl-bin - :components ((:file "install-sbcl-bin"))) - -(asdf:defsystem :roswell.install.sbcl - :components ((:file "install-sbcl"))) - -(asdf:defsystem :roswell.install.7zip+ - :components ((:file "install+7zip"))) - -(asdf:defsystem :roswell.install.ffcall+ - :components ((:file "install+ffcall"))) - -(asdf:defsystem :roswell.install.msys2+ - :components ((:file "install+msys2"))) - -(asdf:defsystem :roswell.install.sigsegv+ - :components ((:file "install+sigsegv"))) +(asdf:defsystem :roswell.install.abcl-bin :components ((:file "install-abcl-bin"))) +(asdf:defsystem :roswell.install.ccl-bin :components ((:file "install-ccl-bin"))) +(asdf:defsystem :roswell.install.clisp :components ((:file "install-clisp"))) +(asdf:defsystem :roswell.install.ecl :components ((:file "install-ecl"))) +(asdf:defsystem :roswell.install.sbcl-bin :components ((:file "install-sbcl-bin"))) +(asdf:defsystem :roswell.install.sbcl :components ((:file "install-sbcl"))) +(asdf:defsystem :roswell.install.7zip+ :components ((:file "install+7zip"))) +(asdf:defsystem :roswell.install.ffcall+ :components ((:file "install+ffcall"))) +(asdf:defsystem :roswell.install.msys2+ :components ((:file "install+msys2"))) +(asdf:defsystem :roswell.install.sigsegv+ :components ((:file "install+sigsegv"))) diff --git a/lisp/util-install.lisp b/lisp/util-install.lisp index f76d442..38ffcb2 100644 --- a/lisp/util-install.lisp +++ b/lisp/util-install.lisp @@ -2,10 +2,6 @@ (when (cl:find-package :ros.install.util) (pushnew :ros.install.util *features*)) -(ros:quicklisp :environment nil) -(unless (find-package :plump) - (ql:quickload '(:plump) :silent t)) - (defpackage :ros.install (:use :cl :ros.util) (:export :*build-hook*)) @@ -51,14 +47,3 @@ (declare (ignore condition)) (format t "SIGINT detected, cleaning up the partially installed files~%") (ros:roswell `(,(format nil "deleteing ~A/~A" (getf (cdr param) :target) (getf (cdr param) :version))) :string t))))))) - -(defun github-version (user project filter) - (let ((file (merge-pathnames (format nil "tmp/~A.html" project) (homedir)))) - (unless (and (probe-file file) - (< (get-universal-time) (+ (* 60 60) (file-write-date file)))) - (download (format nil "https://github.com/~A/~A/releases.atom" user project) file)) - (nreverse - (loop for link in (plump:get-elements-by-tag-name (plump:parse file) "link") - for href = (plump:get-attribute link "href") - when (eql (aref href 0) #\/) - collect (funcall filter href)))))