Commit d682a656 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau

Fix make-git-tarball. Unsuccessfully try to hush quickload.

parent 335d386d
...@@ -13,7 +13,9 @@ ...@@ -13,7 +13,9 @@
;;; ASDF3 is loaded, now use it! ;;; ASDF3 is loaded, now use it!
(eval-when (:compile-toplevel :load-toplevel :execute) (eval-when (:compile-toplevel :load-toplevel :execute)
(#-quicklisp asdf:load-system #+quicklisp ql:quickload :asdf-tools)) #-quicklisp (asdf:load-system :asdf-tools :verbose nil)
#+quicklisp (ql:quickload :asdf-tools :verbose nil :explain nil :prompt nil))
;;; Actually run the stuff! ;;; Actually run the stuff!
(uiop:restore-image :entry-point 'asdf-tools::entry-point) (uiop:restore-image :entry-point 'asdf-tools::entry-point)
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
(defun make-tarball-under-build (name base files) (defun make-tarball-under-build (name base files)
(check-type name string) (check-type name string)
(ensure-pathname base :want-absolute t :want-existing t :want-directory t)
(dolist (f files) (dolist (f files)
(check-type f string)) (check-type f string))
(let* ((base (let* ((base
...@@ -61,7 +60,7 @@ ...@@ -61,7 +60,7 @@
(ensure-directories-exist destination) (ensure-directories-exist destination)
(run `(cp "-pHux" --parents ,@files ,destination) :directory base :show t) (run `(cp "-pHux" --parents ,@files ,destination) :directory base :show t)
(run `(tar "zcfC" ,tarball ,(pn "build/") (,name /)) :show t) (run `(tar "zcfC" ,tarball ,(pn "build/") (,name /)) :show t)
(delete-directory-tree destination :validate (lambda (x) (equal x destination))) (delete-directory-tree destination :validate (complement #'wild-pathname-p))
(values))) (values)))
(defun driver-files () (defun driver-files ()
...@@ -87,10 +86,8 @@ ...@@ -87,10 +86,8 @@
(defun make-git-tarball () (defun make-git-tarball ()
(build-asdf) (build-asdf)
(with-asdf-dir () (make-tarball-under-build (asdf-git-name) (pn)
(run `(tar zcf ("build/" ,(asdf-git-name) ".tar.gz") build/asdf.lisp ,@(run/lines '(git ls-files)) (cons "build/asdf.lisp" (run/lines '(git ls-files)))))
(asdf-git-name)) :show t))
(defun asdf-lisp-name () (defun asdf-lisp-name ()
(format nil "asdf-~A.lisp" *version*)) (format nil "asdf-~A.lisp" *version*))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment