From fc721ae09344cfca5e73d731bf8fab9548f252d5 Mon Sep 17 00:00:00 2001 From: cxxxr Date: Thu, 21 Sep 2023 21:22:39 +0900 Subject: [PATCH 01/19] add workaround for read-error --- contrib/migemo/lem-migemo.asd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/migemo/lem-migemo.asd b/contrib/migemo/lem-migemo.asd index 0f1e6c91b..54e80ead3 100644 --- a/contrib/migemo/lem-migemo.asd +++ b/contrib/migemo/lem-migemo.asd @@ -4,6 +4,6 @@ :components((:file "main")) :depends-on("lem" :cl-migemo)) -(UNLESS (ASDF/SYSTEM:FIND-SYSTEM "cl-migemo" NIL) +#+roswell(UNLESS (ASDF/SYSTEM:FIND-SYSTEM "cl-migemo" NIL) (UIOP/PACKAGE:SYMBOL-CALL "ROSWELL" "ROSWELL" - '("install" "snmsts/cl-migemo"))) \ No newline at end of file + '("install" "snmsts/cl-migemo"))) From 0973d19c7a71e17b364a8a72918d89b9e26ab836 Mon Sep 17 00:00:00 2001 From: cxxxr Date: Thu, 21 Sep 2023 21:41:22 +0900 Subject: [PATCH 02/19] add .qlot to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 81fb13fe7..011cdb59f 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ lem-ncurses build/* *.lx64fsl +.qlot From f05a2d7940af508c8900978dce02c9e20fe90671 Mon Sep 17 00:00:00 2001 From: cxxxr Date: Thu, 21 Sep 2023 22:25:14 +0900 Subject: [PATCH 03/19] add qlfile and qlfile.lock --- qlfile | 3 +++ qlfile.lock | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 qlfile create mode 100644 qlfile.lock diff --git a/qlfile b/qlfile new file mode 100644 index 000000000..94b24e37f --- /dev/null +++ b/qlfile @@ -0,0 +1,3 @@ +git micros https://github.com/lem-project/micros.git +git lem-mailbox https://github.com/lem-project/lem-mailbox.git +git lem-base16-themes https://github.com/lem-project/lem-base16-themes.git diff --git a/qlfile.lock b/qlfile.lock new file mode 100644 index 000000000..a28228044 --- /dev/null +++ b/qlfile.lock @@ -0,0 +1,16 @@ +("quicklisp" . + (:class qlot/source/dist:source-dist + :initargs (:distribution "http://beta.quicklisp.org/dist/quicklisp.txt" :%version :latest) + :version "2023-06-18")) +("micros" . + (:class qlot/source/git:source-git + :initargs (:remote-url "https://github.com/lem-project/micros.git") + :version "git-ed264a27262baeed493cdde338873bf4afc3721c")) +("lem-mailbox" . + (:class qlot/source/git:source-git + :initargs (:remote-url "https://github.com/lem-project/lem-mailbox.git") + :version "git-12d629541da440fadf771b0225a051ae65fa342a")) +("lem-base16-themes" . + (:class qlot/source/git:source-git + :initargs (:remote-url "https://github.com/lem-project/lem-base16-themes.git") + :version "git-07dacae6c1807beaeffc730063b54487d5c82eb0")) From 5880a4a9222f86dacaacf49375714f9283066e6e Mon Sep 17 00:00:00 2001 From: cxxxr Date: Sat, 23 Sep 2023 22:18:12 +0900 Subject: [PATCH 04/19] add lem-sdl2/executable system --- lem.asd | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lem.asd b/lem.asd index 84dc647f0..73f2755c5 100644 --- a/lem.asd +++ b/lem.asd @@ -191,3 +191,9 @@ :build-pathname "lem" :entry-point "lem:main" :depends-on ("lem-ncurses")) + +(defsystem "lem-sdl2/executable" + :build-operation program-op + :build-pathname "lem" + :entry-point "lem:main" + :depends-on ("lem-sdl2")) From c42418bf420b3102167d037b741e02fb99af461a Mon Sep 17 00:00:00 2001 From: cxxxr Date: Sat, 23 Sep 2023 22:19:01 +0900 Subject: [PATCH 05/19] change script to use qlot --- Makefile | 17 +++++++++-------- 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, 13 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..5990fa3e6 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,21 @@ LISP ?= ${shell which sbcl} build-ncurses: - $(LISP) --load scripts/patch-build-ncurses.lisp + qlot install + qlot exec $(LISP) --load scripts/build-ncurses.lisp build-sdl2: - $(LISP) --load scripts/patch-build-sdl2.lisp + qlot install + qlot exec $(LISP) --load scripts/build-sdl2.lisp test: - $(LISP) --load scripts/launch-tests.lisp + qlot install + 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 install + 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/") From 6cfdfe436137d8752f587e0f68c48eef8cdf143c Mon Sep 17 00:00:00 2001 From: cxxxr Date: Sat, 23 Sep 2023 22:52:52 +0900 Subject: [PATCH 06/19] Update README.md --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5290ca936..b2b5a7216 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,6 @@ curl -L https://qlot.tech/installer | bash ``` make ``` - ### SDL2 Dependent packages must be installed. See https://github.com/lem-project/lem/blob/main/frontends/sdl2/README.md @@ -78,6 +77,11 @@ See https://github.com/lem-project/lem/blob/main/frontends/sdl2/README.md make build-sdl2 ``` +## update +``` +make update +``` + ## Usage ``` From 010beaccf072e9a259e80c484dff983a54696054 Mon Sep 17 00:00:00 2001 From: cxxxr Date: Sat, 23 Sep 2023 22:57:33 +0900 Subject: [PATCH 07/19] update qlfile --- qlfile | 1 + qlfile.lock | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/qlfile b/qlfile index 94b24e37f..e3f5ee99b 100644 --- a/qlfile +++ b/qlfile @@ -1,3 +1,4 @@ git micros https://github.com/lem-project/micros.git git lem-mailbox https://github.com/lem-project/lem-mailbox.git git lem-base16-themes https://github.com/lem-project/lem-base16-themes.git +git async-process https://github.com/lem-project/async-process.git diff --git a/qlfile.lock b/qlfile.lock index a28228044..83559a340 100644 --- a/qlfile.lock +++ b/qlfile.lock @@ -14,3 +14,7 @@ (:class qlot/source/git:source-git :initargs (:remote-url "https://github.com/lem-project/lem-base16-themes.git") :version "git-07dacae6c1807beaeffc730063b54487d5c82eb0")) +("async-process" . + (:class qlot/source/git:source-git + :initargs (:remote-url "https://github.com/lem-project/async-process.git") + :version "git-9690530fc92b59636d9f17d821afa7697e7c8ca4")) From 892b514d57eb5163e12c9737ae9ba9a6d746df7e Mon Sep 17 00:00:00 2001 From: cxxxr Date: Sat, 23 Sep 2023 22:58:23 +0900 Subject: [PATCH 08/19] Update test.yml --- .github/workflows/test.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 261dc2f18..7ed38b527 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,16 +24,9 @@ jobs: run: | set -ex - # workaround for sbcl and log4cl combination problems - mkdir ~/common-lisp - cd ~/common-lisp - git clone https://github.com/sharplispers/log4cl.git - cd - - ros config set dynamic-space-size 2048 - ros install lem-project/async-process lem - ros install cxxxr/sblint fukamachi/rove + ros install cxxxr/sblint fukamachi/rove fukamachi/qlot lem export PATH=$HOME/.roswell/bin:$PATH From e2b1a9bc85fdfbb51d40e02881266723f55e1130 Mon Sep 17 00:00:00 2001 From: cxxxr Date: Sat, 23 Sep 2023 23:00:43 +0900 Subject: [PATCH 09/19] tweak Makefile --- Makefile | 6 +++--- README.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 5990fa3e6..222a2b14e 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ LISP ?= ${shell which sbcl} -build-ncurses: +ncurses: qlot install qlot exec $(LISP) --load scripts/build-ncurses.lisp -build-sdl2: +sdl2: qlot install qlot exec $(LISP) --load scripts/build-sdl2.lisp @@ -12,7 +12,7 @@ test: qlot install qlot exec $(LISP) --load scripts/launch-tests.lisp -generate-doc: +doc: qlot install qlot exec $(LISP) --load scripts/generate-documentation-tests.lisp --eval '(progn (lem-documentation-mode/tests::generate-markdown-file "test.md" :test) (quit))' diff --git a/README.md b/README.md index b2b5a7216..ffe96a12e 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Other Lem features include: See our [Lem 2.1 realease](https://github.com/lem-project/lem/releases/tag/v2.1.0) to download binaries for Windows, MacOS and Linux. -On mac, you need to run `xattr -d com.apple.quarantine /Applications/lem.app`. +On mac, you need to run `xattr -d com.apple.quarantine /Applications/lem.app`. See https://github.com/lem-project/lem/issues/635 ![SDL2](screenshots/sdl2.png) @@ -70,11 +70,11 @@ curl -L https://qlot.tech/installer | bash make ``` ### SDL2 -Dependent packages must be installed. +Dependent packages must be installed. See https://github.com/lem-project/lem/blob/main/frontends/sdl2/README.md ``` -make build-sdl2 +make sdl2 ``` ## update From 46411500e9f941d98214aca2a2b42ee0aa9d7b3c Mon Sep 17 00:00:00 2001 From: cxxxr Date: Sun, 24 Sep 2023 01:06:27 +0900 Subject: [PATCH 10/19] Update test.yml --- .github/workflows/test.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7ed38b527..c5304deb8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,15 +25,12 @@ jobs: set -ex ros config set dynamic-space-size 2048 + ros install fukamachi/qlot - ros install cxxxr/sblint fukamachi/rove fukamachi/qlot lem - - export PATH=$HOME/.roswell/bin:$PATH - - sblint src/base/lem-base.asd - sblint lem.asd - sblint lib/lisp-syntax/lem-lisp-syntax.asd - sblint extensions/lisp-mode/lem-lisp-mode.asd + qlot exec .qlot/bin/sblint src/base/lem-base.asd + qlot exec .qlot/bin/sblint sblint lem.asd + qlot exec .qlot/bin/sblint lib/lisp-syntax/lem-lisp-syntax.asd + qlot exec .qlot/bin/sblint extensions/lisp-mode/lem-lisp-mode.asd if [ $(grep -r --include="*.lisp" 'lem::' | wc -l) -ne 0 ]; then echo 'using `lem::` internal symbols' From 71b67b824c977dbff0419893aee3dfb20a7ddd5f Mon Sep 17 00:00:00 2001 From: cxxxr Date: Sun, 24 Sep 2023 01:06:44 +0900 Subject: [PATCH 11/19] add sblint to qlfile --- qlfile | 1 + qlfile.lock | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/qlfile b/qlfile index e3f5ee99b..4d2bb282c 100644 --- a/qlfile +++ b/qlfile @@ -2,3 +2,4 @@ git micros https://github.com/lem-project/micros.git git lem-mailbox https://github.com/lem-project/lem-mailbox.git git lem-base16-themes https://github.com/lem-project/lem-base16-themes.git git async-process https://github.com/lem-project/async-process.git +git sblint https://github.com/cxxxr/sblint.git diff --git a/qlfile.lock b/qlfile.lock index 83559a340..837177c57 100644 --- a/qlfile.lock +++ b/qlfile.lock @@ -18,3 +18,7 @@ (:class qlot/source/git:source-git :initargs (:remote-url "https://github.com/lem-project/async-process.git") :version "git-9690530fc92b59636d9f17d821afa7697e7c8ca4")) +("sblint" . + (:class qlot/source/git:source-git + :initargs (:remote-url "https://github.com/cxxxr/sblint.git") + :version "git-1037296f604c3210ce073a53539d4ae95b0c2f8c")) From 2dbbc8a225b739b6bece22249d0e835147fb8a84 Mon Sep 17 00:00:00 2001 From: cxxxr Date: Sun, 24 Sep 2023 01:08:30 +0900 Subject: [PATCH 12/19] fix asd --- frontends/sdl2/lem-sdl2.asd | 6 ++++++ lem.asd | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontends/sdl2/lem-sdl2.asd b/frontends/sdl2/lem-sdl2.asd index 27dc19f76..87712e098 100644 --- a/frontends/sdl2/lem-sdl2.asd +++ b/frontends/sdl2/lem-sdl2.asd @@ -14,3 +14,9 @@ (:file "text-buffer") (:file "image-buffer") (:file "tree"))) + +(defsystem "lem-sdl2/executable" + :build-operation program-op + :build-pathname "../../lem" + :entry-point "lem:main" + :depends-on ("lem-sdl2")) diff --git a/lem.asd b/lem.asd index 73f2755c5..84dc647f0 100644 --- a/lem.asd +++ b/lem.asd @@ -191,9 +191,3 @@ :build-pathname "lem" :entry-point "lem:main" :depends-on ("lem-ncurses")) - -(defsystem "lem-sdl2/executable" - :build-operation program-op - :build-pathname "lem" - :entry-point "lem:main" - :depends-on ("lem-sdl2")) From aa7e19ca48367f20331924c1881749b36ade3f6a Mon Sep 17 00:00:00 2001 From: cxxxr Date: Sun, 24 Sep 2023 01:15:38 +0900 Subject: [PATCH 13/19] change to call rove via qlot --- .github/workflows/test.yml | 6 +++--- Makefile | 2 +- qlfile | 1 + qlfile.lock | 4 ++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c5304deb8..cd1b6f0d9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: - name: Run test run: | set -ex - + ros config set dynamic-space-size 2048 ros install fukamachi/qlot @@ -38,5 +38,5 @@ jobs: exit 1 fi - rove lem-tests.asd - rove extensions/vi-mode/lem-vi-mode.asd + qlot exec .qlot/bin/rove lem-tests.asd + qlot exec .qlot/bin/rove extensions/vi-mode/lem-vi-mode.asd diff --git a/Makefile b/Makefile index 222a2b14e..0ad83f3ae 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ sdl2: test: qlot install - qlot exec $(LISP) --load scripts/launch-tests.lisp + qlot exec .qlot/bin/rove lem-tests.asd doc: qlot install diff --git a/qlfile b/qlfile index 4d2bb282c..5502199a7 100644 --- a/qlfile +++ b/qlfile @@ -3,3 +3,4 @@ git lem-mailbox https://github.com/lem-project/lem-mailbox.git git lem-base16-themes https://github.com/lem-project/lem-base16-themes.git git async-process https://github.com/lem-project/async-process.git git sblint https://github.com/cxxxr/sblint.git +git rove https://github.com/fukamachi/rove.git diff --git a/qlfile.lock b/qlfile.lock index 837177c57..bd3f4e164 100644 --- a/qlfile.lock +++ b/qlfile.lock @@ -22,3 +22,7 @@ (:class qlot/source/git:source-git :initargs (:remote-url "https://github.com/cxxxr/sblint.git") :version "git-1037296f604c3210ce073a53539d4ae95b0c2f8c")) +("rove" . + (:class qlot/source/git:source-git + :initargs (:remote-url "https://github.com/fukamachi/rove.git") + :version "git-f168cd177b5f83f171dd970dc1a9abb6eb43f044")) From 1553064e876a51a5ed569fa23bd5f6368f303d87 Mon Sep 17 00:00:00 2001 From: cxxxr Date: Sun, 24 Sep 2023 01:16:17 +0900 Subject: [PATCH 14/19] fix --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cd1b6f0d9..e179788cc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,7 +25,7 @@ jobs: set -ex ros config set dynamic-space-size 2048 - ros install fukamachi/qlot + curl -L https://qlot.tech/installer | bash qlot exec .qlot/bin/sblint src/base/lem-base.asd qlot exec .qlot/bin/sblint sblint lem.asd From dec6aa4da98615e3de3d666f1c3b7304532effdc Mon Sep 17 00:00:00 2001 From: cxxxr Date: Sun, 24 Sep 2023 01:19:27 +0900 Subject: [PATCH 15/19] fix --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e179788cc..82fdde0c5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,6 +26,7 @@ jobs: ros config set dynamic-space-size 2048 curl -L https://qlot.tech/installer | bash + export PATH="/home/runner/.qlot/bin:$PATH" qlot exec .qlot/bin/sblint src/base/lem-base.asd qlot exec .qlot/bin/sblint sblint lem.asd From 3c4a9cf0c2c5558e007e6c1e833d7ff865cd3e70 Mon Sep 17 00:00:00 2001 From: cxxxr Date: Sun, 24 Sep 2023 01:27:18 +0900 Subject: [PATCH 16/19] fix --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 82fdde0c5..74de43f10 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,6 +28,8 @@ jobs: curl -L https://qlot.tech/installer | bash export PATH="/home/runner/.qlot/bin:$PATH" + qlot install + qlot exec .qlot/bin/sblint src/base/lem-base.asd qlot exec .qlot/bin/sblint sblint lem.asd qlot exec .qlot/bin/sblint lib/lisp-syntax/lem-lisp-syntax.asd From 94776977d9033debd1760dec8571afb9b005b50b Mon Sep 17 00:00:00 2001 From: cxxxr Date: Sun, 24 Sep 2023 01:32:44 +0900 Subject: [PATCH 17/19] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 74de43f10..43057f7f2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,7 +31,7 @@ jobs: qlot install qlot exec .qlot/bin/sblint src/base/lem-base.asd - qlot exec .qlot/bin/sblint sblint lem.asd + qlot exec .qlot/bin/sblint lem.asd qlot exec .qlot/bin/sblint lib/lisp-syntax/lem-lisp-syntax.asd qlot exec .qlot/bin/sblint extensions/lisp-mode/lem-lisp-mode.asd From b29b666d806b8c914946ca20c4b970267ad2afef Mon Sep 17 00:00:00 2001 From: cxxxr Date: Sun, 24 Sep 2023 01:34:03 +0900 Subject: [PATCH 18/19] add lint rule --- .github/workflows/test.yml | 5 +---- Makefile | 6 ++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 43057f7f2..790cdcef7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,10 +30,7 @@ jobs: qlot install - qlot exec .qlot/bin/sblint src/base/lem-base.asd - qlot exec .qlot/bin/sblint lem.asd - qlot exec .qlot/bin/sblint lib/lisp-syntax/lem-lisp-syntax.asd - qlot exec .qlot/bin/sblint extensions/lisp-mode/lem-lisp-mode.asd + make lint if [ $(grep -r --include="*.lisp" 'lem::' | wc -l) -ne 0 ]; then echo 'using `lem::` internal symbols' diff --git a/Makefile b/Makefile index 0ad83f3ae..0d9d1c189 100644 --- a/Makefile +++ b/Makefile @@ -19,3 +19,9 @@ doc: update: git pull qlot install + +lint: + qlot exec .qlot/bin/sblint src/base/lem-base.asd + qlot exec .qlot/bin/sblint lem.asd + qlot exec .qlot/bin/sblint lib/lisp-syntax/lem-lisp-syntax.asd + qlot exec .qlot/bin/sblint extensions/lisp-mode/lem-lisp-mode.asd From ef1cd9fbf3d9c06054aaf0592dbb6dbb888db625 Mon Sep 17 00:00:00 2001 From: cxxxr Date: Sun, 24 Sep 2023 01:54:54 +0900 Subject: [PATCH 19/19] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ffe96a12e..95fc07440 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Other Lem features include: See our [Lem 2.1 realease](https://github.com/lem-project/lem/releases/tag/v2.1.0) to download binaries for Windows, MacOS and Linux. -On mac, you need to run `xattr -d com.apple.quarantine /Applications/lem.app`. +On mac, you need to run `xattr -d com.apple.quarantine /Applications/lem.app`. See https://github.com/lem-project/lem/issues/635 ![SDL2](screenshots/sdl2.png) @@ -70,7 +70,7 @@ curl -L https://qlot.tech/installer | bash make ``` ### SDL2 -Dependent packages must be installed. +Dependent packages must be installed. See https://github.com/lem-project/lem/blob/main/frontends/sdl2/README.md ```