Skip to content

Commit

Permalink
foo
Browse files Browse the repository at this point in the history
  • Loading branch information
mtravers committed Feb 25, 2012
1 parent c4feccc commit 30dec65
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -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

6 changes: 2 additions & 4 deletions bin/compile
Expand Up @@ -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"

Expand Down Expand Up @@ -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
3 changes: 2 additions & 1 deletion 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

Expand Down Expand Up @@ -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 "$@"
2 changes: 1 addition & 1 deletion setup/setup.lisp
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down

0 comments on commit 30dec65

Please sign in to comment.