diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -6,3 +6,4 @@ tests txt2web txt2web.tar.xz +system-index.txt diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ BIN = txt2web DIST = $(BIN).tar.xz +SCRIPT = $(BIN).ros all: $(BIN) @@ -8,8 +9,11 @@ dist: $(DIST) graphs: diagrams.png -$(BIN): *.asd src/*.lisp src/*.ps strings/*.sexp - sbcl --load build.lisp -- $(BIN) +$(BIN): bin/$(BIN) + ln -f $< + +bin/$(BIN): *.asd src/*.lisp src/*.ps strings/*.sexp bin/$(BIN).ros + ros build bin/$(SCRIPT) %.png: %.dot dot $< -T png -o $@ @@ -18,7 +22,7 @@ graphs: diagrams.png tar cfvJ $@ $< extras clean: - rm -f $(BIN) $(DIST) + rm -f $(BIN) bin/$(BIN) $(DIST) clean-cache: -rm -rf ~/.cache/common-lisp diff --git a/build.lisp b/build.lisp deleted file mode 100644 --- a/build.lisp +++ /dev/null @@ -1,4 +0,0 @@ -(ql:quickload :txt2web) - -(uiop:register-image-restore-hook 'txt2web::entry-point-no-args nil) -(uiop:dump-image "txt2web" :executable t) diff --git a/src/main.lisp b/src/main.lisp --- a/src/main.lisp +++ b/src/main.lisp @@ -1,14 +1,13 @@ (in-package txt2web) -(defvar *app-name* "") +(defvar *app-name* "txt2web") (defun entry-point-no-args () (setf *delivered* t) (entry-point uiop:*command-line-arguments*)) (defun entry-point (args) - (setf *app-name* (uiop:argv0)) (let ((*package* (find-package :txt2web))) (catch :terminate (let ((compiler (apply #'make-instance 'compiler (parse-opts args))))