Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
clpm
clpm
Commits
b1372bda
Commit
b1372bda
authored
Feb 14, 2020
by
Eric Timmons
Browse files
Fix some Windows build issues with Dexador
parent
628ad864
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/clpm-build/features.lisp
View file @
b1372bda
...
...
@@ -55,6 +55,12 @@
(
not
(
present
:clpm-openssl
)))
(
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
;; feature set.
(
unless
(
or
(
present
:clpm-drakma
)
...
...
src/clpm/deploy.lisp
View file @
b1372bda
...
...
@@ -7,6 +7,9 @@
(
:use
#:cl
#:clpm/deps
)
(
:import-from
#:deploy
)
#+
clpm-winhttp
(
:import-from
#:winhttp
#:winhttp
)
(
:export
#:*default-clpm-home*
))
(
in-package
#:clpm/deploy
)
...
...
@@ -15,6 +18,11 @@
(
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
(
lambda
()
;; Silence Deploy
...
...
src/clpm/http-client/dexador.lisp
View file @
b1372bda
...
...
@@ -6,6 +6,7 @@
(
uiop:define-package
#:clpm/http-client/dexador
(
:use
#:cl
#:alexandria
#+
clpm-openssl
#:clpm/http-client/cl-plus-ssl
#:clpm/http-client/defs
#:clpm/utils
...
...
@@ -39,6 +40,7 @@
(
or
(
eql
(
puri:uri-scheme
url
)
:http
)
(
featurep
:windows
)
(
and
(
not
(
featurep
:dexador-no-ssl
))
#+
clpm-openssl
*openssl-available-p*
)))
(
defmethod
%http-client-manages-streams-p
((
client
dexador-client
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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