X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-rotate-byte%2Fsb-rotate-byte.asd;fp=contrib%2Fsb-rotate-byte%2Fsb-rotate-byte.asd;h=dc5be27a787d008443bbb207cb84721a372cc6bc;hb=25c1769e30ff7404b52a9be663626d87f8ff75bc;hp=036f1ba484880e324afd98be87f09d8081557f22;hpb=9c3a9502bc872f024c365412d991ef43fd866e4c;p=sbcl.git

diff --git a/contrib/sb-rotate-byte/sb-rotate-byte.asd b/contrib/sb-rotate-byte/sb-rotate-byte.asd
index 036f1ba..dc5be27 100644
--- a/contrib/sb-rotate-byte/sb-rotate-byte.asd
+++ b/contrib/sb-rotate-byte/sb-rotate-byte.asd
@@ -1,9 +1,5 @@
 ;;; -*-  Lisp -*-
 
-(cl:defpackage #:sb-rotate-byte-system
-  (:use #:asdf #:cl))
-(cl:in-package #:sb-rotate-byte-system)
-
 (defsystem sb-rotate-byte
   :version "0.1"
   #+sb-building-contrib :pathname
@@ -12,22 +8,20 @@
   ((:file "package")
    (:file "compiler" :depends-on ("package"))
    (:module "vm"
-            :depends-on ("compiler")
-            :components
-            (#+x86
-             (:file "x86-vm")
-             #+x86-64
-             (:file "x86-64-vm")
-             #+ppc
-             (:file "ppc-vm"))
-            :pathname
-            #+sb-building-contrib #p"SYS:CONTRIB;SB-ROTATE-BYTE;"
-            #-sb-building-contrib #.(make-pathname :directory '(:relative)))
-   (:file "rotate-byte" :depends-on ("compiler"))))
+    :depends-on ("compiler")
+    :pathname ""
+    :components
+    ((:file "x86-vm" :if-feature :x86)
+     (:file "x86-64-vm" :if-feature :x86-64)
+     (:file "ppc-vm" :if-feature :ppc)))
+   (:file "rotate-byte" :depends-on ("compiler")))
+  :perform (load-op :after (o c) (provide 'sb-rotate-byte))
+  :perform (test-op (o c) (test-system 'sb-rotate-byte/tests)))
+
 
-(defmethod perform :after ((o load-op) (c (eql (find-system :sb-rotate-byte))))
-  (provide 'sb-rotate-byte))
+(defsystem sb-rotate-byte/tests
+  #+sb-building-contrib :pathname
+  #+sb-building-contrib #p"SYS:CONTRIB;SB-ROTATE-BYTE;"
+  :depends-on (sb-rotate-byte)
+  :components ((:file "rotate-byte-tests")))
 
-(defmethod perform ((o test-op) (c (eql (find-system :sb-rotate-byte))))
-  (or (load (compile-file "rotate-byte-tests.lisp"))
-      (error "test-op failed")))