mirrors/ciel
1
Fork 0
mirror of https://gitlab.com/vindarel/ciel.git synced 2025-12-06 02:30:39 -08:00
Code Issues Projects Releases Packages Wiki Activity

.asd: move cl+ssl build dependency outside of the .asd

Browse source 
for #20
This commit is contained in:
vindarel 2023-05-08 12:47:33 +02:00
parent b23214917c
commit a4f0cbad70
3 changed files with 41 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -27,6 +27,7 @@ build:
--eval '(ql:quickload :deploy)' \
--eval '(ql:quickload "cl+ssl")' \
--load ciel.asd \
--load build-config.lisp \
--eval '(ql:quickload :swank)' \
--eval '(push :deploy-console *features*)' \
--eval '(ql:quickload :ciel)' \

37
build-config.lisp Normal file
View file

@ -0,0 +1,37 @@
;;;
;;; Extra config to build the binary,
;;; stuff that doesn't need to be in the .asd
;;; (and would be harmful to be there).
;;;
;; We want to configure cl+ssl for the Deploy binary,
;; and we need to load cl+ssl before we can load this config.
;; If it was in the .asd, we would have to load cl+ssl before being able
;; to load the .asd file, which is annoying
;; (it impeds loading CIEL in the REPL with a usual load-asd (C-c C-k)
;; and complicates Ultralisp or Quicklisp distribution).
;;
;; So, we need cl+ssl to build the binary with asdf:make
;; See also the Makefile that quickloads cl+ssl already (maybe this below isn't
;; required any more?)
(unless (find-package :cl+ssl)
(warn "Loading build-config.lisp: we don't find the package CL+SSL. You need to install it before loading this config file and building CIEL's binary. Let's install it with Quicklisp now.~&")
(ql:quickload "cl+ssl"))
(require "cl+ssl")
;; Don't ship libssl, rely on the target OS'.
#+linux (deploy:define-library cl+ssl::libssl :dont-deploy T)
#+linux (deploy:define-library cl+ssl::libcrypto :dont-deploy T)
;; Use compression: from 114M, 0.02s startup time to 27M and 0.42s (SBCL 2.0.10).
#+sb-core-compression
(defmethod asdf:perform ((o asdf:image-op) (c asdf:system))
(uiop:dump-image (asdf:output-file o c) :executable t :compression t))
;; Even with the binary, ASDF wants to update itself and crashes
;; if it doesn't find an ASDF directory, like on a user's system.
;; Thanks again to Shinmera.
(deploy:define-hook (:deploy asdf) (directory)
(declare (ignorable directory))
#+asdf (asdf:clear-source-registry)
#+asdf (defun asdf:upgrade-asdf () nil))

27
ciel.asd
View file

@ -4,14 +4,6 @@
(require "asdf") ;; for CI
;; We need to load cl+ssl before we can load and compile this .asd file.
;; We need it to build the binary with asdf:make, using Deploy
;; (see its use below).
(unless (find-package :cl+ssl)
(warn "Loading ciel.asd: we don't find the package CL+SSL. You need to install it before loading this .asd file. Let's install it with Quicklisp now.~&")
(ql:quickload "cl+ssl"))
(require "cl+ssl")
(asdf:defsystem "ciel"
:description "CIEL Is an Extended Lisp (Common Lisp, batteries included)."
:version "0.1"
@ -174,19 +166,6 @@
:build-pathname "ciel"
:entry-point "ciel::main")
;; Don't ship libssl, rely on the target OS'.
#+linux (deploy:define-library cl+ssl::libssl :dont-deploy T)
#+linux (deploy:define-library cl+ssl::libcrypto :dont-deploy T)
;; Use compression: from 114M, 0.02s startup time to 27M and 0.42s (SBCL 2.0.10).
#+sb-core-compression
(defmethod asdf:perform ((o asdf:image-op) (c asdf:system))
(uiop:dump-image (asdf:output-file o c) :executable t :compression t))
;; Even with the binary, ASDF wants to update itself and crashes
;; if it doesn't find an ASDF directory, like on a user's system.
;; Thanks again to Shinmera.
(deploy:define-hook (:deploy asdf) (directory)
(declare (ignorable directory))
#+asdf (asdf:clear-source-registry)
#+asdf (defun asdf:upgrade-asdf () nil))
;;; This defines ciel.asd. It is enough to quickload CIEL.
;;; But to build a binary,
;;; see build-config.lisp for extra config.