From b0e166e3f54518df7b55c47c14af9b1671e08871 Mon Sep 17 00:00:00 2001 From: cxxxr Date: Sat, 23 Sep 2023 22:19:01 +0900 Subject: [PATCH] change script to use qlot --- Makefile | 13 +++++-------- scripts/build-ncurses.lisp | 2 ++ scripts/build-sdl2.lisp | 2 ++ scripts/build.lisp | 20 -------------------- scripts/launch-tests.lisp | 2 -- scripts/patch-build-ncurses.lisp | 7 ------- scripts/patch-build-sdl2.lisp | 8 -------- scripts/patch.lisp | 10 ---------- 8 files changed, 9 insertions(+), 55 deletions(-) create mode 100644 scripts/build-ncurses.lisp create mode 100644 scripts/build-sdl2.lisp delete mode 100644 scripts/build.lisp delete mode 100644 scripts/patch-build-ncurses.lisp delete mode 100644 scripts/patch-build-sdl2.lisp delete mode 100644 scripts/patch.lisp diff --git a/Makefile b/Makefile index 37d6b73d6..d682aea2a 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,17 @@ LISP ?= ${shell which sbcl} build-ncurses: - $(LISP) --load scripts/patch-build-ncurses.lisp + qlot exec $(LISP) --load scripts/build-ncurses.lisp build-sdl2: - $(LISP) --load scripts/patch-build-sdl2.lisp + qlot exec $(LISP) --load scripts/build-sdl2.lisp test: - $(LISP) --load scripts/launch-tests.lisp + qlot exec $(LISP) --load scripts/launch-tests.lisp generate-doc: - $(LISP) --load scripts/generate-documentation-tests.lisp --eval '(progn (lem-documentation-mode/tests::generate-markdown-file "test.md" :test) (quit))' - -update-submodules: - git submodule update --remote + qlot exec $(LISP) --load scripts/generate-documentation-tests.lisp --eval '(progn (lem-documentation-mode/tests::generate-markdown-file "test.md" :test) (quit))' update: git pull - git submodule update --init --recursive + qlot install diff --git a/scripts/build-ncurses.lisp b/scripts/build-ncurses.lisp new file mode 100644 index 000000000..a7e896d50 --- /dev/null +++ b/scripts/build-ncurses.lisp @@ -0,0 +1,2 @@ +(ql:quickload :lem-ncurses) +(asdf:make :lem/executable) diff --git a/scripts/build-sdl2.lisp b/scripts/build-sdl2.lisp new file mode 100644 index 000000000..2dae0bf6b --- /dev/null +++ b/scripts/build-sdl2.lisp @@ -0,0 +1,2 @@ +(ql:quickload :lem-sdl2) +(asdf:make :lem-sdl2/executable) diff --git a/scripts/build.lisp b/scripts/build.lisp deleted file mode 100644 index 5e4244de9..000000000 --- a/scripts/build.lisp +++ /dev/null @@ -1,20 +0,0 @@ -;; usage: sbcl --eval '(ql:quickload :lem-ncurses)' --load build.lisp - -#+(and sbcl sb-core-compression) -(sb-ext:save-lisp-and-die "lem" - :toplevel 'lem:main - :executable t - :compression -1) - -#+(and sbcl (not sb-core-compression)) -(sb-ext:save-lisp-and-die "lem" - :toplevel 'lem:main - :executable t) - -#+ccl -(ccl:save-application "lem" - :prepend-kernel t - :toplevel-function 'lem:main - :error-handler :listener - :purify t - :application-class 'ccl::application) diff --git a/scripts/launch-tests.lisp b/scripts/launch-tests.lisp index 3f76686bc..ad8d0075e 100644 --- a/scripts/launch-tests.lisp +++ b/scripts/launch-tests.lisp @@ -1,5 +1,3 @@ -(load "scripts/patch.lisp") - (ql:quickload :lem-tests) (rove:run :lem-tests) diff --git a/scripts/patch-build-ncurses.lisp b/scripts/patch-build-ncurses.lisp deleted file mode 100644 index 423281e15..000000000 --- a/scripts/patch-build-ncurses.lisp +++ /dev/null @@ -1,7 +0,0 @@ -(load "scripts/patch.lisp") - -(ql:quickload :lem-ncurses) - - - -(load "scripts/build.lisp") diff --git a/scripts/patch-build-sdl2.lisp b/scripts/patch-build-sdl2.lisp deleted file mode 100644 index 067cf67df..000000000 --- a/scripts/patch-build-sdl2.lisp +++ /dev/null @@ -1,8 +0,0 @@ -(load "scripts/patch.lisp") - -(ql:quickload :lem-sdl2) - - - -(load "scripts/build.lisp") - diff --git a/scripts/patch.lisp b/scripts/patch.lisp deleted file mode 100644 index fc8bcd050..000000000 --- a/scripts/patch.lisp +++ /dev/null @@ -1,10 +0,0 @@ -(ql:quickload :quick-patch) - -(quick-patch:register "https://github.com/sharplispers/log4cl" - "fe3da517147d023029782ced7cd989ba24f1e62d") - - -(quick-patch:register "https://github.com/scymtym/esrap.git" - "d806138342a6b27327649fd5f36e0fe2e0966867") - -(quick-patch:checkout-all "build/quick-patch/")