Skip to content

Commit 2abc00f

Browse files
committed
Assume ASDF 3 even for the project itself.
1 parent 112e872 commit 2abc00f

File tree

3 files changed

+18
-39
lines changed

3 files changed

+18
-39
lines changed

cl-project-test.asd

+8-15
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,15 @@
33
Copyright (c) 2011 Eitaro Fukamachi ([email protected])
44
|#
55

6-
(in-package :cl-user)
7-
(defpackage cl-project-test-asd
8-
(:use :cl :asdf))
9-
(in-package :cl-project-test-asd)
10-
11-
(defsystem cl-project-test
6+
(defsystem "cl-project-test"
7+
:defsystem-depends-on ("prove-asdf")
128
:author "Eitaro Fukamachi"
139
:license "LLGPL"
14-
:defsystem-depends-on (:prove-asdf)
15-
:depends-on (:cl-project
16-
:prove
17-
:caveman2
18-
:uiop)
19-
:components ((:module "t"
10+
:depends-on ("cl-project"
11+
"prove"
12+
"caveman2"
13+
"uiop")
14+
:components ((:module "tests"
2015
:components
2116
((:test-file "cl-project"))))
22-
:defsystem-depends-on (:prove-asdf)
23-
:perform (test-op :after (op c)
24-
(funcall (intern #.(string :run-test-system) :prove.asdf) c)))
17+
:perform (test-op (op c) (symbol-call :prove-asdf :run-test-system c)))

cl-project.asd

+10-24
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,15 @@
1212
Author: Eitaro Fukamachi ([email protected])
1313
|#
1414

15-
(in-package :cl-user)
16-
(defpackage cl-project-asd
17-
(:use :cl :asdf))
18-
(in-package :cl-project-asd)
19-
20-
(defsystem cl-project
21-
:version "0.2"
15+
(defsystem "cl-project"
16+
:version "0.3"
2217
:author "Eitaro Fukamachi"
2318
:license "LLGPL"
24-
:depends-on (:cl-emb
25-
:uiop
26-
:cl-ppcre
27-
:local-time
28-
:prove)
19+
:depends-on ("cl-emb"
20+
"uiop"
21+
"cl-ppcre"
22+
"local-time"
23+
"prove")
2924
:components ((:module "src"
3025
:components
3126
((:file "cl-project" :depends-on ("specials" "file" "skeleton"))
@@ -36,15 +31,6 @@
3631
(:file "specials"))))
3732
:description "Generate a skeleton for modern project"
3833
:long-description
39-
#.(with-open-file (stream (merge-pathnames
40-
#p"README.markdown"
41-
(or *load-pathname* *compile-file-pathname*))
42-
:if-does-not-exist nil
43-
:direction :input)
44-
(when stream
45-
(let ((seq (make-array (file-length stream)
46-
:element-type 'character
47-
:fill-pointer t)))
48-
(setf (fill-pointer seq) (read-sequence seq stream))
49-
seq)))
50-
:in-order-to ((test-op (load-op cl-project-test))))
34+
#.(read-file-string
35+
(subpathname *load-pathname* "README.markdown"))
36+
:in-order-to ((test-op (test-op "cl-project-test"))))
File renamed without changes.

0 commit comments

Comments
 (0)