TakeV
/
spacemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: new values for dotspacemacs-enable-lazy-installation 

- all
- unused
- nil
- t

Fixed #5608
This commit is contained in:
syl20bnr 2016-03-27 15:55:24 -04:00
parent bf9f281269
commit 5e5b7a6569
3 changed files with 52 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
core/core-configuration-layer.el
View File

@ -292,8 +292,7 @@ If NO-INSTALL is non nil then install steps are skipped."
(setq configuration-layer--used-distant-packages
(configuration-layer//get-distant-used-packages
configuration-layer--packages))
(when dotspacemacs-enable-lazy-installation
(configuration-layer/load-auto-layer-file))
(configuration-layer/load-auto-layer-file)
(unless no-install
(configuration-layer//install-packages
(configuration-layer/filter-objects
@ -667,34 +666,35 @@ If TOGGLEP is non nil then `:toggle' parameter is ignored."
(defun configuration-layer/lazy-install (layer-name &rest props)
"Configure auto-installation of layer with name LAYER-NAME."
(declare (indent 1))
(let ((extensions (spacemacs/mplist-get props :extensions)))
(when (configuration-layer/layer-usedp layer-name)
(let* ((layer (object-assoc layer-name
:name configuration-layer--layers))
(packages (when layer (cfgl-layer-owned-packages layer))))
;; set lazy install flag for a layer if and only if all its owned
;; distant packages are not already installed
(let ((lazy (cl-reduce (lambda (x y) (and x y))
(mapcar
(lambda (p)
(or (not (eq layer-name (oref p :owner)))
(null (package-installed-p
(oref p :name)))))
(configuration-layer//get-distant-used-packages
packages))
:initial-value t)))
(oset layer :lazy-install lazy)
(dolist (pkg packages)
(oset pkg :lazy-install lazy)))))
(dolist (x extensions)
(let ((ext (car x))
(mode (cadr x)))
(add-to-list 'configuration-layer--lazy-mode-alist (cons mode ext))
(add-to-list
'auto-mode-alist
`(,ext . (lambda ()
(configuration-layer//auto-mode
',layer-name ',mode))))))))
(when (configuration-layer//lazy-install-p layer-name)
(let ((extensions (spacemacs/mplist-get props :extensions)))
(when (configuration-layer/layer-usedp layer-name)
(let* ((layer (object-assoc layer-name
:name configuration-layer--layers))
(packages (when layer (cfgl-layer-owned-packages layer))))
;; set lazy install flag for a layer if and only if all its owned
;; distant packages are not already installed
(let ((lazy (cl-reduce
(lambda (x y) (and x y))
(mapcar (lambda (p)
(or (not (eq layer-name (oref p :owner)))
(null (package-installed-p
(oref p :name)))))
(configuration-layer//get-distant-used-packages
packages))
:initial-value t)))
(oset layer :lazy-install lazy)
(dolist (pkg packages)
(oset pkg :lazy-install lazy)))))
(dolist (x extensions)
(let ((ext (car x))
(mode (cadr x)))
(add-to-list 'configuration-layer--lazy-mode-alist (cons mode ext))
(add-to-list
'auto-mode-alist
`(,ext . (lambda ()
(configuration-layer//auto-mode
',layer-name ',mode)))))))))
(defun configuration-layer//auto-mode (layer-name mode)
"Auto mode support of lazily installed layers."
@ -987,9 +987,9 @@ path."
(defun configuration-layer//lazy-install-p (layer-name)
"Return non nil if the layer with LAYER-NAME should be lazy installed."
(let ((layer (object-assoc layer-name :name configuration-layer--layers)))
(or (null layer)
(oref layer :lazy-install))))
(or (memq dotspacemacs-enable-lazy-installation '(all t))
(and (eq 'unused dotspacemacs-enable-lazy-installation)
(not (configuration-layer/layer-usedp layer-name)))))
(defun configuration-layer//lazy-install-packages (layer-name mode)
"Install layer with LAYER-NAME to support MODE."

11
core/core-dotspacemacs.el
View File

@ -65,8 +65,15 @@ environment, otherwise it is strongly recommended to let it set to t.")
"List of additional paths where to look for configuration layers.
Paths must have a trailing slash (ie. `~/.mycontribs/')")
(defvar dotspacemacs-enable-lazy-installation t
"If non-nil layers with lazy install support are lazy installed.")
(defvar dotspacemacs-enable-lazy-installation 'unused
" Lazy installation of layers (i.e. layers are installed only when a file
with a supported type is opened). Possible values are `all', `unused' and `nil'.
`unused' will lazy install only unused layers (i.e. layers not listed in
variable `dotspacemacs-configuration-layers'), `all' will lazy install any layer
that support lazy installation even the layers listed in
`dotspacemacs-configuration-layers'. `nil' disable the lazy installation feature
and you have to explicitly list a layer in the variable
`dotspacemacs-configuration-layers' to install it.")
(defvar dotspacemacs-additional-packages '()
"List of additional packages that will be installed wihout being

10
core/templates/.spacemacs.template
View File

@ -11,6 +11,16 @@ values."
;; `+distribution'. For now available distributions are `spacemacs-base'
;; or `spacemacs'. (default 'spacemacs)
dotspacemacs-distribution 'spacemacs
;; Lazy installation of layers (i.e. layers are installed only when a file
;; with a supported type is opened). Possible values are `all', `unused'
;; and `nil'. `unused' will lazy install only unused layers (i.e. layers
;; not listed in variable `dotspacemacs-configuration-layers'), `all' will
;; lazy install any layer that support lazy installation even the layers
;; listed in `dotspacemacs-configuration-layers'. `nil' disable the lazy
;; installation feature and you have to explicitly list a layer in the
;; variable `dotspacemacs-configuration-layers' to install it.
;; (default 'unused)
dotspacemacs-enable-lazy-installation 'unused
;; If non-nil layers with lazy install support are lazy installed.
;; (default t)
dotspacemacs-enable-lazy-installation t