changeset 30: |
aa37feddcfb2 |
parent 29: |
7e640cebeada |
child 31: |
77da08c7f445 |
author: |
ellis <ellis@rwest.io> |
date: |
Thu, 15 Jun 2023 22:01:40 -0400 |
files: |
makefile tools/prepare-image.lisp |
description: |
tweaks |
1.1--- a/makefile Thu Jun 15 21:42:39 2023 -0400
1.2+++ b/makefile Thu Jun 15 22:01:40 2023 -0400
1.3@@ -1,6 +1,6 @@
1.4-M?=release
1.5-L?=sbcl
1.6-C?=default.cfg
1.7+MODE?=release
1.8+LISP?=sbcl
1.9+CFG?=default.cfg
1.10 L_C=$(L) --no-userinit
1.11 L_D=$(L) --load demo.asd --eval '(ql:quickload "demo")'
1.12 L_S=$(L) --script
1.13@@ -12,7 +12,7 @@
1.14 deps:;
1.15 clean:;rm -rf *.fasl;cargo clean
1.16 fmt:$(RS);cargo fmt
1.17-build:$(RS) $(CL);cargo build --$(M);$(L_D)
1.18+build:$(RS) $(CL);cargo build --$(MODE);$(L_D)
1.19 --eval '(asdf:make "demo")' \
1.20 --eval '(quit)'
1.21 docs:$(RS);cargo doc
2.1--- a/tools/prepare-image.lisp Thu Jun 15 21:42:39 2023 -0400
2.2+++ b/tools/prepare-image.lisp Thu Jun 15 22:01:40 2023 -0400
2.3@@ -4,9 +4,9 @@
2.4 #+sbcl
2.5 (require 'sb-introspect)
2.6
2.7-(when (probe-file "scripts/asdf.lisp")
2.8+(when (probe-file "tools/asdf.lisp")
2.9 (format t "Compiling asdf..~%")
2.10- (let ((output (compile-file "scripts/asdf.lisp" :verbose nil :print nil)))
2.11+ (let ((output (compile-file "tools/asdf.lisp" :verbose nil :print nil)))
2.12 (load output))
2.13 (provide "asdf"))
2.14
2.15@@ -108,6 +108,7 @@
2.16 #+nil
2.17 (ql:update-all-dists :prompt nil)
2.18
2.19+;; is the package name already loaded as a feature? uhh look it up
2.20 (pushnew :demo *features*)
2.21
2.22 (defun update-project-directories (cwd)