Commit b1372bda authored by Eric Timmons's avatar Eric Timmons
Browse files

Fix some Windows build issues with Dexador

parent 628ad864
...@@ -55,6 +55,12 @@ ...@@ -55,6 +55,12 @@
(not (present :clpm-openssl))) (not (present :clpm-openssl)))
(pushnew :dexador-no-ssl clpm-features)) (pushnew :dexador-no-ssl clpm-features))
;; If we're using Dexador on Windows, push a feature saying we're using
;; WinHTTP.
(when (and (present :clpm-dexador)
(uiop:featurep :win32))
(pushnew :clpm-winhttp clpm-features))
;; If no Lisp clients that use openssl are present, remove it from the ;; If no Lisp clients that use openssl are present, remove it from the
;; feature set. ;; feature set.
(unless (or (present :clpm-drakma) (unless (or (present :clpm-drakma)
......
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
(:use #:cl (:use #:cl
#:clpm/deps) #:clpm/deps)
(:import-from #:deploy) (:import-from #:deploy)
#+clpm-winhttp
(:import-from #:winhttp
#:winhttp)
(:export #:*default-clpm-home*)) (:export #:*default-clpm-home*))
(in-package #:clpm/deploy) (in-package #:clpm/deploy)
...@@ -15,6 +18,11 @@ ...@@ -15,6 +18,11 @@
(deploy:define-resource-directory deploy-src "src/") (deploy:define-resource-directory deploy-src "src/")
;; Don't deploy the WinHttp dll
#+clpm-winhttp
(deploy:define-library winhttp
:dont-deploy t)
(uiop:register-image-restore-hook (uiop:register-image-restore-hook
(lambda () (lambda ()
;; Silence Deploy ;; Silence Deploy
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
(uiop:define-package #:clpm/http-client/dexador (uiop:define-package #:clpm/http-client/dexador
(:use #:cl (:use #:cl
#:alexandria #:alexandria
#+clpm-openssl
#:clpm/http-client/cl-plus-ssl #:clpm/http-client/cl-plus-ssl
#:clpm/http-client/defs #:clpm/http-client/defs
#:clpm/utils #:clpm/utils
...@@ -39,6 +40,7 @@ ...@@ -39,6 +40,7 @@
(or (eql (puri:uri-scheme url) :http) (or (eql (puri:uri-scheme url) :http)
(featurep :windows) (featurep :windows)
(and (not (featurep :dexador-no-ssl)) (and (not (featurep :dexador-no-ssl))
#+clpm-openssl
*openssl-available-p*))) *openssl-available-p*)))
(defmethod %http-client-manages-streams-p ((client dexador-client)) (defmethod %http-client-manages-streams-p ((client dexador-client))
......
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