Commit 9f6ad24d authored by Francois-Rene Rideau's avatar Francois-Rene Rideau

2.014.17: make lispworks happier wrt compatfmt.

Test support for symlinked .asd's to prevent future regressions
as per the 2.014.9 bug fixed in 2.014.16.
parent 59392e15
......@@ -38,6 +38,7 @@ tmp/
*.x86f
*.bak
*.data
*.ufasl
test/try-reloading-dependency.asd
test/fileMissing.lisp
......
......@@ -12,7 +12,7 @@
:licence "MIT"
:description "Another System Definition Facility"
:long-description "ASDF builds Common Lisp software organized into defined systems."
:version "2.014.16" ;; to be automatically updated by bin/bump-revision
:version "2.014.17" ;; to be automatically updated by bin/bump-revision
:depends-on ()
:components
((:file "asdf")
......
;;; -*- mode: common-lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
;;; This is ASDF 2.014.16: Another System Definition Facility.
;;; This is ASDF 2.014.17: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
......@@ -75,27 +75,27 @@
;;;; See https://bugs.launchpad.net/asdf/+bug/485687
;;;; See more near the end of the file.
;;; Strip out formatting that is not supported on Genera.
(defmacro compatfmt (format)
#-genera format
#+genera
(loop :for (unsupported . replacement) :in
'(("~@<" . "")
("; ~@;" . "; ")
("~3i~_" . "")
("~@:>" . "")
("~:>" . "")) :do
(loop :for found = (search unsupported format) :while found :do
(setf format
(concatenate 'simple-string
(subseq format 0 found) replacement
(subseq format (+ found (length unsupported)))))))
format)
(eval-when (:load-toplevel :compile-toplevel :execute)
(defvar *asdf-version* nil)
(defvar *upgraded-p* nil)
(defvar *asdf-verbose* nil) ; was t from 2.000 to 2.014.12.
;; Strip out formatting that is not supported on Genera.
;; Has to be inside the eval-when to make Lispworks happy (!)
(defmacro compatfmt (format)
#-genera format
#+genera
(loop :for (unsupported . replacement) :in
'(("~@<" . "")
("; ~@;" . "; ")
("~3i~_" . "")
("~@:>" . "")
("~:>" . "")) :do
(loop :for found = (search unsupported format) :while found :do
(setf format
(concatenate 'simple-string
(subseq format 0 found) replacement
(subseq format (+ found (length unsupported)))))))
format)
(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).
......@@ -104,7 +104,7 @@
;; "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.014.16")
(asdf-version "2.014.17")
(existing-asdf (fboundp 'find-system))
(existing-version *asdf-version*)
(already-there (equal asdf-version existing-version)))
......
;;; -*- Lisp -*-
(asdf:defsystem test-multiple
:components
((:file "file1")))
(asdf:defsystem test-multiple-too
:components
((:file "file1")))
(asdf:defsystem test-multiple-free
:components
((:file "file1")))
;;; -*- Lisp -*-
(load "script-support.lisp")
(load-asdf)
(quit-on-error
(setf asdf:*central-registry* '(*default-pathname-defaults*))
(asdf:load-system 'test-multiple)
(let* ((asd (asdf:merge-pathnames* (asdf:coerce-pathname "test-multiple.asd")
*test-directory*))
(asd2 (asdf:merge-pathnames* (asdf:coerce-pathname "../tmp/test-multiple-too.asd")
*test-directory*))
(file1 (asdf:compile-file-pathname* "file1")))
(assert (= 0 (asdf:run-shell-command
(format nil "/bin/ln -sf ~A ~A" asd asd2))))
(asdf:load-system 'test-multiple-too)
(assert (asdf::probe-file* file1))))
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