changeset 308: |
64e35d4f68fd |
parent 303: |
6260bd14c5b2 |
child 309: |
f0ba6edae611 |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Tue, 02 Jul 2024 11:34:27 -0400 |
files: |
autogen.lisp default.sxp deploy.lisp scripts/build-emacs.sh |
description: |
lisp updates, ld fix, emacs with tree-sitter explicit |
1.1--- a/autogen.lisp Sun Jun 30 18:27:19 2024 -0400
1.2+++ b/autogen.lisp Tue Jul 02 11:34:27 2024 -0400
1.3@@ -18,12 +18,15 @@
1.4 (in-package :std-user)
1.5
1.6 (defpkg :infra/autogen
1.7+ (:nicknames :infra)
1.8 (:use :cl :skel :log :std/named-readtables
1.9 :dat/json :dat/sxp :net/fetch :net/util
1.10 :cli/progress :cli/ansi :cli/ed :cli/prompt
1.11 :cli/shell :std/hash-table :std/alien :std/macs
1.12 :std/fmt)
1.13- (:export :autogen))
1.14+ (:export :autogen *profile* :*host*
1.15+ :*all-features* :*host-env* :gethost :getprofile
1.16+ :getenv))
1.17
1.18 (in-package :infra/autogen)
1.19 (in-readtable :shell)
2.1--- a/default.sxp Sun Jun 30 18:27:19 2024 -0400
2.2+++ b/default.sxp Tue Jul 02 11:34:27 2024 -0400
2.3@@ -13,7 +13,7 @@
2.4 :rustup-home "/usr/local/share/rust/rustup"
2.5
2.6 :cc "clang"
2.7-:ld "lld"
2.8+:ld "ld.lld"
2.9
2.10 :stash ".stash" ;; local build stash
2.11 :store ".stash/share/store" ;; local store
3.1--- a/deploy.lisp Sun Jun 30 18:27:19 2024 -0400
3.2+++ b/deploy.lisp Tue Jul 02 11:34:27 2024 -0400
3.3@@ -3,9 +3,29 @@
3.4 ;;
3.5
3.6 ;;; Code:
3.7-(in-package :std-user)
3.8+(in-package :infra)
3.9
3.10-(defpkg :infra/deploy
3.11- (:use :cl :std :skel :packy :dat/json))
3.12+(defvar *autogen-fasl*
3.13+ (or (probe-file ".stash/tmp/autogen.fasl")
3.14+ (and
3.15+ (ensure-directories-exist ".stash/tmp/")
3.16+ (compile-file "autogen" :output-file ".stash/tmp/autogen"))))
3.17+
3.18+(load *autogen-fasl*)
3.19+
3.20+(defvar *dist* (getprofile :dist))
3.21+
3.22+(pkg:defpkg :infra/deploy
3.23+ (:use :cl :std :skel :packy :dat/json :std/thread :infra/autogen))
3.24
3.25 (in-package :infra/deploy)
3.26+
3.27+(defparameter *task-pool* (make-task-pool))
3.28+
3.29+(with-task-pool (tp *task-pool*)
3.30+ (designate-oracle tp (find-thread "control-thread"))
3.31+ (spawn-workers tp 4)
3.32+ (print tp)
3.33+ ;; (start-task-pool tp)
3.34+ (loop for x below (worker-count tp)
3.35+ collect (pop-worker tp)))
4.1--- a/scripts/build-emacs.sh Sun Jun 30 18:27:19 2024 -0400
4.2+++ b/scripts/build-emacs.sh Tue Jul 02 11:34:27 2024 -0400
4.3@@ -5,6 +5,7 @@
4.4 --with-imagemagick
4.5 --with-x-toolkit=gtk
4.6 --without-pop
4.7+ --with-tree-sitter
4.8 --without-sound
4.9 --with-json
4.10 --enable-link-time-optimization