Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

get files from buildpack dir

  • Loading branch information...
commit 46c492f3c8bf6a231b264bf2a93dd4dc9fe5534c 1 parent b69f2df
@mtravers mtravers authored
Showing with 8 additions and 6 deletions.
  1. +6 −5 bin/compile
  2. +2 −1  setup/compile.lisp
View
11 bin/compile
@@ -15,10 +15,12 @@ function indent() {
esac
}
+#
S3_BUCKET="cl-heroku"
CCL_PACKAGE="http://${S3_BUCKET}.s3.amazonaws.com/ccl-1.7.tgz"
# parse and derive params
+BUILDPACK_DIR=$(cd $(dirname $0); cd ..; pwd) # absolute path of buildpack
BUILD_DIR=$1
CACHE_DIR=$2
@@ -44,10 +46,6 @@ echo "-----> Getting patched versions of libraries"
# get patched aserve
if [ -d $CACHE_DIR/repos/portableaserve ]; then
pushd $CACHE_DIR/repos/portableaserve
-# not sure why I am getting errors here -- added explicit remote/branch
-# echo "-->DEBUG ls aserve dir "
-# pwd
-# ls -la
git pull origin master
popd
else
@@ -57,8 +55,11 @@ else
popd
fi
+export BUILDPACK_DIR
export CACHE_DIR
export BUILD_DIR
export CCL_DEFAULT_DIRECTORY=$CCL_DIR
-$CCL_DEFAULT_DIRECTORY/scripts/ccl64 -l "$BUILD_DIR/setup/compile.lisp"
+echo "-----> "Starting build"
+$CCL_DEFAULT_DIRECTORY/scripts/ccl64 -l "$BUILDPACK_DIR/setup/compile.lisp"
+echo "-----> "Build finished"
View
3  setup/compile.lisp
@@ -2,13 +2,14 @@
(defvar *app-dir* (butlast (pathname-directory *load-pathname*)))
(defvar *cache-dir* (pathname-directory (pathname (concatenate 'string (getenv "CACHE_DIR") "/"))))
+(defvar *buildpack-dir* (pathname-directory (pathname (concatenate 'string (getenv "BUILDPACK_DIR") "/"))))
(require :asdf)
(let ((ql-setup (make-pathname :directory (append *cache-dir* '("quicklisp")) :defaults "setup.lisp")))
(if (probe-file ql-setup)
(load ql-setup)
(progn
- (load (make-pathname :directory (append *app-dir* '("lib")) :defaults "quicklisp.lisp"))
+ (load (make-pathname :directory (append *buildpack-dir* '("lib")) :defaults "quicklisp.lisp"))
(funcall (symbol-function (find-symbol "INSTALL" (find-package "QUICKLISP-QUICKSTART")))
:path (make-pathname :directory (pathname-directory ql-setup))))))
Please sign in to comment.
Something went wrong with that request. Please try again.