Fix more things broken by the refactoring of xcvb-driver into uiop.

Author: fare

asdf-condition-control.asd

@@ -1,5 +1,5 @@
 ;;; -*- mode: lisp -*-
-;;; superseded by asdf-driver
+;;; Superseded by UIOP
 (in-package :asdf)
 
 (defsystem :asdf-condition-control
@@ -9,4 +9,4 @@
   :licence "MIT"
   :description "Condition control for ASDF"
   :long-description "Using XCVB's condition control for ASDF"
-  :depends-on (:asdf #-asdf3 :asdf-driver))
+  :depends-on (:asdf #-asdf3 :uiop))

asdf-condition-control.lisp

@@ -31,7 +31,7 @@
     (run-program
      (lisp-invocation:lisp-invocation-arglist
       :implementation-type lisp
-      :eval (format nil "(#.(require \"asdf\")#.(asdf:load-system :asdf)#.(asdf:load-system :xcvb-driver)#.(xcvb-driver:with-coded-exit () (asdf:load-system :xcvb) (funcall 'xcvb-driver::dump-xcvb ~S))" program))
+      :eval (format nil "(#.(require \"asdf\")#.(asdf:load-system :asdf)#.(asdf:load-system :xcvb-driver)#.(uiop:with-fatal-condition-handler () (asdf:load-system :xcvb) (funcall 'xcvb-driver::dump-xcvb ~S))" program))
      :output nil) ;; for side-effects
     (native-namestring program)))
 

bootstrap.lisp

@@ -16,7 +16,7 @@
 (in-package :cl-user)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (defparameter *asdf-version-required-by-xcvb* "3.0.1.6")
+  (defparameter *asdf-version-required-by-xcvb* "3.0.1.7")
   (defvar *asdf-directory*
     (merge-pathnames #p"cl/asdf/" (user-homedir-pathname))
     "Directory in which your favorite and/or latest version
@@ -88,8 +88,8 @@ Please upgrade to the latest stable ASDF and register it in your source-registry
 
 (asdf/package:define-package :xcvb-driver
   (:nicknames :xcvbd :xd)
-  (:use :asdf/common-lisp :asdf/driver :asdf)
-  (:reexport :asdf/driver)
+  (:use :uiop/common-lisp :uiop :asdf)
+  (:reexport :uiop)
   (:shadow #:create-image)
   (:export
    ;;; special variables shared with XCVB itself
@@ -386,21 +386,40 @@ Entry point for XCVB-DRIVER when used by XCVB's farmer"
 (defmacro run (&rest commands)
   "Run a series of XCVB-DRIVER commands, then exit.
 Entry point for XCVB-DRIVER when used by XCVB"
-  `(with-coded-exit ()
-    (do-run ',commands)))
+  `(with-fatal-condition-handler ()
+     (do-run ',commands)))
 
 
 ;;;; ----- Simple build commands -----
 
 ;;; Loading and evaluating code
 
+(defun do-load (x &key encoding)
+  (with-muffled-loader-conditions ()
+    (load* x
+           :external-format (encoding-external-format (or encoding *default-encoding*))
+           :verbose (>= *xcvb-verbosity* 8)
+           :print (>= *xcvb-verbosity* 9))))
+
+(defun load-file (x &key encoding)
+  (with-profiling `(:load-file ,x :encoding ,encoding)
+    (unless (do-load x :encoding encoding)
+      (error "Failed to load ~A" (list x)))))
+
+
 (defun cl-require (x)
   (with-profiling `(:require ,x)
     (require x)))
 
 
 ;;; ASDF support
 
+(defun load-asdf (x &key parallel (verbose *compile-verbose*)) ;; parallel loading requires POIU
+  (when parallel (asdf:load-system :poiu))
+  (with-profiling `(:asdf ,x)
+    (with-muffled-loader-conditions ()
+      (load-system x :verbose verbose))))
+
 (defun initialize-asdf (&key source-registry output-translations)
   (asdf:clear-configuration)
   (asdf:initialize-source-registry source-registry)
@@ -482,7 +501,7 @@ Entry point for XCVB-DRIVER when used by XCVB"
                    (lambda ()
                      (apply 'compile-file* source
                             :output-file (merge-pathnames* fasl)
-                            :external-format (encoding-external-format encoding)
+                            :external-format (encoding-external-format (or encoding *default-encoding*))
                             :warnings-file warnings-file
                             (append
                              #+sbcl (when cfasl `(:emit-cfasl ,(merge-pathnames* cfasl)))

driver.lisp

@@ -39,7 +39,8 @@
 
 (defun read-module-declaration (path)
   (let ((*features* (list :xcvb)))
-    (read-file-form path :package :xcvb-user)))
+    (with-safe-io-syntax (:package :xcvb-user)
+      (read-file-form path))))
 
 (defun grain-from-file-declaration (path &key build-p)
   (log-format 10 "    Creating grain from declarations in file at ~S~%" path)

grain-implementation.lisp

@@ -1,22 +1,23 @@
 #+xcvb
 (module
  (:description "package for XCVB"
-  :depends-on ("lisp-invocation" "version" "xcvb-utils")))
+  :depends-on ("/asdf" "/fare-utils" "/inferior-shell" (:asdf "alexandria")
+               "lisp-invocation" "version")))
 
-(in-package :asdf-driver)
+(in-package :uiop)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (setf *optimization-settings*
         `((speed 2) (safety 3) (compilation-speed 0) (debug 3)))
   (proclaim-optimization-settings))
 
 (define-package :xcvb
-    (:mix :fare-utils :asdf/driver :alexandria :inferior-shell :xcvb-driver)
+  (:mix :fare-utils :uiop :alexandria :inferior-shell :xcvb-driver)
   (:use :closer-common-lisp
    :command-line-arguments :lisp-invocation
-        :optima :interface :pure :fare-mop
-        :fare-memoization
-        #+xcvb-farmer :quux-iolib #+xcvb-farmer :iolib.os)
+   :optima :interface :pure :fare-mop
+   :fare-memoization
+   #+xcvb-farmer :quux-iolib #+xcvb-farmer :iolib.os)
 
   (:import-from :asdf
    #:*default-source-registry-exclusions*
@@ -37,5 +38,6 @@
    #:module ;; Defining and using modules and extensions
    #:cmd)) ;; Easy REPL access to the command-line interface
 
-(defpackage :xcvb-user
-  (:use :closer-common-lisp :xcvb-driver :xcvb))
+(define-package :xcvb-user
+  (:use :closer-common-lisp)
+  (:mix :uiop :xcvb-driver :xcvb))

pkgdcl.lisp

@@ -25,7 +25,7 @@
 XCVB provides a scalable system to build large software in Lisp, featuring
 deterministic separate compilation and enforced locally-declared dependencies."
   :defsystem-depends-on (:asdf :xcvb-driver :xcvb-bootstrap)
-  :depends-on ((:version :asdf "3.0.1.6")
+  :depends-on ((:version :asdf "3.0.1.7")
                :xcvb-driver :xcvb-bootstrap :asdf-encodings
                :lambda-reader
                :fare-mop :fare-memoization