changelog shortlog graph tags branches files raw help

Mercurial > core / changeset: fixes

changeset 218: d42212a9f204
parent 217: 17c05cd3e549
child 219: 0787f053a137
author: Richard Westhaver <ellis@rwest.io>
date: Fri, 01 Mar 2024 23:45:25 -0500
files: x.lisp
description: fixes
     1.1--- a/x.lisp	Fri Mar 01 23:36:23 2024 -0500
     1.2+++ b/x.lisp	Fri Mar 01 23:45:25 2024 -0500
     1.3@@ -75,7 +75,7 @@
     1.4 (defvar *lib-path* (merge-pathnames "lib/" *lisp-path*))
     1.5 (defvar *std-path* (merge-pathnames "std/" *lisp-path*))
     1.6 (defvar *ffi-path* (merge-pathnames "ffi/" *lisp-path*))
     1.7-(push *lisp-path* asdf:*central-registry*)
     1.8+(push *core-path* asdf:*central-registry*)
     1.9 
    1.10 #-quicklisp
    1.11 (let ((quicklisp-init (merge-pathnames "quicklisp/setup.lisp" (user-homedir-pathname))))
    1.12@@ -112,13 +112,11 @@
    1.13 (asdf:load-system :rocksdb)
    1.14 (println *features*)
    1.15 
    1.16-(export '(compile-std compile-prelude))
    1.17 (defun compile-std ()
    1.18   (let ((v (getflag "VERSION")))
    1.19-    (asdf:load-asd (merge-pathnames "std/std.asd" *lisp-path*))
    1.20+    (asdf:load-system :std :force t :version v)
    1.21     (asdf:compile-system :std :force t :version v)
    1.22-    (asdf:load-system :std :force t :version v))
    1.23-  (sb-ext:save-lisp-and-die "std" :compression nil))
    1.24+  (sb-ext:save-lisp-and-die "std" :compression nil)))
    1.25 
    1.26 (defun compile-prelude () 
    1.27   (push (pathname *lisp-path*) ql:*local-project-directories*)
    1.28@@ -127,8 +125,6 @@
    1.29           :nlp :rdb :organ :packy :skel
    1.30           :obj :net :parse :pod :dat
    1.31           :rt :syn :xdb :doc :vc))
    1.32-  (asdf:load-asd (merge-pathnames "prelude.asd" *lisp-path*))
    1.33-  (in-package :std-user)
    1.34   (use-package :std)
    1.35   (use-package :log)
    1.36   (use-package :dat)
    1.37@@ -136,9 +132,12 @@
    1.38   (asdf:make :prelude)
    1.39   (println :ok)
    1.40   (rocksdb:load-rocksdb t)
    1.41+  (in-package :user)
    1.42   (sb-ext:save-lisp-and-die "prelude" :compression t))
    1.43+
    1.44 (sb-alien:define-alien-callable compile-prelude sb-alien:void () (compile-prelude))
    1.45 (sb-alien:define-alien-callable compile-std sb-alien:void () (compile-std))
    1.46+
    1.47 (sb-ext:save-lisp-and-die "x"
    1.48                           :toplevel #'compile-prelude
    1.49                           ;; :callable-exports '("compile_std" "compile_prelude")