Update asdf style

fisxoj · Apr 8, 2018 · 05479a9 · 05479a9
1 parent 95646d3
commit 05479a9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 40 deletions.
diff --git a/validate-test.asd b/validate-test.asd
@@ -3,22 +3,15 @@
   Copyright (c) 2016 Matt Novenstern (fisxoj@gmail.com)
 |#
 
-(in-package :cl-user)
-(defpackage validate-test-asd
-  (:use :cl :asdf))
-(in-package :validate-test-asd)
-
 (defsystem validate-test
   :author "Matt Novenstern"
   :license ""
-  :depends-on (:validate
-               :prove)
-  :components ((:module "t"
-                :components
-                ((:test-file "validate"))))
+  :depends-on ("validate"
+               "prove")
+  :pathname #P"t/"
+  :components ((:test-file "validate"))
   :description "Test system for validate"
 
-  :defsystem-depends-on (:prove-asdf)
-  :perform (test-op :after (op c)
-                    (funcall (intern #.(string :run-test-system) :prove-asdf) c)
-                    (asdf:clear-system c)))
+  :defsystem-depends-on ("prove-asdf")
+  :perform (test-op (op c)
+                    (symbol-call :prove-asdf :run-test-system c)))
diff --git a/validate.asd b/validate.asd
@@ -3,34 +3,18 @@
   Copyright (c) 2016 Matt Novenstern (fisxoj@gmail.com)
 |#
 
-(in-package :cl-user)
-(defpackage validate-asd
-  (:use :cl :asdf))
-(in-package :validate-asd)
-
 (defsystem validate
   :version "0.2.2"
   :author "Matt Novenstern"
   :license "LLGPLv3"
-  :depends-on (#:iterate
-                #:cl-ppcre
-                #:alexandria
-                #:local-time
-                #:jonathan)
-  :components ((:module "src"
-                :components
-                ((:file "validate"))))
-  :description ""
-  :long-description
-  #.(with-open-file (stream (merge-pathnames
-                             #p"README.org"
-                             (or *load-pathname* *compile-file-pathname*))
-                            :if-does-not-exist nil
-                            :direction :input)
-      (when stream
-        (let ((seq (make-array (file-length stream)
-                               :element-type 'character
-                               :fill-pointer t)))
-          (setf (fill-pointer seq) (read-sequence seq stream))
-          seq)))
+  :depends-on ("iterate"
+               "cl-ppcre"
+               "alexandria"
+               "local-time"
+               "jonathan")
+  :pathname #P"src/"
+  :components ((:file "validate"))
+
+  :description "Data validation library."
+
   :in-order-to ((test-op (test-op validate-test))))