Commit 58db4b41 authored by Eric Timmons's avatar Eric Timmons
Browse files

Remove CLPM_HOME var

Use sb-ext:*core-pathname* instead
parent 1bf9e663
......@@ -44,9 +44,7 @@ install the dependencies:
After downloading the tarball and validating the SHA512 sum, unpack it and
run =sh install.sh=. By default, it is installed to =/usr/local/=, but that
prefix con be changed using the =INSTALL_ROOT= environment
variable. However, if you change the prefix, you will also likely need to
set the =CLPM_HOME= environment variable to point to
=$INSTALL_ROOT/lib/clpm/=.
variable.
** Windows
......
......@@ -76,9 +76,7 @@ files.
After downloading the tarball and validating the SHA512 sum, unpack it and
run =sh install.sh=. By default, it is installed to =/usr/local/=, but that
prefix con be changed using the =INSTALL_ROOT= environment
variable. However, if you change the prefix, you will also likely need to
set the =CLPM_HOME= environment variable to point to
=$INSTALL_ROOT/lib/clpm/=.
variable.
*** Windows
......
......@@ -10,13 +10,10 @@
(:import-from #:puri)
#+clpm-winhttp
(:import-from #:winhttp
#:winhttp)
(:export #:*default-clpm-home*))
#:winhttp))
(in-package #:clpm-cli/deploy)
(defvar *default-clpm-home* nil)
(deploy:define-resource-directory deploy-src "clpm/")
(deploy:define-resource-directory deploy-cli "cli/")
(deploy:define-resource-directory deploy-features "features/")
......@@ -37,12 +34,11 @@
(lambda ()
;; Silence Deploy
(setf deploy:*status-output* nil)
;; Compute the data directory for Deploy based on CLPM_HOME
(let ((clpm-home (or (uiop:getenv "CLPM_HOME")
*default-clpm-home*)))
(unless clpm-home
(setf clpm-home (merge-pathnames (make-pathname :directory '(:relative :up "lib" "clpm"))
(deploy:runtime-directory))))
;; Compute the data directory for Deploy based on the core's pathname (which,
;; since we're using deploy, is the same as the runtime pathname).
(let* ((core-pathname sb-ext:*core-pathname*)
(clpm-home (merge-pathnames (make-pathname :directory '(:relative :up "lib" "clpm"))
core-pathname)))
(setf deploy:*data-location* (uiop:truenamize (uiop:ensure-directory-pathname
(uiop:ensure-absolute-pathname clpm-home))))
;; Fixup the logical pathnames
......@@ -51,10 +47,6 @@
`(("clpm:clpm;**;*.*.*" ,(merge-pathnames "clpm/**/*.*" deploy:*data-location*))
("clpm:cli;**;*.*.*" ,(merge-pathnames "cli/**/*.*" deploy:*data-location*))
("clpm:features;**;*.*.*" ,(merge-pathnames "features/**/*.*" deploy:*data-location*)))))
(setf *clpm-client-asd-pathname* (merge-pathnames "src/clpm-client/clpm-client.asd"
deploy:*data-location*))
(unless (uiop:probe-file* clpm-home)
(format *error-output*
"Unable to find CLPM_HOME. Please set CLPM_HOME environment variable.~%")
(uiop:quit 1))))
(setf *clpm-client-asd-pathname* (merge-pathnames "client/clpm-client.asd"
deploy:*data-location*))))
nil)
......@@ -19,12 +19,6 @@
(asdf:load-system :clpm-cli)
(when (or (uiop:featurep :linux)
(uiop:featurep :darwin))
(format uiop:*stderr* "~%~%Performing release build. Setting default CLPM home.~%~%")
(setf (symbol-value (uiop:find-symbol* '#:*default-clpm-home* '#:clpm-cli/deploy))
"/usr/local/lib/clpm"))
(when (uiop:featurep :windows)
(uiop:copy-file (merge-pathnames "License.rtf" *root-pathname*)
(merge-pathnames "License.rtf" *build-root-pathname*)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment