diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -2,6 +2,7 @@ .qlot .html .png +.orig tests -sugar-qsp -sugar-qsp.tar.xz +txt2web +txt2web.tar.xz diff --git a/INSTALL.md b/INSTALL.md new file mode 100644 --- /dev/null +++ b/INSTALL.md @@ -0,0 +1,4 @@ + +1. Install sbcl using your distribution's package manager, or download it from https://sbcl.org +2. Install quicklisp from https://quicklisp.org E.g. `wget https://beta.quicklisp.org/quicklisp.lisp && sbcl --load quicklisp.org` then follow instructions. +3. `make` diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -11,12 +11,6 @@ graphs: diagrams.png $(BIN): *.asd src/*.lisp src/*.ps strings/*.sexp sbcl --load build.lisp -- $(BIN) -install-deps: - sbcl --load install-deps.lisp - -update-deps: - sbcl --load update-deps.lisp - %.png: %.dot dot $< -T png -o $@ @@ -27,13 +21,12 @@ upload: $(DIST) curl --upload-file $(DIST) https://transfer.sh/$(DIST) @echo -distclean: clean clean-deps - clean: rm -f $(BIN) $(DIST) -clean-deps: - -rm qlfile.lock - -rm -rf .qlot +clean-cache: + -rm -rf ~/.cache/common-lisp -.PHONY: all graphs install-deps update-deps clean upload +fresh: clean clean-cache all + +.PHONY: all graphs upload clean clean-cache fresh diff --git a/build.lisp b/build.lisp --- a/build.lisp +++ b/build.lisp @@ -1,10 +1,4 @@ -(let ((root (asdf:system-source-directory :txt2web))) - (asdf:initialize-source-registry - `(:source-registry - :ignore-inherited-configuration - (:directory ,root) - (:tree ,(format nil "~A~A" root ".qlot/dists"))))) +(ql:quickload :txt2web) -(asdf:load-system :txt2web) (uiop:register-image-restore-hook 'txt2web::entry-point-no-args nil) (uiop:dump-image "txt2web" :executable t) diff --git a/install-deps.lisp b/install-deps.lisp deleted file mode 100644 --- a/install-deps.lisp +++ /dev/null @@ -1,4 +0,0 @@ -(ql:quickload :qlot) -(asdf:load-system :qlot/cli) -(qlot/cli:install) -(uiop:quit) diff --git a/qlfile b/qlfile deleted file mode 100644 --- a/qlfile +++ /dev/null @@ -1,13 +0,0 @@ -ql alexandria -ql system-locale -ql esrap -ql parenscript -ql flute - -ql cl-ppcre -ql anaphora -ql named-readtables -ql assoc-utils -ql let-over-lambda -ql documentation-utils -ql trivial-indent diff --git a/qlfile.lock b/qlfile.lock deleted file mode 100644 --- a/qlfile.lock +++ /dev/null @@ -1,52 +0,0 @@ -("quicklisp" . - (:class qlot/source/dist:source-dist - :initargs (:distribution "http://beta.quicklisp.org/dist/quicklisp.txt" :%version :latest) - :version "2020-06-10")) -("alexandria" . - (:class qlot/source/ql:source-ql - :initargs (:%version :latest) - :version "ql-2020-06-10")) -("system-locale" . - (:class qlot/source/ql:source-ql - :initargs (:%version :latest) - :version "ql-2020-06-10")) -("esrap" . - (:class qlot/source/ql:source-ql - :initargs (:%version :latest) - :version "ql-2020-06-10")) -("parenscript" . - (:class qlot/source/ql:source-ql - :initargs (:%version :latest) - :version "ql-2020-06-10")) -("flute" . - (:class qlot/source/ql:source-ql - :initargs (:%version :latest) - :version "ql-2020-06-10")) -("cl-ppcre" . - (:class qlot/source/ql:source-ql - :initargs (:%version :latest) - :version "ql-2020-06-10")) -("anaphora" . - (:class qlot/source/ql:source-ql - :initargs (:%version :latest) - :version "ql-2020-06-10")) -("named-readtables" . - (:class qlot/source/ql:source-ql - :initargs (:%version :latest) - :version "ql-2020-06-10")) -("assoc-utils" . - (:class qlot/source/ql:source-ql - :initargs (:%version :latest) - :version "ql-2020-06-10")) -("let-over-lambda" . - (:class qlot/source/ql:source-ql - :initargs (:%version :latest) - :version "ql-2020-06-10")) -("documentation-utils" . - (:class qlot/source/ql:source-ql - :initargs (:%version :latest) - :version "ql-2020-06-10")) -("trivial-indent" . - (:class qlot/source/ql:source-ql - :initargs (:%version :latest) - :version "ql-2020-06-10")) diff --git a/src/api.ps b/src/api.ps --- a/src/api.ps +++ b/src/api.ps @@ -212,9 +212,9 @@ ;;; "Syntax" (defun qspfor (name index from to step body) - (for ((i from)) - ((< i to)) - ((incf i step)) + (ps:for ((i from)) + ((< i to)) + ((incf i step)) (set-var name index :num i) (unless (await (funcall body)) (return-from qspfor)))) diff --git a/src/main.lisp b/src/main.lisp --- a/src/main.lisp +++ b/src/main.lisp @@ -96,7 +96,7 @@ (flute:h (html (head - (title "SugarQSP")) + (title "txt2web")) (body body-template (style css) diff --git a/update-deps.lisp b/update-deps.lisp deleted file mode 100644 --- a/update-deps.lisp +++ /dev/null @@ -1,4 +0,0 @@ -(ql:quickload :qlot) -(asdf:load-system :qlot/cli) -(qlot/cli:update) -(uiop:quit)