Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

get files from buildpack dir

  • Loading branch information...
commit 46c492f3c8bf6a231b264bf2a93dd4dc9fe5534c 1 parent b69f2df
Mike Travers mtravers authored

Showing 2 changed files with 8 additions and 6 deletions. Show diff stats Hide diff stats

  1. +6 5 bin/compile
  2. +2 1  setup/compile.lisp
11 bin/compile
@@ -15,10 +15,12 @@ function indent() {
15 15 esac
16 16 }
17 17
  18 +#
18 19 S3_BUCKET="cl-heroku"
19 20 CCL_PACKAGE="http://${S3_BUCKET}.s3.amazonaws.com/ccl-1.7.tgz"
20 21
21 22 # parse and derive params
  23 +BUILDPACK_DIR=$(cd $(dirname $0); cd ..; pwd) # absolute path of buildpack
22 24 BUILD_DIR=$1
23 25 CACHE_DIR=$2
24 26
@@ -44,10 +46,6 @@ echo "-----> Getting patched versions of libraries"
44 46 # get patched aserve
45 47 if [ -d $CACHE_DIR/repos/portableaserve ]; then
46 48 pushd $CACHE_DIR/repos/portableaserve
47   -# not sure why I am getting errors here -- added explicit remote/branch
48   -# echo "-->DEBUG ls aserve dir "
49   -# pwd
50   -# ls -la
51 49 git pull origin master
52 50 popd
53 51 else
@@ -57,8 +55,11 @@ else
57 55 popd
58 56 fi
59 57
  58 +export BUILDPACK_DIR
60 59 export CACHE_DIR
61 60 export BUILD_DIR
62 61 export CCL_DEFAULT_DIRECTORY=$CCL_DIR
63   -$CCL_DEFAULT_DIRECTORY/scripts/ccl64 -l "$BUILD_DIR/setup/compile.lisp"
64 62
  63 +echo "-----> "Starting build"
  64 +$CCL_DEFAULT_DIRECTORY/scripts/ccl64 -l "$BUILDPACK_DIR/setup/compile.lisp"
  65 +echo "-----> "Build finished"
3  setup/compile.lisp
@@ -2,13 +2,14 @@
2 2
3 3 (defvar *app-dir* (butlast (pathname-directory *load-pathname*)))
4 4 (defvar *cache-dir* (pathname-directory (pathname (concatenate 'string (getenv "CACHE_DIR") "/"))))
  5 +(defvar *buildpack-dir* (pathname-directory (pathname (concatenate 'string (getenv "BUILDPACK_DIR") "/"))))
5 6
6 7 (require :asdf)
7 8 (let ((ql-setup (make-pathname :directory (append *cache-dir* '("quicklisp")) :defaults "setup.lisp")))
8 9 (if (probe-file ql-setup)
9 10 (load ql-setup)
10 11 (progn
11   - (load (make-pathname :directory (append *app-dir* '("lib")) :defaults "quicklisp.lisp"))
  12 + (load (make-pathname :directory (append *buildpack-dir* '("lib")) :defaults "quicklisp.lisp"))
12 13 (funcall (symbol-function (find-symbol "INSTALL" (find-package "QUICKLISP-QUICKSTART")))
13 14 :path (make-pathname :directory (pathname-directory ql-setup))))))
14 15

0 comments on commit 46c492f

Please sign in to comment.
Something went wrong with that request. Please try again.