Move Nyxt' specific ASD code from nasdf to nyxt.asd.

atlas-engineer · Dec 20, 2022 · 8da7313 · 8da7313
1 parent 11aaa01
commit 8da7313
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 25 deletions.
diff --git a/libraries/nasdf/nasdf.asd b/libraries/nasdf/nasdf.asd
@@ -15,5 +15,4 @@
                (:file "submodules")
                (:file "systems")
                (:file "tests")
-               (:file "compilation-tests")
-               (:file "user-systems")))
+               (:file "compilation-tests")))
diff --git a/libraries/nasdf/systems.lisp b/libraries/nasdf/systems.lisp
@@ -137,16 +137,3 @@ to go to the compilation error location."
         (if (env-true-p "NASDF_USE_LOGICAL_PATHS")
             final-path
             (translate-logical-pathname final-path))))))
-
-(defclass nyxt-renderer-system (asdf:system) ()
-  (:documentation "Specialized systems for Nyxt with renderer dependency.
-The renderer is configured from NYXT_RENDERER or `*nyxt-renderer*'."))
-(import 'nyxt-renderer-system  :asdf-user)
-
-(export-always '*nyxt-renderer*)
-(defvar *nyxt-renderer* (or (getenv "NYXT_RENDERER")
-                            "gi-gtk"))
-
-(defmethod asdf:component-depends-on ((o asdf:prepare-op) (c nyxt-renderer-system))
-  `((asdf:load-op ,(format nil "nyxt/~a-application" *nyxt-renderer*))
-    ,@(call-next-method)))
diff --git a/libraries/nasdf/user-systems.lisp b/libraries/nasdf/user-systems.lisp
diff --git a/nyxt.asd b/nyxt.asd
@@ -7,6 +7,27 @@
   (sb-ext:assert-version->= 2 0 0)
   (require 'sb-bsd-sockets))
 
+(uiop:define-package nyxt-asdf
+  (:use :cl))
+(in-package :nyxt-asdf)
+
+;; (export-always 'nyxt-user-system)
+;; (defclass nyxt-user-system (asdf:system) ()
+;;   (:documentation "Specialized systems for Nyxt users."))
+;; (import 'nyxt-user-system :asdf-user)
+
+(defclass nyxt-renderer-system (asdf:system) ()
+  (:documentation "Specialized systems for Nyxt with renderer dependency.
+The renderer is configured from NYXT_RENDERER or `*nyxt-renderer*'."))
+
+(export-always '*nyxt-renderer*)
+(defvar *nyxt-renderer* (or (getenv "NYXT_RENDERER")
+                            "gi-gtk"))
+
+(defmethod asdf:component-depends-on ((o asdf:prepare-op) (c nyxt-renderer-system))
+  `((asdf:load-op ,(format nil "nyxt/~a-application" *nyxt-renderer*))
+    ,@(call-next-method)))
+
 ;; WARNING: We _must_ declare the translation host or else ASDF won't recognize
 ;; the pathnames as logical-pathnames, thus returning the system directory
 ;; instead.
@@ -403,7 +424,7 @@
 
 (defsystem "nyxt/install"
   :defsystem-depends-on ("nasdf")
-  :class :nasdf-renderer-system
+  :class :nyxt-renderer-system
   :depends-on (alexandria
                nyxt/version
                str)