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

ASDF 2.014.3: in coerce-pathname, abcl 0.25 needs same workaround as xcl 0.0.0.291.

Also, update testing infrastructure to work with latest xcl from git.
parent 31a840f2
......@@ -10,10 +10,10 @@ webhome_public := "http://common-lisp.net/project/asdf/"
clnet_home := "/project/asdf/public_html/"
gpg := gpg
sourceDirectory := $(shell pwd)
keyid ?= 4D822AA2
lisps ?= ccl clisp sbcl ecl abcl allegro scl
lisps ?= ccl clisp sbcl ecl abcl xcl scl allegro
## not tested by me: allegromodern cmucl lispworks
## will pass tests but not return proper exit value: xcl 0.0.0.291
## FAIL: gclcvs (condition handling)
## maybe supported by asdf, not supported yet by our tests: cormancl mcl genera
......@@ -93,7 +93,7 @@ test-all: test-forward-references test-upgrade do-test-all
debian-package: mrproper
: $${RELEASE:="$$(git tag -l '2.0[0-9][0-9]' | tail -n 1)"} ; \
git-buildpackage --git-debian-branch=release --git-upstream-branch=$$RELEASE --git-tag --git-retag --git-ignore-branch -sgpg -p${gpg}
git-buildpackage --git-debian-branch=release --git-upstream-branch=$$RELEASE --git-tag --git-retag --git-ignore-branch -s${gpg} -k${keyid}
# Replace SBCL's ASDF with the current one.
# not recommended: just use (asdf:load-system :asdf)
......
......@@ -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.2" ;; to be automatically updated by bin/bump-revision
:version "2.014.3" ;; 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.2: Another System Definition Facility.
;;; This is ASDF 2.014.3: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
......@@ -99,7 +99,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.2")
(asdf-version "2.014.3")
(existing-asdf (fboundp 'find-system))
(existing-version *asdf-version*)
(already-there (equal asdf-version existing-version)))
......@@ -361,7 +361,7 @@
(defun asdf-version ()
"Exported interface to the version of ASDF currently installed. A string.
You can compare this string with e.g.:
(ASDF:VERSION-SATISFIES (ASDF:ASDF-VERSION) \"2.345\")."
(ASDF:VERSION-SATISFIES (ASDF:ASDF-VERSION) \"2.345.67\")."
*asdf-version*)
(defvar *resolve-symlinks* t
......@@ -1574,8 +1574,8 @@ Host, device and version components are taken from DEFAULTS."
(t
(split-name-type filename)))
(make-pathname :directory (cons relative path) :name name :type type
#-xcl #-xcl ;; 0.0.0.291 has a bug, behaves like merge-pathnames.
:defaults (or defaults *default-pathname-defaults*)))))))
. #.(or #-(or xcl abcl) ;; xcl 0.0.0.291 and abcl 0.25 have a bug, whereby make-pathname merges directories like merge-pathnames.
'(:defaults (or defaults *default-pathname-defaults*)))))))))
(defun* merge-component-name-type (name &key type defaults)
;; For backwards compatibility only, for people using internals.
......
cl-asdf (2:2.014.3-1) unstable; urgency=low
* yet another debian package attempt
* update to 2.014.3, workaround for ABCL make-pathname bug (same as on XCL).
-- Francois-Rene Rideau <fare@tunes.org> Mon, 04 Apr 2011 23:27:30 -0400
cl-asdf (2:2.014.2-1) unstable; urgency=low
* yet another attempt at a debian package.
......
......@@ -7,5 +7,5 @@
;;; the right value. This attempts to test for that.
(quit-on-error
(unless (or #+asdf-windows t)
(assert (eql #-xcl 1 #+xcl 256 (asdf:run-shell-command "false")))
(assert (eql 1 (asdf:run-shell-command "false")))
(assert (eql 0 (asdf:run-shell-command "true")))))
......@@ -68,13 +68,8 @@
(ccl::quit return)
#+sbcl
(sb-ext:quit :unix-status return)
#+abcl
#+(or abcl xcl)
(ext:quit :status return)
#+xcl
(progn
(unless (zerop return)
(format *error-output* "~&XCL won't let me exit with error return code ~D~%" return))
(ext:quit))
(error "Don't know how to quit Lisp; wanting to use exit code ~a" return))
......
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