From 15ec9e1e3ba5c576a3a4cf3c8f22d27f79c665f2 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Wed, 15 Dec 2010 23:42:37 -0500
Subject: [PATCH] 2.011.7: restore compatibility with SBCL 1.0.23 and earlier
 whose DIRECTORY doesn't have RESOLVE-SYMLINKS.

---
 Makefile                               | 8 ++++----
 asdf.asd                               | 2 +-
 asdf.lisp                              | 6 ++++--
 bin/{asdf-version.sh => asdf-version}  | 0
 bin/{bump-version.sh => bump-version}  | 0
 bin/{link-tarball.sh => link-tarball}  | 0
 bin/{build-tarball.sh => make-tarball} | 0
 bin/{rsync-cp.sh => rsync-cp}          | 2 +-
 8 files changed, 10 insertions(+), 8 deletions(-)
 rename bin/{asdf-version.sh => asdf-version} (100%)
 rename bin/{bump-version.sh => bump-version} (100%)
 rename bin/{link-tarball.sh => link-tarball} (100%)
 rename bin/{build-tarball.sh => make-tarball} (100%)
 rename bin/{rsync-cp.sh => rsync-cp} (91%)

diff --git a/Makefile b/Makefile
index f3026e8f..4a003794 100644
--- a/Makefile
+++ b/Makefile
@@ -21,13 +21,13 @@ install: archive-copy
 archive: FORCE
 	sbcl --userinit /dev/null --sysinit /dev/null --load bin/make-helper.lisp \
 		--eval "(rewrite-license)" --eval "(quit)"
-	bin/build-tarball.sh
+	bin/make-tarball
 
 archive-copy: archive
 	git checkout release
-	bin/rsync-cp.sh tmp/asdf*.tar.gz $(webhome_private)/archives
-	bin/link-tarball.sh $(clnet_home) $(user)
-	bin/rsync-cp.sh tmp/asdf.lisp $(webhome_private)
+	bin/rsync-cp tmp/asdf*.tar.gz $(webhome_private)/archives
+	bin/link-tarball $(clnet_home) $(user)
+	bin/rsync-cp tmp/asdf.lisp $(webhome_private)
 	${MAKE} push
 
 push:
diff --git a/asdf.asd b/asdf.asd
index 612f66e3..c39a5395 100644
--- a/asdf.asd
+++ b/asdf.asd
@@ -12,7 +12,7 @@
   :licence "MIT"
   :description "Another System Definition Facility"
   :long-description "ASDF builds Common Lisp software organized into defined systems."
-  :version "2.011.6"
+  :version "2.011.7"
   ;;:version #.(asdf:asdf-version) ; how do we make that the *described* ASDF's version rather than the *previously loaded* ASDF's version?
   :depends-on ()
   :components
diff --git a/asdf.lisp b/asdf.lisp
index 16e78c01..17212bcf 100644
--- a/asdf.lisp
+++ b/asdf.lisp
@@ -74,11 +74,13 @@
   (defvar *asdf-version* nil)
   (defvar *upgraded-p* nil)
   (let* (;; For bug reporting sanity, please always bump this version when you modify this file.
+         ;; Please also modify asdf.asd to reflect this change. The script bin/bump-version
+         ;; can help you do these changes in synch (look at the source for documentation).
          ;; "2.345" would be an official release
          ;; "2.345.6" would be a development version in the official upstream
          ;; "2.345.0.7" would be your seventh local modification of official release 2.345
          ;; "2.345.6.7" would be your seventh local modification of development version 2.345.6
-         (asdf-version "2.011.6")
+         (asdf-version "2.011.7")
          (existing-asdf (fboundp 'find-system))
          (existing-version *asdf-version*)
          (already-there (equal asdf-version existing-version)))
@@ -2735,7 +2737,7 @@ located."
                              #+ccl '(:follow-links nil)
                              #+clisp '(:circle t :if-does-not-exist :ignore)
                              #+(or cmu scl) '(:follow-links nil :truenamep nil)
-                             #+sbcl '(:resolve-symlinks nil)))))
+                             #+sbcl (when (find-symbol "RESOLVE-SYMLINKS" "SB-IMPL") '(:resolve-symlinks nil))))))
 
 (defun* validate-configuration-directory (directory tag validator &key invalid-form-reporter)
   "Map the VALIDATOR across the .conf files in DIRECTORY, the TAG will
diff --git a/bin/asdf-version.sh b/bin/asdf-version
similarity index 100%
rename from bin/asdf-version.sh
rename to bin/asdf-version
diff --git a/bin/bump-version.sh b/bin/bump-version
similarity index 100%
rename from bin/bump-version.sh
rename to bin/bump-version
diff --git a/bin/link-tarball.sh b/bin/link-tarball
similarity index 100%
rename from bin/link-tarball.sh
rename to bin/link-tarball
diff --git a/bin/build-tarball.sh b/bin/make-tarball
similarity index 100%
rename from bin/build-tarball.sh
rename to bin/make-tarball
diff --git a/bin/rsync-cp.sh b/bin/rsync-cp
similarity index 91%
rename from bin/rsync-cp.sh
rename to bin/rsync-cp
index d95e3238..1be0392c 100755
--- a/bin/rsync-cp.sh
+++ b/bin/rsync-cp
@@ -3,7 +3,7 @@
 #        --extended-attributes \
 
 rsync \
- 	--archive \
+	--archive \
 	--rsh=ssh \
 	--compress \
 	--partial \
-- 
GitLab