Commit 8418c171 authored by Dave Cooper's avatar Dave Cooper
Browse files

Merge branch 'master' into 'zacl+aserve' 

# Conflicts:
#   Makefile
#   README.md
#   build.lisp
#   cl-site.asd
parents 490fd199 563ee007

.gitignore

+1 −2
Original line number Diff line number Diff line 


# Emacs autosave

*~

\#*\#

*.elc
@@ -11,4 +11,3 @@ system-index.txt 
content/newsbox.html

content/about.html

*.dx64fsl
 
*.fasl

Makefile

+1 −6
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ serve: static favicon 


static:

	mkdir -p output/static

	cp -rf content/static/* output/static/

#	cp -rf content/static/* output/static



favicon:

	cp content/favicon.ico output/
@@ -16,8 +16,3 @@ build: static favicon 
clean:

	rm -rf output

	mkdir output
 




# Python server - kept around for compatibility & benchmark testing:

pyserve:

	cd output; python ../server.py

README.md

+2 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ The Makefile contains various useful commands. 
Among them:



* `make` - to generate the site.

* `make serve` - to run a simple site server on port 8008 or subsequent (currently needs Allegro CL, SBCL, or CCL)

* `make clean` - to remove the generated files from output directory

* `make pyserve` - to run a secondary (python) server on port 8000 (crashes if 8000 is busy).
@@ -90,5 +89,7 @@ Among them: 






To clean any old files from output/ directory:



    (cl-site:make-clean)

build.lisp

+0 −3
Original line number Diff line number Diff line 
(in-package :cl-user)





(push (make-pathname :defaults *load-truename* :name nil :type nil)

      quicklisp:*local-project-directories*)



(ql:register-local-projects) ;; for good measure



(ql:quickload :cl-site)



(cl-site:make-site)

globals.lisp

+0 −3
Original line number Diff line number Diff line
@@ -33,6 +33,3 @@ 
  capture output when compile/loading any lispy html content files

  wrapped with calls to add-content. Global value should always be

  nil.")
 


(defvar *aserve-port* 8008)

(defvar *aserve-listeners* 5)