changeset 615: |
ae4983075819 |
parent 614: |
f03dbf6338ed |
child 616: |
c48704d7b06f |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Tue, 20 Aug 2024 19:12:01 -0400 |
files: |
lisp/ffi/rocksdb/rocksdb.asd lisp/lib/net/net.asd lisp/lib/net/pkg.lisp lisp/lib/obj/obj.asd lisp/std/std.asd |
description: |
some fixes |
1.1--- a/lisp/ffi/rocksdb/rocksdb.asd Mon Aug 19 21:52:55 2024 -0400
1.2+++ b/lisp/ffi/rocksdb/rocksdb.asd Tue Aug 20 19:12:01 2024 -0400
1.3@@ -15,10 +15,10 @@
1.4 (:file "types")
1.5 (:file "opts")
1.6 (:file "sst")
1.7- (:file "slicetransform")
1.8 (:file "db")
1.9 (:file "metadata")
1.10 (:file "merge")
1.11+ (:file "slicetransform")
1.12 (:file "compaction")
1.13 (:file "comparator")
1.14 (:file "writebatch")
2.1--- a/lisp/lib/net/net.asd Mon Aug 19 21:52:55 2024 -0400
2.2+++ b/lisp/lib/net/net.asd Tue Aug 20 19:12:01 2024 -0400
2.3@@ -6,10 +6,9 @@
2.4 :depends-on
2.5 (:sb-concurrency :sb-posix
2.6 :sb-bsd-sockets :cl-ppcre
2.7- :fast-io :swank
2.8+ :fast-io ;; :swank :swank-client
2.9 :dat :obj
2.10 :io :parse
2.11- :swank-client
2.12 :cl+ssl :cli
2.13 :chipz :babel :chunga
2.14 :std :log)
2.15@@ -26,8 +25,8 @@
2.16 (:file "tlv")
2.17 (:file "osc")))
2.18 (:module "proto"
2.19- :components ((:file "crew")
2.20- (:file "swank")
2.21+ :components ((:file "crew" :if-feature "swank")
2.22+ (:file "swank" :if-feature "swank")
2.23 (:file "http")
2.24 (:file "dns")
2.25 (:file "ssh")))
3.1--- a/lisp/lib/net/pkg.lisp Mon Aug 19 21:52:55 2024 -0400
3.2+++ b/lisp/lib/net/pkg.lisp Tue Aug 20 19:12:01 2024 -0400
3.3@@ -97,9 +97,11 @@
3.4 :timetag->unix-time
3.5 :print-as-double))
3.6
3.7+;; TODO 2024-08-20:
3.8 (std:defpkg :net/proto/swank
3.9- (:use :cl :sb-bsd-sockets :std :net/core :net/tcp :swank-client)
3.10- (:use-reexport :swank-client)
3.11+ (:use :cl :sb-bsd-sockets :std :net/core :net/tcp)
3.12+ ;; (:import-from :swank-client ...)
3.13+ ;; (:use-reexport :swank-client)
3.14 (:export))
3.15
3.16 (defpackage :net/proto/crew
3.17@@ -114,16 +116,16 @@
3.18 #:with-mutex)
3.19 (:import-from :sb-concurrency
3.20 :make-gate)
3.21- (:import-from #:net/proto/swank
3.22- #:slime-close
3.23- #:slime-connect
3.24- #:slime-eval
3.25- #:slime-eval-async
3.26- #:slime-migrate-evals
3.27- #:slime-network-error
3.28- #:slime-pending-evals-p
3.29- #:swank-connection
3.30- #:with-slime-connection)
3.31+ ;; (:import-from #:swank
3.32+ ;; #:slime-close
3.33+ ;; #:slime-connect
3.34+ ;; #:slime-eval
3.35+ ;; #:slime-eval-async
3.36+ ;; #:slime-migrate-evals
3.37+ ;; #:slime-network-error
3.38+ ;; #:slime-pending-evals-p
3.39+ ;; #:swank-connection
3.40+ ;; #:with-slime-connection)
3.41 (:export
3.42 :crew-connection-info
3.43 :make-worker-pool
4.1--- a/lisp/lib/obj/obj.asd Mon Aug 19 21:52:55 2024 -0400
4.2+++ b/lisp/lib/obj/obj.asd Tue Aug 20 19:12:01 2024 -0400
4.3@@ -1,6 +1,6 @@
4.4 (defsystem :obj
4.5 :description "Lisp object library"
4.6- :depends-on (:std :quri)
4.7+ :depends-on (:std :log :quri)
4.8 :serial t
4.9 :components ((:file "pkg")
4.10 (:module "meta"
5.1--- a/lisp/std/std.asd Mon Aug 19 21:52:55 2024 -0400
5.2+++ b/lisp/std/std.asd Tue Aug 20 19:12:01 2024 -0400
5.3@@ -10,7 +10,13 @@
5.4
5.5 ;; the build op on the STD system system concatenates all dependency systems -
5.6 ;; make sure CL-PPCRE is loaded first but not included in the build output.
5.7-(asdf:load-system :cl-ppcre)
5.8+#-cl-ppcre
5.9+(handler-case
5.10+ (or
5.11+ #+quicklisp (ql:quickload :cl-ppcre)
5.12+ (asdf:load-system :cl-ppcre))
5.13+ (error () (error "unable to load system CL-PPCRE - make sure you have it installed in a path
5.14+that ASDF can find, or have quicklisp installed.")))
5.15
5.16 (require 'sb-cltl2)
5.17 (require 'sb-concurrency)