diff --git a/README.md b/README.md index 51267161..1ab9d4ff 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ cd /tmp/build ./bin/compile /tmp/build /tmp/cache Run: +mv /tmp/cache /tmp/was-cache cd /tmp/build -export CCL_DEFAULT_DIRECTORY=ccl setup/launch -b -l setup/run.lisp diff --git a/bin/compile b/bin/compile index 27d18721..e976f150 100755 --- a/bin/compile +++ b/bin/compile @@ -21,8 +21,6 @@ CCL_PACKAGE="http://${S3_BUCKET}.s3.amazonaws.com/ccl-1.7.tgz" # parse and derive params BUILD_DIR=$1 CACHE_DIR=$2 -# CACHE_QUICKLISP_DIR="$CACHE_DIR/quicklisp/" -# BUILD_QUICKLISP_DIR="$BUILD_DIR/quicklisp/" CCL_DIR="$CACHE_DIR/ccl" @@ -75,6 +73,6 @@ $CCL_DEFAULT_DIRECTORY/scripts/ccl64 -l "$BUILD_DIR/setup/compile.lisp" echo "dependencies installed" | indent # copy quicklisp to slug -if [ -d $CACHE_QUICKLISP_DIR ]; then - cp -r $CACHE_QUICKLISP_DIR $BUILD_QUICKLISP_DIR +if [ -d $CACHE_DIR/quicklisp ]; then + cp -r $CACHE_DIR/quicklisp $BUILD_DIR/quicklisp fi diff --git a/setup/launch b/setup/launch index 1cad5d32..b8a2c089 100755 --- a/setup/launch +++ b/setup/launch @@ -1,5 +1,6 @@ #!/bin/sh # based on ccl/scripts/ccl64, which is too stupid to figure out where it is being run from or whether it is 32/64 bit +# sets -no-init flag export CCL_DEFAULT_DIRECTORY=$PWD/ccl @@ -31,4 +32,4 @@ if [ -z "$OPENMCL_KERNEL" ]; then esac fi -exec ${CCL_DEFAULT_DIRECTORY}/${OPENMCL_KERNEL} "$@" +exec ${CCL_DEFAULT_DIRECTORY}/${OPENMCL_KERNEL} --no-init "$@" diff --git a/setup/setup.lisp b/setup/setup.lisp index 7f689400..0a0db03b 100644 --- a/setup/setup.lisp +++ b/setup/setup.lisp @@ -16,7 +16,7 @@ (defvar *quicklisp-home* (append (or *cache-dir* *app-dir*) '("quicklisp"))) -(defvar asdf::*user-cache* (append *quicklisp-home* '(".cache" "common-lisp" :implementation))) +(setq asdf::*user-cache* (append *quicklisp-home* '(".cache" "common-lisp" :implementation))) (if (probe-file (make-pathname :directory *quicklisp-home* :defaults "setup.lisp")) (progn diff --git a/src/hello-world.lisp b/src/hello-world.lisp index f29952f1..d150dd58 100644 --- a/src/hello-world.lisp +++ b/src/hello-world.lisp @@ -1,6 +1,6 @@ (in-package :wu) -(publish :path "/hello" +(publish :path "/" :function #'(lambda (req ent) (with-http-response-and-body (req ent) (html