Commit 93c941d8 authored by Daniel Barlow's avatar Daniel Barlow
Browse files

0.7.13.32
	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
parent 0739c369
Loading
Loading
Loading
Loading

contrib/asdf-module.mk

0 → 100644
+17 −0
Original line number Diff line number Diff line
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 . )
+14 −12
Original line number Diff line number Diff line
;;; 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
@@ -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
@@ -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 
@@ -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)
@@ -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
@@ -1021,17 +1023,17 @@ output to *trace-output*. Returns the shell's exit code."
	(provide name))))

  (pushnew
   (merge-pathnames "systems/"
   '(merge-pathnames "systems/"
     (truename (sb-ext:posix-getenv "SBCL_HOME")))
   *central-registry*)
  
  (pushnew
   (merge-pathnames "site-systems/"
   '(merge-pathnames "site-systems/"
     (truename (sb-ext:posix-getenv "SBCL_HOME")))
   *central-registry*)
  
  (pushnew
   (merge-pathnames ".sbcl/systems/"
   '(merge-pathnames ".sbcl/systems/"
     (user-homedir-pathname))
   *central-registry*)
  
+1 −17
Original line number Diff line number Diff line
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 −0
Original line number Diff line number Diff line
@@ -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")))
+1 −22
Original line number Diff line number Diff line
# 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
Loading