Skip to content

Open Source alternative to Algolia + Pinecone and an Easier-to-Use alternative to ElasticSearch ⚡ 🔍 ✨ Fast, typo tolerant, in-memory fuzzy Search Engine for building delightful search experiences

Bump h2o dep.

Kishore Nallan812ed37496a7
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a426e30..972e6e95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,6 +86,7 @@ include_directories(${ICU_INCLUDE_DIRS})
include_directories(${DEP_ROOT_DIR}/${FOR_NAME})
include_directories(${DEP_ROOT_DIR}/${GTEST_NAME}/googletest/include)
include_directories(${DEP_ROOT_DIR}/${H2O_NAME}/include)
+include_directories(${DEP_ROOT_DIR}/${H2O_NAME}/include/h2o)
include_directories(${DEP_ROOT_DIR}/${ROCKSDB_NAME}/include)
include_directories(${DEP_ROOT_DIR}/${ICONV_NAME}/include)
include_directories(${DEP_ROOT_DIR}/${BRPC_NAME}/include)
diff --git a/cmake/H2O.cmake b/cmake/H2O.cmake
index 8ae6a666..095759e2 100644
--- a/cmake/H2O.cmake
+++ b/cmake/H2O.cmake
@@ -1,6 +1,6 @@
# Download and build H2O
-set(H2O_VERSION 5accc794404996fb056f1826f5a172693de95f22)
+set(H2O_VERSION 6dda7d6f21610ecd5256543384fa4b4b345a88ac)
set(H2O_NAME h2o-${H2O_VERSION})
set(H2O_TAR_PATH ${DEP_ROOT_DIR}/${H2O_NAME}.tar.gz)
@@ -21,6 +21,9 @@ if(NOT EXISTS ${DEP_ROOT_DIR}/${H2O_NAME}/build/libh2o-evloop.a)
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory deps/picotls/include include/h2o
WORKING_DIRECTORY ${DEP_ROOT_DIR}/${H2O_NAME})
+ execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory deps/quicly/include include/h2o
+ WORKING_DIRECTORY ${DEP_ROOT_DIR}/${H2O_NAME})
+
execute_process(COMMAND ${CMAKE_COMMAND}
-DCMAKE_FIND_LIBRARY_SUFFIXES=.a
-DCMAKE_CXX_FLAGS="-DNDEBUG"
diff --git a/docker-build.sh b/docker-build.sh
index 0bea6a85..fc49381d 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -22,10 +22,10 @@ if [[ "$@" == *"--depclean"* ]]; then
fi
echo "Building Typesense $TYPESENSE_VERSION..."
-docker run -it -v $PROJECT_DIR:/typesense typesense/typesense-development:26-JULY-2021-1 cmake -DTYPESENSE_VERSION=$TYPESENSE_VERSION \
+docker run -it -v $PROJECT_DIR:/typesense typesense/typesense-development:09-AUG-2021-1 cmake -DTYPESENSE_VERSION=$TYPESENSE_VERSION \
-DCMAKE_BUILD_TYPE=Release -H/typesense -B/typesense/$BUILD_DIR
-docker run -it -v $PROJECT_DIR:/typesense typesense/typesense-development:26-JULY-2021-1 make typesense-server -C/typesense/$BUILD_DIR
+docker run -it -v $PROJECT_DIR:/typesense typesense/typesense-development:09-AUG-2021-1 make typesense-server -C/typesense/$BUILD_DIR
if [[ "$@" == *"--build-deploy-image"* ]]; then
echo "Creating deployment image for Typesense $TYPESENSE_VERSION server ..."
@@ -45,7 +45,7 @@ fi
#
#if [[ "$@" == *"--create-deb-upload"* ]]; then
-# docker run -it -v $PROJECT_DIR:/typesense typesense/typesense-development:26-JULY-2021-1 cmake -DTYPESENSE_VERSION=$TYPESENSE_VERSION \
+# docker run -it -v $PROJECT_DIR:/typesense typesense/typesense-development:09-AUG-2021-1 cmake -DTYPESENSE_VERSION=$TYPESENSE_VERSION \
# -DCMAKE_BUILD_TYPE=Debug -H/typesense -B/typesense/$BUILD_DIR
#fi