# HG changeset patch # User Steve Losh # Date 1517692069 18000 # Node ID 26d560b85b8ab180f8946ff815b3c63da2b3ae2b # Parent af9390b6947b05a8026493edcb5fed58fd02d2d7 Fucking make diff -r af9390b6947b -r 26d560b85b8a .hgignore --- a/.hgignore Sat Feb 03 15:44:47 2018 -0500 +++ b/.hgignore Sat Feb 03 16:07:49 2018 -0500 @@ -2,6 +2,7 @@ scratch.lisp *.png +*.pnm docs/build creds.lisp database.sqlite diff -r af9390b6947b -r 26d560b85b8a Makefile --- a/Makefile Sat Feb 03 15:44:47 2018 -0500 +++ b/Makefile Sat Feb 03 16:07:49 2018 -0500 @@ -1,4 +1,4 @@ -.PHONY: vendor binary clean deploy update-deps +.PHONY: vendor binary clean deploy update-deps force-binary # Vendor ---------------------------------------------------------------------- vendor/quickutils.lisp: vendor/make-quickutils.lisp @@ -15,8 +15,12 @@ binary: bin/magitek +force-binary: + rm bin/magitek + sbcl --load "src/build.lisp" + bin/magitek: $(lisps) - sbcl --load "src/build.lisp" + force-binary # Deploy ---------------------------------------------------------------------- @@ -28,7 +32,7 @@ hg -R /home/sjl/lib/flax -v pull -u # Local -deploy: binary - rsync --exclude=bin --exclude=.hg --exclude=database.sqlite -avz . jam:/home/sjl/src/magitek - ssh jam make -C /home/sjl/src/magitek update-deps binary +deploy: + rsync --exclude=bin --exclude=.hg --exclude=database.sqlite --exclude='*.fasl' --exclude='*.png' --exclude='*.pnm' -avz . jam:/home/sjl/src/magitek + ssh jam make -C /home/sjl/src/magitek update-deps force-binary diff -r af9390b6947b -r 26d560b85b8a src/robots/bit-loom.lisp --- a/src/robots/bit-loom.lisp Sat Feb 03 15:44:47 2018 -0500 +++ b/src/robots/bit-loom.lisp Sat Feb 03 16:07:49 2018 -0500 @@ -4,8 +4,10 @@ (sb-ext:run-program "pnmtopng" (list pnm) :search t :output png + :error *standard-output* :if-output-exists :supersede) (sb-ext:run-program "mogrify" (list "-resize" "800x800" png) + :error :output :search t)) (defun loom-1 (seed)