From f525c0b0e0e051f0bd928d167498841fc79b577b Mon Sep 17 00:00:00 2001 From: Circling Skies Date: Fri, 13 Dec 2024 09:14:22 -0300 Subject: [PATCH] Squash me. --- loop.asd | 7 --- mine/.gitattributes | 3 + mine/.gitignore | 13 ++++ mine/Makefile | 92 +++++++++++++++++++++++++++++ Makefile.mine => mine/Makefile.mine | 2 +- 5 files changed, 109 insertions(+), 8 deletions(-) delete mode 100644 loop.asd create mode 100644 mine/.gitattributes create mode 100644 mine/.gitignore create mode 100644 mine/Makefile rename Makefile.mine => mine/Makefile.mine (97%) diff --git a/loop.asd b/loop.asd deleted file mode 100644 index 5793792..0000000 --- a/loop.asd +++ /dev/null @@ -1,7 +0,0 @@ -;;; -*- Mode: LISP; Syntax: COMMON-LISP; -*- -(asdf:defsystem :loop - :version "0.1" - :description "An NNTP server for a circle of friends." - :depends-on (:lisp-unit :str :uiop :cl-ppcre :local-time :clsql-sqlite3 :clingon - :filesystem-utils :ironclad/digest/sha256) - :components ((:file "loop"))) diff --git a/mine/.gitattributes b/mine/.gitattributes new file mode 100644 index 0000000..596fafa --- /dev/null +++ b/mine/.gitattributes @@ -0,0 +1,3 @@ +*.tex -linguist-detectable +*.pdf -linguist-detectable +*.nw -linguist-detectable diff --git a/mine/.gitignore b/mine/.gitignore new file mode 100644 index 0000000..3216d5d --- /dev/null +++ b/mine/.gitignore @@ -0,0 +1,13 @@ +THANKS +peat +*~ +*.aux +*.exe +*.fdb_latexmk +*.fls +*.log +*.out +*.pdf +*.tex +*.db +tmp/ diff --git a/mine/Makefile b/mine/Makefile new file mode 100644 index 0000000..55eb59d --- /dev/null +++ b/mine/Makefile @@ -0,0 +1,92 @@ +# -*- mode: makefile -*- +include Makefile + +REMOTE=dbastos@antartida.xyz +LOOP=loop + +default: all + +live: all remote-copy # remote-build-exe + +all: loop.exe loop.lisp loop.asd scripts/build-exe.lisp \ +scripts/build-index-from-fs.lisp \ +scripts/cron-remove-inactive-users.lisp \ +scripts/migrate-add-creation-date.lisp + +loop.exe: loop.lisp + sbcl --script scripts/build-exe.lisp + (test -f loop.exe && cmp loop loop.exe) || mv loop loop.exe + +loop.lisp: loop.nw + (any tangle -Rloop.lisp < loop.nw | dos2unix > loop.tmp || \ + (rm loop.tmp && exit 1)) && \ + mv loop.tmp loop.lisp + +loop.asd: loop.nw + (any tangle -Rloop.asd < loop.nw | dos2unix > loop-asd.tmp || \ + (rm loop-asd.tmp && exit 1)) && \ + mv loop-asd.tmp loop.asd + +scripts/build-exe.lisp: loop.nw + (any tangle -Rbuild-exe.lisp < loop.nw | dos2unix > build-exe.tmp || \ + (rm build-exe.tmp && exit 1)) && \ + mv build-exe.tmp scripts/build-exe.lisp + +scripts/build-index-from-fs.lisp: loop.nw + (any tangle -Rbuild-index-from-fs.lisp < loop.nw | dos2unix > \ + build-index-from-fs.tmp || \ + (rm build-index-from-fs.tmp && exit 1)) && \ + mv build-index-from-fs.tmp scripts/build-index-from-fs.lisp + +scripts/cron-remove-inactive-users.lisp: loop.nw + (any tangle -Rcron-remove-inactive-users.lisp < loop.nw | dos2unix > \ + cron-remove-inactive-users.tmp || \ + (rm cron-remove-inactive-users.tmp && exit 1)) && \ + mv cron-remove-inactive-users.tmp \ + scripts/cron-remove-inactive-users.lisp + +scripts/migrate-add-creation-date.lisp: loop.nw + (any tangle -Rmigrate-add-creation-date.lisp < loop.nw | dos2unix > \ + migrate-add-creation-date.tmp || \ + (rm migrate-add-creation-date.tmp && exit 1)) && \ + mv migrate-add-creation-date.tmp \ + scripts/migrate-add-creation-date.lisp + +run: loop.nw + (any tangle -Rrun < loop.nw | dos2unix > run.tmp || (rm run.tmp && exit 1)) && \ + mv run.tmp run && \ + chmod 0755 run + +loop.tex: loop.nw + any weave -delay -index loop.nw | dos2unix > loop.tex + +loop.pdf: loop.tex + latexmk -pdf loop + +livedoc: + echo loop.nw | python peat -C 'make loop.pdf' + +remote-copy: + scp loop.asd loop.lisp $(REMOTE):$(LOOP) + scp -r scripts $(REMOTE):$(LOOP) + +sync-users: + scp $(REMOTE):$(LOOP)/accounts.lisp . + +remote-build-exe: + plink -ssh $(REMOTE) cd $(LOOP)/ && \ + sbcl --script build-exe.lisp + +remote-migrate-account-creation: + plink -ssh $(REMOTE) cd $(LOOP)/ && \ + sbcl --script migrate-add-creation-date.lisp + +remote-cron-remove-inactive-users: + plink -ssh $(REMOTE) cd $(LOOP)/ && \ + sbcl --script cron-remove-inactive-users.lisp + +service: run + sudo ln -s $(pwd) /service/$(LOOP) + +clean: + rm -f loop loop.asd loop.lisp .*~ *~ *.pdf *.out *.aux *.log *.fls *.fdb_latexmk loop loop.tex diff --git a/Makefile.mine b/mine/Makefile.mine similarity index 97% rename from Makefile.mine rename to mine/Makefile.mine index 41e0b82..da107ea 100644 --- a/Makefile.mine +++ b/mine/Makefile.mine @@ -88,4 +88,4 @@ service: run sudo ln -s $(pwd) /service/$(LOOP) clean: - rm -f *.pdf *.out *.aux *.log *.fls *.fdb_latexmk loop loop.tex + rm -f *~ *.pdf *.out *.aux *.log *.fls *.fdb_latexmk loop loop.tex