Commit 370777a9 authored by Eric Timmons's avatar Eric Timmons
Browse files

client: Add *activate-asdf-integration*, defaults to T

This controls if ASDF is integrated by default when activating a context.
parent 78f90dbc
Pipeline #3048 passed with stages
in 24 minutes and 54 seconds
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
+ Fixed bug in computing the source-registry.d file for the clpm client (#16) + Fixed bug in computing the source-registry.d file for the clpm client (#16)
+ Starting to build up a test suite (#3) + Starting to build up a test suite (#3)
+ Added automated testing on Gitlab CI. + Added automated testing on Gitlab CI.
+ Added =clpm-client:*activate-asdf-integration*= to control default
integration with ASDF upon context activation.
Fixes from the aborted 0.3.6: Fixes from the aborted 0.3.6:
......
...@@ -28,6 +28,9 @@ ignored.") ...@@ -28,6 +28,9 @@ ignored.")
(defvar *active-context-visible-primary-system-names* nil (defvar *active-context-visible-primary-system-names* nil
"List of primary system names visible to ASDF in the active context.") "List of primary system names visible to ASDF in the active context.")
(defvar *activate-asdf-integration* t
"The default value of :ACTIVATE-ASDF-INTEGRATION in ACTIVATE-CONTEXT.")
(defun configure-from-env () (defun configure-from-env ()
"Determine if there is any active context by looking at environment "Determine if there is any active context by looking at environment
variables." variables."
...@@ -145,7 +148,7 @@ directories containing the files." ...@@ -145,7 +148,7 @@ directories containing the files."
(clpm-proc-print proc `(source-registry :context ,context :ignore-inherited-source-registry ,ignore-inherited :with-client-p t)) (clpm-proc-print proc `(source-registry :context ,context :ignore-inherited-source-registry ,ignore-inherited :with-client-p t))
(clpm-proc-read proc))) (clpm-proc-read proc)))
(defun activate-context (context &key activate-asdf-integration (defun activate-context (context &key (activate-asdf-integration *activate-asdf-integration*)
(ignore-inherited-source-registry (context-bundle-p context))) (ignore-inherited-source-registry (context-bundle-p context)))
"Activate a CLPM context. This clears ASDF's current configuration and "Activate a CLPM context. This clears ASDF's current configuration and
replaces it with configuration appropriate for CONTEXT. replaces it with configuration appropriate for CONTEXT.
......
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
(uiop:define-package #:clpm-client (uiop:define-package #:clpm-client
(:use #:cl) (:use #:cl)
(:export #:*asdf-system-not-found-behavior* (:export #:*activate-asdf-integration*
#:*asdf-system-not-found-behavior*
#:*cleanup-on-dump-p* #:*cleanup-on-dump-p*
#:*clpm-dribble* #:*clpm-dribble*
#:*clpm-dribble-input-prefix* #:*clpm-dribble-input-prefix*
......
Markdown is supported
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