From 2da178f23ed94e96d4f4d228c7b23e2cdb68649b Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Sat, 22 Jun 2024 16:35:22 +0200
Subject: [PATCH] clean-up asd files - remove obsolete duplication of
 dependencies and files

---
 core/core.lisp  |  4 ++--
 scopes-core.asd |  5 +----
 scopes-web.asd  |  8 ++------
 scopes.asd      | 29 +++++++----------------------
 4 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/core/core.lisp b/core/core.lisp
index da5fed7..065fca1 100644
--- a/core/core.lisp
+++ b/core/core.lisp
@@ -4,8 +4,8 @@
   (:use :common-lisp)
   (:local-nicknames (:config :scopes/config)
                     (:message :scopes/core/message))
-  (:export #:default-setup #:setup-services
-           #:context #:add-action #:*root* #:find-service #:config #:name #:send
+  (:export #:*root* #:default-setup #:find-service #:setup-services
+           #:context #:add-action #:config #:name #:send
            #:printer))
 
 (in-package :scopes/core)
diff --git a/scopes-core.asd b/scopes-core.asd
index dc8bef2..163d7fe 100644
--- a/scopes-core.asd
+++ b/scopes-core.asd
@@ -15,10 +15,7 @@
                (:file "core/message")
                (:file "forge/forge")
                (:file "util")
-               (:file "testing" :depends-on ("util"))
-               (:file "test/test-config" :depends-on ("testing" "config"))
-               (:file "test/test-forge" :depends-on ("testing" "forge/forge"))
-               (:file "test/test-core" :depends-on ("testing" "core/core")))
+               (:file "testing" :depends-on ("util")))
   :long-description "scopes/core: The core packages of the scopes project."
   :in-order-to ((test-op (test-op "scopes-core/test"))))
 
diff --git a/scopes-web.asd b/scopes-web.asd
index 5dd837b..88e99f6 100644
--- a/scopes-web.asd
+++ b/scopes-web.asd
@@ -9,16 +9,12 @@
   :depends-on (:alexandria :clack :com.inuoe.jzon :dexador :lack :log4cl :str
                :scopes-core)
   :components ((:file "web/client")
-               (:file "web/server")
-               (:file "util")
-               (:file "testing" :depends-on ("util"))
-               (:file "test/test-web" 
-                      :depends-on ("testing" "web/client" "web/server")))
+               (:file "web/server"))
   :long-description "scopes/web: Web server and web/API/REST client."
   :in-order-to ((test-op (test-op "scopes-web/test"))))
 
 (defsystem :scopes-web/test
-  :depends-on (:scopes-web)
+  :depends-on (:scopes-web :scopes-core/test)
   :components ((:file "test/test-web"))
   :perform (test-op (o c) 
     (symbol-call :scopes/test-web :run)))
diff --git a/scopes.asd b/scopes.asd
index 8729285..8ee7d92 100644
--- a/scopes.asd
+++ b/scopes.asd
@@ -7,36 +7,21 @@
   :homepage "https://www.cyberconcepts.org"
   :description "Generic data processing."
   :depends-on (:alexandria :chanl :cl-dotenv :com.inuoe.jzon :dbi 
-               :local-time :log4cl :str :sxql)
-  :components ((:file "config" :depends-on ("util"))
-               (:file "core/core" 
-                      :depends-on ("core/message" "config" 
-                                   "forge/forge" "util"))
-               (:file "core/message")
-               (:file "forge/forge")
-               (:file "storage/storage")
-               (:file "storage/tracking" :depends-on ("storage/storage"))
-               (:file "util")
-               (:file "testing" :depends-on ("util"))
-               (:file "test/test-config" :depends-on ("testing" "config"))
-               (:file "test/test-core" :depends-on ("testing" "core/core"))
-               (:file "test/test-forge" :depends-on ("testing" "forge/forge"))
-               (:file "test/test-storage" 
-                      :depends-on ("testing" 
-                                   "storage/storage" "storage/tracking")))
+               :local-time :log4cl :str :sxql
+               :scopes-core :scopes-web)
+  :components ((:file "storage/storage")
+               (:file "storage/tracking" :depends-on ("storage/storage")))
   :long-description "scopes: generic data processing facilities."
   ;;#.(uiop:read-file-string
   ;;   (uiop:subpathname *load-pathname* "README.md")))
   :in-order-to ((test-op (test-op "scopes/test"))))
 
 (defsystem :scopes/test
-  :depends-on (:scopes)
-  :components ((:file "test/test-config")
-               (:file "test/test-core")
-               (:file "test/test-forge")
-               (:file "test/test-storage"))
+  :depends-on (:scopes :scopes-core/test :scopes-web/test)
+  :components ((:file "test/test-storage"))
   :perform (test-op (o c) 
     (symbol-call :scopes/test-config :run)
     (symbol-call :scopes/test-core :run)
     (symbol-call :scopes/test-forge :run)
+    (symbol-call :scopes/test-web :run)
     (symbol-call :scopes/test-storage :run-all)))