From 6db1068e8724b00a23bef8cf514a5bfd99fddfa4 Mon Sep 17 00:00:00 2001 From: "pls.153" Date: Fri, 11 Aug 2023 15:03:16 +0200 Subject: [PATCH] revisions --- examples/meshtastic/app.asd | 2 +- .../lisp/{load-fasc.lisp => meshtastic-proto.lisp} | 7 ++++--- examples/meshtastic/make.lisp | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) rename examples/meshtastic/lisp/{load-fasc.lisp => meshtastic-proto.lisp} (84%) diff --git a/examples/meshtastic/app.asd b/examples/meshtastic/app.asd index cfbdd1c..850ba87 100644 --- a/examples/meshtastic/app.asd +++ b/examples/meshtastic/app.asd @@ -4,7 +4,7 @@ #-depends-loaded :trivial-package-local-nicknames #+mobile :s-http-server #+mobile :zip) ; see 'hacks/zip/' - :components ((:file "lisp/load-fasc") + :components ((:file "lisp/meshtastic-proto") (:file "lisp/package") (:file "lisp/qt") (:file "lisp/ui-vars") diff --git a/examples/meshtastic/lisp/load-fasc.lisp b/examples/meshtastic/lisp/meshtastic-proto.lisp similarity index 84% rename from examples/meshtastic/lisp/load-fasc.lisp rename to examples/meshtastic/lisp/meshtastic-proto.lisp index 4a7d7c7..40a6af2 100644 --- a/examples/meshtastic/lisp/load-fasc.lisp +++ b/examples/meshtastic/lisp/meshtastic-proto.lisp @@ -1,9 +1,10 @@ ;;; loading protobuf Lisp source files is much faster (especially on mobile) -;;; and doesn't really impact performance at runtime (in this use case) +;;; compared to compiled files, and doesn't seem to impact performance at +;;; runtime (in this use case) (in-package :qml-user) -(let ((make (find :make *features*))) ; runtime check needed +(let ((build-app (find :build-app *features*))) ; runtime check needed (dolist (file (list "xmodem" "telemetry" "portnums" @@ -22,7 +23,7 @@ "cannedmessages" "mqtt" "rtttl")) - (if make + (if build-app (load (format nil "examples/meshtastic/lisp/proto/meshtastic/~A.lisp" file)) (let ((file* (format nil "lisp/proto/meshtastic/~A.lisp" file))) (if #+mobile nil #-mobile (probe-file file*) diff --git a/examples/meshtastic/make.lisp b/examples/meshtastic/make.lisp index bd0e3e6..509e63d 100644 --- a/examples/meshtastic/make.lisp +++ b/examples/meshtastic/make.lisp @@ -1,4 +1,4 @@ -(pushnew :make *features*) +(pushnew :build-app *features*) ;;; check target