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

Merge branch 'master' into docker-build

Jason Bosco8efe35df1a28
diff --cc CMakeLists.txt
index b9484b4e,e5be8fa1..c3ab91d6
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -3,10 -3,10 +3,11 @@@ project(typesense
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11 -O0")
+# set(CMAKE_EXE_LINKER_FLAGS "--verbose")
+ set(DEP_ROOT_DIR ${CMAKE_SOURCE_DIR}/external-${CMAKE_SYSTEM_NAME})
- if(NOT EXISTS ${CMAKE_SOURCE_DIR}/external/)
- file(MAKE_DIRECTORY ${CMAKE_SOURCE_DIR}/external)
+ if(NOT EXISTS ${DEP_ROOT_DIR})
+ file(MAKE_DIRECTORY ${DEP_ROOT_DIR})
endif()
include(cmake/For.cmake)
@@@ -24,23 -28,22 +29,22 @@@ FILE(GLOB HEADER_FILES include/*
FILE(GLOB SRC_FILES src/*.cpp)
include_directories(include)
- include_directories(${CMAKE_SOURCE_DIR}/external/${FOR_NAME})
- include_directories(${CMAKE_SOURCE_DIR}/external/${GTEST_NAME}/googletest/include)
- include_directories(${CMAKE_SOURCE_DIR}/external/${H2O_NAME}/include)
- include_directories(${CMAKE_SOURCE_DIR}/external/${H2O_NAME}/build/libressl-build/include)
- include_directories(${CMAKE_SOURCE_DIR}/external/${ROCKSDB_NAME}/include)
-
- link_directories(${CMAKE_SOURCE_DIR}/external/${GTEST_NAME}/googletest/build)
- link_directories(${CMAKE_SOURCE_DIR}/external/${FOR_NAME})
- link_directories(${CMAKE_SOURCE_DIR}/external/${H2O_NAME}/build)
- link_directories(${CMAKE_SOURCE_DIR}/external/${H2O_NAME}/build/libressl-build/lib)
- link_directories(${CMAKE_SOURCE_DIR}/external/${ROCKSDB_NAME})
-
- add_executable(typesense-server ${HEADER_FILES} ${SRC_FILES} src/main/server.cpp)
- add_executable(search ${HEADER_FILES} ${SRC_FILES} src/main/main.cpp)
- add_executable(benchmark ${HEADER_FILES} ${SRC_FILES} src/main/benchmark.cpp)
+ 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}/build/libressl-build/include)
+ include_directories(${DEP_ROOT_DIR}/${ROCKSDB_NAME}/include)
+
+ link_directories(${DEP_ROOT_DIR}/${GTEST_NAME}/googletest/build)
+ link_directories(${DEP_ROOT_DIR}/${FOR_NAME})
+ link_directories(${DEP_ROOT_DIR}/${H2O_NAME}/build)
+ link_directories(${DEP_ROOT_DIR}/${ROCKSDB_NAME})
+
+ add_executable(typesense-server ${SRC_FILES} src/main/server.cpp)
+ add_executable(search ${SRC_FILES} src/main/main.cpp)
+ add_executable(benchmark ${SRC_FILES} src/main/benchmark.cpp)
add_executable(typesense_test test/array_test.cpp test/sorted_array_test.cpp test/art_test.cpp
- test/collection_test.cpp test/collection_manager_test.cpp test/topster_test.cpp ${SRC_FILES})
+ test/collection_test.cpp test/collection_manager_test.cpp test/topster_test.cpp ${HEADER_FILES} ${SRC_FILES})
target_compile_definitions(typesense-server PRIVATE ROOT_DIR="${CMAKE_SOURCE_DIR}/")
target_compile_definitions(search PRIVATE ROOT_DIR="${CMAKE_SOURCE_DIR}/")
diff --cc build.sh
index 2364ec8a,5be536bb..02df235a
--- a/build.sh
+++ b/build.sh
@@@ -1,17 -1,10 +1,17 @@@
#!/bin/sh
+set -o xtrace
+
PROJECT_DIR=`dirname $0`
- if [ "$1" == "--clean" ]; then
+ if [ "$1" = "--clean" ]; then
rm -rf $PROJECT_DIR/build
mkdir $PROJECT_DIR/build
+
+ # rm -rf $PROJECT_DIR/external
+ # DOCKER_NO_CACHE=" --no-cache"
fi
-cmake -H$PROJECT_DIR -B$PROJECT_DIR/build
-make -C $PROJECT_DIR/build
+docker build --file $PROJECT_DIR/docker/development.Dockerfile --tag wreally/typesense-development $DOCKER_NO_CACHE $PROJECT_DIR/docker
+
+./dockcross --image wreally/typesense-development cmake -H$PROJECT_DIR -B$PROJECT_DIR/build
+./dockcross --image wreally/typesense-development make -C $PROJECT_DIR/build