# HG changeset patch # User Richard Westhaver # Date 1719934467 14400 # Node ID 64e35d4f68fdef9fc8464d6d8035e37ee773d4ec # Parent 6260bd14c5b22362b6db43f78f564e467ea9cf4c lisp updates, ld fix, emacs with tree-sitter explicit diff -r 6260bd14c5b2 -r 64e35d4f68fd autogen.lisp --- a/autogen.lisp Sun Jun 30 18:27:19 2024 -0400 +++ b/autogen.lisp Tue Jul 02 11:34:27 2024 -0400 @@ -18,12 +18,15 @@ (in-package :std-user) (defpkg :infra/autogen + (:nicknames :infra) (:use :cl :skel :log :std/named-readtables :dat/json :dat/sxp :net/fetch :net/util :cli/progress :cli/ansi :cli/ed :cli/prompt :cli/shell :std/hash-table :std/alien :std/macs :std/fmt) - (:export :autogen)) + (:export :autogen *profile* :*host* + :*all-features* :*host-env* :gethost :getprofile + :getenv)) (in-package :infra/autogen) (in-readtable :shell) diff -r 6260bd14c5b2 -r 64e35d4f68fd default.sxp --- a/default.sxp Sun Jun 30 18:27:19 2024 -0400 +++ b/default.sxp Tue Jul 02 11:34:27 2024 -0400 @@ -13,7 +13,7 @@ :rustup-home "/usr/local/share/rust/rustup" :cc "clang" -:ld "lld" +:ld "ld.lld" :stash ".stash" ;; local build stash :store ".stash/share/store" ;; local store diff -r 6260bd14c5b2 -r 64e35d4f68fd deploy.lisp --- a/deploy.lisp Sun Jun 30 18:27:19 2024 -0400 +++ b/deploy.lisp Tue Jul 02 11:34:27 2024 -0400 @@ -3,9 +3,29 @@ ;; ;;; Code: -(in-package :std-user) +(in-package :infra) -(defpkg :infra/deploy - (:use :cl :std :skel :packy :dat/json)) +(defvar *autogen-fasl* + (or (probe-file ".stash/tmp/autogen.fasl") + (and + (ensure-directories-exist ".stash/tmp/") + (compile-file "autogen" :output-file ".stash/tmp/autogen")))) + +(load *autogen-fasl*) + +(defvar *dist* (getprofile :dist)) + +(pkg:defpkg :infra/deploy + (:use :cl :std :skel :packy :dat/json :std/thread :infra/autogen)) (in-package :infra/deploy) + +(defparameter *task-pool* (make-task-pool)) + +(with-task-pool (tp *task-pool*) + (designate-oracle tp (find-thread "control-thread")) + (spawn-workers tp 4) + (print tp) + ;; (start-task-pool tp) + (loop for x below (worker-count tp) + collect (pop-worker tp))) diff -r 6260bd14c5b2 -r 64e35d4f68fd scripts/build-emacs.sh --- a/scripts/build-emacs.sh Sun Jun 30 18:27:19 2024 -0400 +++ b/scripts/build-emacs.sh Tue Jul 02 11:34:27 2024 -0400 @@ -5,6 +5,7 @@ --with-imagemagick --with-x-toolkit=gtk --without-pop + --with-tree-sitter --without-sound --with-json --enable-link-time-optimization