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

Merge branch 'master' into minimakefile

parents 6d9e94a3 c2fb9bbb
...@@ -5,11 +5,15 @@ ...@@ -5,11 +5,15 @@
(ensure-pathname (system-relative-pathname :asdf/defsystem ()) (ensure-pathname (system-relative-pathname :asdf/defsystem ())
:want-physical t :want-absolute t :want-physical t :want-absolute t
:want-existing t :truename t)) :want-existing t :truename t))
(defun pn (&rest x) (defun pn (&rest x)
(subpathname *asdf-dir* (and x (uiop:resolve-relative-location x)))) (subpathname *asdf-dir* (and x (uiop:resolve-relative-location x))))
(defun nn (&rest x) (defun nn (&rest x)
(native-namestring (apply 'pn x))) (native-namestring (apply 'pn x)))
(defvar *uiop-dir* (pn "uiop/"))
(defvar *build-dir* (pn "build/"))
(defun call-with-asdf-dir (thunk &rest subs) (defun call-with-asdf-dir (thunk &rest subs)
(with-current-directory ((apply 'pn subs)) (with-current-directory ((apply 'pn subs))
(funcall thunk))) (funcall thunk)))
......
...@@ -59,15 +59,15 @@ ...@@ -59,15 +59,15 @@
(error "Destination ~S already exists, not taking chances - you can delete it yourself." (error "Destination ~S already exists, not taking chances - you can delete it yourself."
destination)) destination))
(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 ,*build-dir* (run* `(tar "zcfC" ,tarball ,*build-dir*
;; TODO: Have better autodetection for which tar is being used, ;; TODO: Have better autodetection for which tar is being used,
;; and fall back to no option if not recognized. ;; and fall back to no option if not recognized.
#+linux (* :owner root :group root) ;; assume GNU tar on Linux. #+linux (* :owner root :group root) ;; assume GNU tar on Linux.
#+darwin (* :uid 0 :gid 0) ;; assume BSD tar on Darwin. #+darwin (* :uid 0 :gid 0) ;; assume BSD tar on Darwin.
(,name /)) :show t) (,name /)) :show t)
(delete-directory-tree destination :validate #'(lambda (x) (equal x destination))) (delete-directory-tree destination :validate #'(lambda (x) (equal x destination)))
(values))) (success)))
(defun uiop-files () (defun uiop-files ()
"list files in uiop" "list files in uiop"
......
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