Commit 3ac4089f authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

Fix asdf-builder for use without cl-launch.

parent f5f77007
Loading
Loading
Loading
Loading
+12 −6
Original line number Original line Diff line number Diff line
@@ -12,10 +12,13 @@
  (when (find-package :asdf)
  (when (find-package :asdf)
    (or (symbol-value (or (find-symbol (string :*asdf-version*) :asdf)
    (or (symbol-value (or (find-symbol (string :*asdf-version*) :asdf)
                          (find-symbol (string :*asdf-revision*) :asdf)))
                          (find-symbol (string :*asdf-revision*) :asdf)))
        (string :1.x))))
        (string :1.x)))))
#-asdf2 (load (merge-pathnames "../build/asdf.lisp" *load-pathname*))
(eval-when (:compile-toplevel :load-toplevel :execute)
#-asdf2 (error "Not ASDF2, you lose!")
  (unless (member :asdf2 *features*)
)
    (load (merge-pathnames "../build/asdf.lisp" *load-pathname*))))
(eval-when (:compile-toplevel :load-toplevel :execute)
  (unless (member :asdf2 *features*)
    (error "Not ASDF2, you lose!")))


(in-package :asdf)
(in-package :asdf)


@@ -35,7 +38,10 @@
  (format t "Now loading some dependencies... ~%")
  (format t "Now loading some dependencies... ~%")
  (load-systems :cl-ppcre :fare-utils :inferior-shell))
  (load-systems :cl-ppcre :fare-utils :inferior-shell))


(eval-when (:compile-toplevel :load-toplevel :execute)
  (format t "There we are!~%")
  (format t "There we are!~%")
  (in-package :asdf))

(unless (featurep :cl-launch) (restore-image))
(unless (featurep :cl-launch) (restore-image))


(defpackage :asdf-builder
(defpackage :asdf-builder
@@ -53,7 +59,7 @@


;;; ASDF directory
;;; ASDF directory
(defvar *asdf-dir*
(defvar *asdf-dir*
  (ensure-pathname (system-relative-pathname :asdf ())
  (ensure-pathname (system-relative-pathname :asdf/defsystem ())
                   :want-physical t :want-absolute t
                   :want-physical t :want-absolute t
                   :want-existing t :truename t))
                   :want-existing t :truename t))
(defparameter /asdf-dir/
(defparameter /asdf-dir/