Skip to content

Commit

Permalink
0.7.13.32
Browse files Browse the repository at this point in the history
	Update contrib/asdf to newer upstream version
	... fix loopiness
	... add test-op definitions
	... quote evaluation of *central-registry* components to
  	    make it more useful when a core is dumped containing asdf

	Rewrite asdf-using contrib makefiles to use common asdf-module.mk
	... and their .asd files to define test-op
  • Loading branch information
telent committed Mar 19, 2003
1 parent 0739c36 commit 93c941d
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 52 deletions.
17 changes: 17 additions & 0 deletions contrib/asdf-module.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
CC=gcc
export CC

all:
$(MAKE) -C ../asdf
echo "(asdf:operate 'asdf:load-op :$(SYSTEM) :force t)" | \
$(SBCL) --eval '(load "../asdf/asdf")'

test: all
echo "(asdf:operate (quote asdf:load-op) :$(SYSTEM)) "\
"(asdf:operate (quote asdf:test-op) :$(SYSTEM))" | \
$(SBCL) --eval '(load "../asdf/asdf")'


install:
tar cf - . | ( cd $(INSTALL_DIR) && tar xpvf - )
( cd $(SBCL_HOME)/systems && ln -fs ../$(SYSTEM)/$(SYSTEM).asd . )
26 changes: 14 additions & 12 deletions contrib/asdf/asdf.lisp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
;;; This is asdf: Another System Definition Facility. 1.65
;;; This is asdf: Another System Definition Facility. 1.68
;;;
;;; Feedback, bug reports, and patches are all welcome: please mail to
;;; <cclan-list@lists.sf.net>. But note first that the canonical
Expand Down Expand Up @@ -43,6 +43,7 @@
#:hyperdocumentation #:hyperdoc

#:compile-op #:load-op #:load-source-op #:test-system-version
#:test-op
#:operation ; operations
#:feature ; sort-of operation
#:version ; metaphorically sort-of an operation
Expand Down Expand Up @@ -88,7 +89,7 @@

(in-package #:asdf)

(defvar *asdf-revision* (let* ((v "1.65")
(defvar *asdf-revision* (let* ((v "1.68")
(colon (or (position #\: v) -1))
(dot (position #\. v)))
(and v colon dot
Expand Down Expand Up @@ -471,11 +472,8 @@ system."))
(not (eql c dep-c)))
(when (eql force-p t)
(setf (getf args :force) nil))
;; note we lose the parent slot, because we don't want
;; forced to propagate backwards either (changes in depended-on
;; systems shouldn't force recompilation of the depending system)
(apply #'make-instance dep-o
;:parent o
:parent o
:original-initargs args args))
((subtypep (type-of o) dep-o)
o)
Expand Down Expand Up @@ -769,6 +767,10 @@ system."))
(component-property c 'last-loaded-as-source)))
nil t))

(defclass test-op (operation) ())

(defmethod perform ((operation test-op) (c component))
nil)

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; invoking operations
Expand Down Expand Up @@ -1021,18 +1023,18 @@ output to *trace-output*. Returns the shell's exit code."
(provide name))))

(pushnew
(merge-pathnames "systems/"
(truename (sb-ext:posix-getenv "SBCL_HOME")))
'(merge-pathnames "systems/"
(truename (sb-ext:posix-getenv "SBCL_HOME")))
*central-registry*)

(pushnew
(merge-pathnames "site-systems/"
(truename (sb-ext:posix-getenv "SBCL_HOME")))
'(merge-pathnames "site-systems/"
(truename (sb-ext:posix-getenv "SBCL_HOME")))
*central-registry*)

(pushnew
(merge-pathnames ".sbcl/systems/"
(user-homedir-pathname))
'(merge-pathnames ".sbcl/systems/"
(user-homedir-pathname))
*central-registry*)

(pushnew 'module-provide-asdf sb-ext:*module-provider-functions*))
18 changes: 1 addition & 17 deletions contrib/sb-bsd-sockets/Makefile
Original file line number Diff line number Diff line change
@@ -1,18 +1,2 @@
SYSTEM=sb-bsd-sockets
CC=gcc
export CC

all:
$(MAKE) -C ../asdf
echo "(asdf:operate 'asdf:load-op :$(SYSTEM) :force t)" | \
$(SBCL) --eval '(load "../asdf/asdf")'

test: all
echo "(asdf:operate 'asdf:load-op :$(SYSTEM)) \
(or (rt:do-tests) (error \"test failed, cannot install\"))" | \
$(SBCL) --eval '(load "../asdf/asdf")'


install:
tar cf - . | ( cd $(INSTALL_DIR) && tar xpvf - )
( cd $(SBCL_HOME)/systems && ln -fs ../$(SYSTEM)/$(SYSTEM).asd . )
include ../asdf-module.mk
3 changes: 3 additions & 0 deletions contrib/sb-bsd-sockets/sb-bsd-sockets.asd
Original file line number Diff line number Diff line change
Expand Up @@ -126,3 +126,6 @@
(:static-file "doc" :pathname "doc.lisp")
(:static-file "TODO")))

(defmethod perform ((o test-op) (c (eql (find-system :sb-bsd-sockets))))
(or (funcall (intern "DO-TESTS" (find-package "RT")))
(error "test-op failed")))
23 changes: 1 addition & 22 deletions contrib/sb-rotate-byte/Makefile
Original file line number Diff line number Diff line change
@@ -1,23 +1,2 @@
# FIXME I: This is more-or-less an exact copy of sb-bsd-sockets's
# Makefile. Maybe we should have a vanilla-asdf-module.mk?
#
# FIXME II: The thing that is preventing this is the use of RT as a
# regression tester... since we ask that modules do regression tests,
# maybe we should provide a regression test framework (in SB-RT, perhaps)?

SYSTEM=sb-rotate-byte

all:
$(MAKE) -C ../asdf
echo "(asdf:operate 'asdf:load-op :$(SYSTEM) :force t)" | \
$(SBCL) --eval '(load "../asdf/asdf")'

test: all
echo "(asdf:operate 'asdf:load-op :$(SYSTEM)) \
(load (compile-file \"rotate-byte-tests.lisp\"))" | \
$(SBCL) --eval '(load "../asdf/asdf")'


install:
tar cf - . | ( cd $(INSTALL_DIR) && tar xpvf - )
( cd $(SBCL_HOME)/systems && ln -fs ../$(SYSTEM)/$(SYSTEM).asd . )
include ../asdf-module.mk
4 changes: 4 additions & 0 deletions contrib/sb-rotate-byte/sb-rotate-byte.asd
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@
:pathname #.(make-pathname :directory '(:relative))
:if-component-dep-fails :ignore)
(:file "rotate-byte" :depends-on ("compiler"))))

(defmethod perform ((o test-op) (c (eql (find-system :sb-rotate-byte))))
(or (load (compile-file "rotate-byte-tests.lisp"))
(error "test-op failed")))
2 changes: 1 addition & 1 deletion version.lisp-expr
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
;;; versions, especially for internal versions off the main CVS
;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)

"0.7.13.31"
"0.7.13.32"

0 comments on commit 93c941d

Please sign in to comment.