From d682a6565240a7ce64a05a9641c2142a4bd7e7a2 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <tunes@google.com>
Date: Thu, 24 Jul 2014 13:45:21 -0400
Subject: [PATCH] Fix make-git-tarball. Unsuccessfully try to hush quickload.

---
 tools/asdf-tools   | 4 +++-
 tools/release.lisp | 9 +++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/tools/asdf-tools b/tools/asdf-tools
index 56175c5a..dcfcdb24 100755
--- a/tools/asdf-tools
+++ b/tools/asdf-tools
@@ -13,7 +13,9 @@
 
 ;;; ASDF3 is loaded, now use it!
 (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!
 (uiop:restore-image :entry-point 'asdf-tools::entry-point)
diff --git a/tools/release.lisp b/tools/release.lisp
index b6d6353b..49d26a62 100644
--- a/tools/release.lisp
+++ b/tools/release.lisp
@@ -33,7 +33,6 @@
 
 (defun make-tarball-under-build (name base files)
   (check-type name string)
-  (ensure-pathname base :want-absolute t :want-existing t :want-directory t)
   (dolist (f files)
     (check-type f string))
   (let* ((base
@@ -61,7 +60,7 @@
     (ensure-directories-exist destination)
     (run `(cp "-pHux" --parents ,@files ,destination) :directory base :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)))
 
 (defun driver-files ()
@@ -87,10 +86,8 @@
 
 (defun make-git-tarball ()
   (build-asdf)
-  (with-asdf-dir ()
-    (run `(tar zcf ("build/" ,(asdf-git-name) ".tar.gz") build/asdf.lisp ,@(run/lines '(git ls-files))
-               (asdf-git-name)) :show t))
-  t)
+  (make-tarball-under-build (asdf-git-name) (pn)
+                            (cons "build/asdf.lisp" (run/lines '(git ls-files)))))
 
 (defun asdf-lisp-name ()
   (format nil "asdf-~A.lisp" *version*))
-- 
GitLab