Commit 2ed6f5b9 authored by Daniel Kochmański's avatar Daniel Kochmański Committed by Francois-Rene Rideau
Browse files

Fix typo with in cond statement, that broke make-build. 

tests: add minimal make-build test

[Patch originally by Daniel Kochmański, tweaked by Faré]
parent 8366db2e

bundle.lisp

+6 −6
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ itself.")) ;; operation on a system and its dependencies 
               `(,(make-library-system

                   "cmp" (compiler-library-pathname))))

           ,@(unless (or (no-uiop c) (has-it-p "uiop") (has-it-p "asdf"))

               `(cond

               (cond

                 ((system-source-directory :uiop) `(,(find-system :uiop)))

                 ((system-source-directory :asdf) `(,(find-system :asdf)))

                 (t `(,@(if-let (uiop (uiop-library-pathname))

test/sample-system/a.lisp

0 → 100644
+9 −0
Original line number Diff line number Diff line 
;;;; a.lisp



(defpackage :sample

  (:use #:cl)

  (:export #:loaded))



(in-package :sample)

(defparameter loaded t)

test/sample-system/sample-system.asd

0 → 100644
+5 −0
Original line number Diff line number Diff line 
;;;; foo.asd



(asdf:defsystem #:sample-system

  :serial t

  :components ((:file "a")))

test/test-make-build.script

0 → 100644
+9 −0
Original line number Diff line number Diff line 
;;; -*- Lisp -*-



(DBG "build sample-system. Should load from sample-system/")

(setf *central-registry* (list (subpathname *test-directory* "sample-system/")))



(make-build 'sample-system

            :type :program :monolithic t

            :name-suffix ""

            #+ecl :epilogue-code #+ecl '(println "blue sky"))