early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,13 @@
diff --git a/src/sw/redis++/shards.cpp b/src/sw/redis++/shards.cpp
index c5baf5a..08e96cd 100644
--- a/src/sw/redis++/shards.cpp
+++ b/src/sw/redis++/shards.cpp
@@ -41,7 +41,7 @@ std::pair<Slot, Node> RedirectionError::_parse_error(const std::string &msg) con
auto host = msg.substr(space_pos + 1, colon_pos - space_pos - 1);
auto port = std::stoi(msg.substr(colon_pos + 1));
- return {slot, {host, port}};
+ return {static_cast<std::size_t>(slot), {host, port}};
} catch (const std::exception &e) {
throw ProtoError("Invalid ASK error message: " + msg);
}

View File

@@ -0,0 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 452cc0f..90932ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -148,6 +148,7 @@ if(REDIS_PLUS_PLUS_BUILD_SHARED)
target_compile_definitions(${SHARED_LIB} PRIVATE NOMINMAX)
set_target_properties(${SHARED_LIB} PROPERTIES CXX_STANDARD ${REDIS_PLUS_PLUS_CXX_STANDARD})
set_target_properties(${SHARED_LIB} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
+ target_link_libraries(${SHARED_LIB} PUBLIC Ws2_32.lib)
else()
target_compile_options(${SHARED_LIB} PRIVATE "-Wall" "-W" "-Werror")
endif()

View File

@@ -0,0 +1,41 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO sewenew/redis-plus-plus
REF e29c63db54653a660d7a0f556f670b7a6fce0a78 # 1.3.2
SHA512 47b18f41cfaf5e11d6eba1201a3da3a1ed355583cde0772de68e5f0f25953e1467c83249848b25b16c9db9e3f6c5df5e1dd832f4b3dd41289c69111867e48d8c
HEAD_REF master
PATCHES
fix-ws2-linking-windows.patch
fix-conversion.patch
)
if("cxx17" IN_LIST FEATURES)
set(REDIS_PLUS_PLUS_CXX_STANDARD 17)
else()
set(REDIS_PLUS_PLUS_CXX_STANDARD 11)
endif()
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" REDIS_PLUS_PLUS_BUILD_STATIC)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" REDIS_PLUS_PLUS_BUILD_SHARED)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DREDIS_PLUS_PLUS_USE_TLS=OFF
-DREDIS_PLUS_PLUS_BUILD_STATIC=${REDIS_PLUS_PLUS_BUILD_STATIC}
-DREDIS_PLUS_PLUS_BUILD_SHARED=${REDIS_PLUS_PLUS_BUILD_SHARED}
-DREDIS_PLUS_PLUS_BUILD_TEST=OFF
-DREDIS_PLUS_PLUS_CXX_STANDARD=${REDIS_PLUS_PLUS_CXX_STANDARD}
)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright )
vcpkg_fixup_pkgconfig()

View File

@@ -0,0 +1,22 @@
{
"name": "redis-plus-plus",
"version-semver": "1.3.2",
"description": "This is a C++ client for Redis. It's based on hiredis, and written in C++ 11",
"homepage": "https://github.com/sewenew/redis-plus-plus",
"dependencies": [
"hiredis",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
],
"features": {
"cxx17": {
"description": "Build redis-plus-plus with cxx 17 standard"
}
}
}