Skip to content

Windows: update to hiredis 1.0.0 #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jeroen wants to merge 2 commits into from
Closed

Windows: update to hiredis 1.0.0 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7ae9b6
Windows: update to hiredis 1.0.0
jeroen Oct 22, 2020
220ff83
Try to fix AppVeyor
jeroen Oct 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ install:

# Adapt as necessary starting from here
before_build:
- choco install redis-64
- redis-server --service-install
- redis-server --service-start
- choco install memurai-developer

build_script:
- travis-tool.sh install_deps
Expand Down
4 changes: 2 additions & 2 deletions src/Makevars.win
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- makefile -*-
PKG_CPPFLAGS=-I../windows/hiredis-0.9.2/include/hiredis -DSTRICT_R_HEADERS
PKG_LIBS=-L../windows/hiredis-0.9.2/lib${R_ARCH} -lhiredis -lws2_32
PKG_CPPFLAGS=-I../windows/hiredis-1.0.0/include/hiredis -DSTRICT_R_HEADERS
PKG_LIBS=-L../windows/hiredis-1.0.0/lib${R_ARCH} -lhiredis -lws2_32

all: clean winlibs

Expand Down
3 changes: 3 additions & 0 deletions src/registration.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#ifdef _WIN32
#include <winsock2.h>
#endif
#include "connection.h"
#include "conversions.h"
#include "subscribe.h"
Expand Down
4 changes: 2 additions & 2 deletions tools/winlibs.R
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
if (!file.exists("../windows/hiredis-0.9.2/include/hiredis/hiredis.h")) {
if (!file.exists("../windows/hiredis-1.0.0/include/hiredis/hiredis.h")) {
if (getRversion() < "3.3.0") setInternet2()
download.file("https://github.com/rwinlib/hiredis/archive/v0.9.2.zip", "lib.zip", quiet = TRUE)
download.file("https://github.com/rwinlib/hiredis/archive/v1.0.0.zip", "lib.zip", quiet = TRUE)
dir.create("../windows", showWarnings = FALSE)
unzip("lib.zip", exdir = "../windows")
unlink("lib.zip")
Expand Down