Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

change tack and save the whole app, much simpler. in progress

  • Loading branch information...
commit 65ae5610582f7394f70e64085c62f580dcfe66c7 1 parent 86fd4a7
@mtravers mtravers authored
Showing with 28 additions and 18 deletions.
  1. +1 −15 bin/compile
  2. +27 −3 setup/compile.lisp
View
16 bin/compile
@@ -58,21 +58,7 @@ else
fi
export CACHE_DIR
-
-# add to slug
-cp -r $CACHE_DIR/repos $BUILD_DIR/repos
-
-echo "-----> Installing dependencies with quicklisp"
-
-# run lisp to load quicklisp packages
-
-export CACHE_DIR
+export BUILD_DIR
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_DIR/quicklisp ]; then
- cp -r $CACHE_DIR/quicklisp $BUILD_DIR/quicklisp
-fi
View
30 setup/compile.lisp
@@ -1,9 +1,33 @@
(in-package :cl-user)
-(defvar *cache-dir* (pathname-directory (pathname (concatenate 'string (getenv "CACHE_DIR") "/"))))
+;;; Customize
-(load (make-pathname :defaults *load-pathname* :name "setup"))
+(defvar *app-name* "example")
+
+;;; Standard
+
+(defvar *app-dir* (butlast (pathname-directory *load-pathname*)))
+
+(require :asdf)
+(load (make-pathname :directory (append *app-dir* '("lib")) :defaults "quicklisp.lisp"))
+
+;;; Not needed?
+;(defvar *cache-dir* (pathname-directory (pathname (concatenate 'string (getenv "CACHE_DIR") "/"))))
+
+;(load (make-pathname :defaults *load-pathname* :name "setup"))
+
+(asdf:clear-system "acl-compat")
+
+(load (make-pathname :directory (append *app-dir* '("repos" "portableaserve" "acl-compat"))
+ :defaults "acl-compat.asd"))
+(load (make-pathname :directory (append *app-dir* '("repos" "portableaserve" "aserve"))
+ :defaults "aserve.asd"))
+
+(load (make-pathname :directory *app-dir* :name *app-name* :type "asd"))
(ql:quickload *app-name*)
-(ccl:quit)
+(save-application
+ (make-pathname :directory (getenv "BUILD_DIR") :name *app-name* :type "app")
+; :toplevel-function
+ )
Please sign in to comment.
Something went wrong with that request. Please try again.