src/: Use the `optparse' package in `sod-user'.

This involves moving the `optparse' build into the main `sod' system.

diff --git a/doc/list-exports.lisp b/doc/list-exports.lisp
index f58fb2b95c903918c42ab6dcd59d2a36ca75d78c..8ef80b82c7c397a445fd53d36e6df79c3a840af2 100755 (executable)
--- a/doc/list-exports.lisp
+++ b/doc/list-exports.lisp
@@ -462,9 +462,9 @@ (defun report-project-symbols ()
         (parser-files (files (by-name sod "parser")))
         (utilities (by-name sod "utilities"))
         (sod-frontend (asdf:find-system "sod-frontend"))
-        (optparse (by-name sod-frontend "optparse"))
+        (optparse (by-name sod "optparse"))
         (frontend (by-name sod-frontend "frontend"))
-        (sod-files (set-difference (files sod) (list utilities))))
+        (sod-files (set-difference (files sod) (list optparse utilities))))
     (report-symbols (mapcar #'file-name sod-files) "SOD")
     (report-symbols (mapcar #'file-name (list frontend)) "SOD-FRONTEND")
     (report-symbols (mapcar #'file-name parser-files) "SOD-PARSER")

diff --git a/src/package.lisp b/src/package.lisp
index 9f0179ac7e8503f07e64141936585dfa1f977b4a..13466c8ec654964534c1206a59f3921f306d6c10 100644 (file)
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -31,6 +31,7 @@ (cl:defpackage #:sod
 (cl:defpackage #:sod-user
   (:use #:common-lisp
        #:sod-utilities
+       #:optparse
        #:sod-parser
        #:sod))
 

diff --git a/src/sod-frontend.asd.in b/src/sod-frontend.asd.in
index 7c7a92c02f67194c4cce7c0f9c51a56ded4a3db3..d508bae6fcb8e07e7f44e1c92ad6116039281206 100644 (file)
--- a/src/sod-frontend.asd.in
+++ b/src/sod-frontend.asd.in
@@ -56,7 +56,6 @@
   :depends-on ("cl-launch" "sod")
 
   :components
-  ((:file "optparse")
-   (:file "frontend" :depends-on ("optparse"))))
+  ((:file "frontend")))
 
 ;;;----- That's all, folks --------------------------------------------------

diff --git a/src/sod.asd.in b/src/sod.asd.in
index 075597913c42003975cc378cef91951ebede1f1e..eabc504804f207a2d0ab3d253d1efaaf0c4c0cf4 100644 (file)
--- a/src/sod.asd.in
+++ b/src/sod.asd.in
@@ -69,6 +69,7 @@
 
   :components
   ((:file "utilities")
+   (:file "optparse")
 
    ;; Parser equipment.  This is way more elaborate than it needs to be, but
    ;; it was interesting, and it may well get split off into a separate