Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
gendl
gendl
Commits
94769254
Commit
94769254
authored
Oct 31, 2022
by
Dave Cooper
Browse files
try calling restart-init-function directly
parent
413f06d2
Pipeline
#7302
failed with stages
in 4 minutes and 47 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
base/rest/source/gdl-app.lisp
View file @
94769254
...
...
@@ -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
...
...
base/source/genworks.lisp
View file @
94769254
...
...
@@ -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*
)))
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment