Commit 94769254 authored by Dave Cooper's avatar Dave Cooper
Browse files

try calling restart-init-function directly

parent 413f06d2
Pipeline #7302 failed with stages
in 4 minutes and 47 seconds
......@@ -153,13 +153,20 @@ This function will be run in the initiating image after the build is finished."
(let ((branch (getf (the ci-info) :branch))
(sha (getf (the ci-info) :sha))
(application-key (make-keyword (the application-name))))
(print-variables (the restart-init-function))
`(progn
(gendl::deinitialize)
,(when branch
`(setf (getf (getf *ci-info* ,application-key) :branch) ,branch
(getf (getf *ci-info* ,application-key) :sha) ,sha))
(setq *restart-init-function* ,(the restart-init-function))
;;(setq *restart-init-function* ,(the restart-init-function))
(setf (symbol-function '*restart-init-function*) ,(the restart-init-function))
(ccl:save-application (progn (ensure-directories-exist ,(the destination-exe))
,(the destination-exe))
:prepend-kernel t
......@@ -179,6 +186,7 @@ This function will be run in the initiating image after the build is finished."
(toplevel-function (when (the restart-app-function)
`(lambda()
(gendl::initialize :startup-banner? t)
(funcall #',(the restart-init-function))
(funcall #',(the restart-app-function)))))
#+nil
......
......@@ -483,14 +483,14 @@
(defmethod ccl:toplevel-function :before ((a gendl:gendl-development-system) init-file)
(declare (ignore init-file))
(gendl::initialize :startup-banner? t)
(when gdl::*restart-init-function* (funcall (eval gdl::*restart-init-function*))))
(when #'gdl::*restart-init-function* (funcall #'gdl::*restart-init-function*)))
#+ccl
(defmethod ccl:toplevel-function :before ((a gendl:gendl-runtime-system) init-file)
(declare (ignore init-file))
(gendl::initialize :startup-banner? t)
(when gdl::*restart-init-function* (funcall (eval gdl::*restart-init-function*))))
(when #'gdl::*restart-init-function* (funcall #'gdl::*restart-init-function*)))
......
Supports Markdown
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