Skip to content
Snippets Groups Projects
Commit a61a8608 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

Further fix archive building.

parent e9df2f58
No related branches found
No related tags found
No related merge requests found
...@@ -122,8 +122,13 @@ ...@@ -122,8 +122,13 @@
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* (,name /)) :show t) (run `(tar "zcfC" ,tarball ,*build-dir*
(delete-directory-tree destination :validate (lambda (x) (equal x destination))) ;; TODO: Have better autodetection for which tar is being used,
;; and fall back to no option if not recognized.
#+linux (* :owner root :group root) ;; assume GNU tar on Linux.
#+darwin (* :uid 0 :gid 0) ;; assume BSD tar on Darwin.
(,name /)) :show t)
(delete-directory-tree destination :validate #'(lambda (x) (equal x destination)))
(values))) (values)))
(defun driver-files () (defun driver-files ()
...@@ -144,12 +149,12 @@ ...@@ -144,12 +149,12 @@
(defun asdf-git-name () (defun asdf-git-name ()
(strcat "asdf-" *version*)) (strcat "asdf-" *version*))
(defun all-asdf-files ()
(remove-if #'(lambda (x) (string-prefix-p "ext/" x))
(run/lines '(git ls-files))))
(defun make-git-tarball () (defun make-git-tarball ()
(build-asdf) (build-asdf)
(with-current-directory ((pn)) (make-tarball-under-build (asdf-git-name) *asdf-dir* (all-asdf-files)))
(run `(tar zcf ("build/" ,(asdf-git-name) ".tar.gz") "--exclude" ext/ build/asdf.lisp ,@(run/lines '(git ls-files)))
:show t))
(values))
(defun asdf-lisp-name () (defun asdf-lisp-name ()
(format nil "asdf-~A.lisp" *version*)) (format nil "asdf-~A.lisp" *version*))
...@@ -172,8 +177,9 @@ ...@@ -172,8 +177,9 @@
(defun publish-archive () (defun publish-archive ()
(let ((tarballs (mapcar 'tarname (list (driver-name) (asdf-defsystem-name) (asdf-git-name))))) (let ((tarballs (mapcar 'tarname (list (driver-name) (asdf-defsystem-name) (asdf-git-name)))))
(run (format nil "cd ~S && rsync ~{~S ~}~S common-lisp.net:/project/asdf/public_html/archives/" (run `(rsync "--times" "--chmod=a+rX,ug+w"
/build-dir/ tarballs (asdf-lisp-name)) :show t)) ,@tarballs ,(asdf-lisp-name) (,*clnet* ":" ,(public-path "archives/")))
:show t :directory (pn "build/")))
(format t "~&To download the tarballs, point your browser at:~% (format t "~&To download the tarballs, point your browser at:~%
http://common-lisp.net/project/asdf/archives/ http://common-lisp.net/project/asdf/archives/
~%") ~%")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment