Permalink
Browse files

back off from xdg, not working. Try different tack

  • Loading branch information...
1 parent fe2d7ce commit 0344438e15882c376074f5b60152ebb7239d0431 @mtravers mtravers committed Feb 23, 2012
Showing with 19 additions and 15 deletions.
  1. +14 −6 README.md
  2. +2 −7 bin/compile
  3. +0 −1 bin/release
  4. +3 −1 setup/setup.lisp
View
@@ -11,9 +11,17 @@ TODO
- not sure caching is working
TESTING
-> rm -rf /tmp/build
-> git clone -l . /tmp/build
-> mkdir /tmp/cache
-> ln -s /misc/repos/ccl /tmp/cache/ccl
-> cd /tmp/build
-> ./bin/compile
+
+Compile:
+rm -rf /tmp/build
+git clone -l . /tmp/build
+mkdir /tmp/cache
+ln -s /misc/repos/ccl /tmp/cache/ccl
+cd /tmp/build
+./bin/compile /tmp/build /tmp/cache
+
+Run:
+cd /tmp/build
+export CCL_DEFAULT_DIRECTORY=ccl
+setup/launch -b -l setup/run.lisp
+
View
@@ -23,7 +23,6 @@ BUILD_DIR=$1
CACHE_DIR=$2
# CACHE_QUICKLISP_DIR="$CACHE_DIR/quicklisp/"
# BUILD_QUICKLISP_DIR="$BUILD_DIR/quicklisp/"
-export XDG_CACHE_HOME="$CACHE_DIR/xdg-cache/"
CCL_DIR="$CACHE_DIR/ccl"
@@ -69,16 +68,12 @@ echo "-----> Installing dependencies with quicklisp"
# run lisp to load quicklisp packages
-export XDG_CACHE_HOME
export CCL_DEFAULT_DIRECTORY=$CCL_DIR
$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
-#fi
-if [ -d $XDG_CACHE_HOME ]; then
- cp -r $XDG_CACHE_HOME $BUILD_DIR
+if [ -d $CACHE_QUICKLISP_DIR ]; then
+ cp -r $CACHE_QUICKLISP_DIR $BUILD_QUICKLISP_DIR
fi
View
@@ -9,7 +9,6 @@ addons:
config_vars:
PATH: bin:/usr/bin:/bin
CCL_DEFAULT_DIRECTORY: ccl
- XDG_CACHE_HOME: xdg-cache
default_process_types:
web: setup/launch -b -l setup/run.lisp
EOF
View
@@ -11,10 +11,12 @@
;;; Overridden by compile.lisp
(defvar *cache-dir* nil)
+(require :asdf)
+
(defvar *quicklisp-home*
(append (or *cache-dir* *app-dir*) '("quicklisp")))
-(require :asdf)
+(defvar asdf::*user-cache* (append *quicklisp-home* '(".cache" "common-lisp" :implementation)))
(if (probe-file (make-pathname :directory *quicklisp-home* :defaults "setup.lisp"))
(load (make-pathname :directory *quicklisp-home* :defaults "setup.lisp"))

0 comments on commit 0344438

Please sign in to comment.