Commit d5df1dfe authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files move ensure-absolute-pathname to ensure-lisp-loadable where it's needed.

More release tweaks.
parent 180c5c4c
#| -- shell wrapper generator for Common Lisp software -*- Lisp -*-
license_information () {
# Please send your improvements to the author:
......@@ -2316,10 +2316,11 @@ NIL
(defun ensure-lisp-file-name (x &optional (name "load.lisp"))
(if (equal (pathname-type x) "lisp") x (temporary-file-from-file x name)))
(defun ensure-lisp-loadable (x)
(etypecase x
((eql t) (or *cl-launch-file* (error "Missing CL_LAUNCH_FILE")))
((or stream pathname) x)
(string (parse-native-namestring x))))
((eq x t) (ensure-lisp-loadable (or *cl-launch-file* (error "Missing CL_LAUNCH_FILE"))))
((equal x "-") *standard-input*)
((or (streamp x) (pathnamep x)) x)
((stringp x) (ensure-absolute-pathname (parse-native-namestring x) #'getcwd))))
(defun ensure-lisp-file (x &optional (name "load.lisp"))
(let ((x (ensure-lisp-loadable x)))
(etypecase x
......@@ -2389,15 +2390,9 @@ Returns two values: the fasl path, and T if the file was (re)compiled"
#+(and ecl (not dlopen))
(load source :verbose *verbose*))
(defun compute-arguments ()
(flet ((foo (v)
(let ((x (getenvp v)))
((null x) nil)
((equal x "-") *standard-input*)
(t (ensure-absolute-pathname (parse-native-namestring x) #'getcwd))))))
(setf *cl-launch-file* (foo "CL_LAUNCH_FILE")
*cl-launch-header* (foo "CL_LAUNCH_HEADER")
*verbose* (when (getenvp "CL_LAUNCH_VERBOSE") t))))
(setf *cl-launch-file* (getenvp "CL_LAUNCH_FILE")
*cl-launch-header* (getenvp "CL_LAUNCH_HEADER")
*verbose* (when (getenvp "CL_LAUNCH_VERBOSE") t)))
(asdf::register-preloaded-system "cl-launch")
......@@ -6,7 +6,7 @@ cl-launch (4.0.8-1) unstable; urgency=low
* Fix various bugs in some cases when dumping images.
* Various small tweaks.
-- François-René Rideau <> Fri, 01 Aug 2014 22:06:37 -0400
-- Francois-Rene Rideau <> Fri, 01 Aug 2014 22:06:37 -0400
cl-launch (4.0.7-1) unstable; urgency=low
......@@ -74,7 +74,7 @@ exec "$(dirname $0)/" \
(delete-file-if-exists origtarball)
(run `(git-buildpackage --git-debian-branch=master --git-upstream-branch=master (--git-upstream-tag= ,version) --git-tag --git-retag --git-ignore-branch) :show t)
(run `(lintian -c --fail-on-warnings (../cl-launch_ ,debian-version _ ,(debian-arch) .changes)) :show t)
(run `(lintian -c --fail-on-warnings --profile debian (../cl-launch_ ,debian-version _ ,(debian-arch) .changes)) :show t)
(defun publish-debian-package ()
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