Browse Source

[Minor] Redis support is now unconditional

tags/1.7.8
Vsevolod Stakhov 5 years ago
parent
commit
418c101010

+ 1
- 1
.circleci/config.yml View File

- run: sudo apt-get install -qq cmake libevent-dev libglib2.0-dev libicu-dev libluajit-5.1-dev libmagic-dev libsqlite3-dev libssl-dev ragel - run: sudo apt-get install -qq cmake libevent-dev libglib2.0-dev libicu-dev libluajit-5.1-dev libmagic-dev libsqlite3-dev libssl-dev ragel


- run: mkdir ../build ; mkdir ../install ; cd ../build - run: mkdir ../build ; mkdir ../install ; cd ../build
- run: cmake ../project -DDBDIR=/nana -DENABLE_COVERAGE=ON -DCMAKE_INSTALL_PREFIX=../install -DENABLE_HIREDIS=ON
- run: cmake ../project -DDBDIR=/nana -DENABLE_COVERAGE=ON -DCMAKE_INSTALL_PREFIX=../install


- run: make install -j`nproc` - run: make install -j`nproc`



+ 1
- 3
CMakeLists.txt View File

IF (ENABLE_SNOWBALL MATCHES "ON") IF (ENABLE_SNOWBALL MATCHES "ON")
LIST(APPEND RSPAMD_REQUIRED_LIBRARIES stemmer) LIST(APPEND RSPAMD_REQUIRED_LIBRARIES stemmer)
ENDIF() ENDIF()
IF(ENABLE_HIREDIS MATCHES "ON")
LIST(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-hiredis)
ENDIF()
LIST(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-hiredis)
IF(ENABLE_HYPERSCAN MATCHES "OFF") IF(ENABLE_HYPERSCAN MATCHES "OFF")
LIST(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-actrie) LIST(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-actrie)
ENDIF() ENDIF()

+ 0
- 1
debian/rules View File

-DENABLE_FULL_DEBUG=OFF \ -DENABLE_FULL_DEBUG=OFF \
-DENABLE_GD=OFF \ -DENABLE_GD=OFF \
-DENABLE_PCRE2=OFF \ -DENABLE_PCRE2=OFF \
-DENABLE_HIREDIS=ON \
-DENABLE_LUAJIT=ON \ -DENABLE_LUAJIT=ON \
-DENABLE_TORCH=ON \ -DENABLE_TORCH=ON \
-DENABLE_LIBUNWIND=ON \ -DENABLE_LIBUNWIND=ON \

+ 1
- 3
src/CMakeLists.txt View File

IF (ENABLE_SNOWBALL MATCHES "ON") IF (ENABLE_SNOWBALL MATCHES "ON")
TARGET_LINK_LIBRARIES(rspamd stemmer) TARGET_LINK_LIBRARIES(rspamd stemmer)
ENDIF() ENDIF()
IF(ENABLE_HIREDIS MATCHES "ON")
TARGET_LINK_LIBRARIES(rspamd rspamd-hiredis)
ENDIF()
TARGET_LINK_LIBRARIES(rspamd rspamd-hiredis)


IF (ENABLE_FANN MATCHES "ON") IF (ENABLE_FANN MATCHES "ON")
TARGET_LINK_LIBRARIES(rspamd fann) TARGET_LINK_LIBRARIES(rspamd fann)

+ 2
- 4
src/libserver/CMakeLists.txt View File

${CMAKE_CURRENT_SOURCE_DIR}/url.c ${CMAKE_CURRENT_SOURCE_DIR}/url.c
${CMAKE_CURRENT_SOURCE_DIR}/worker_util.c) ${CMAKE_CURRENT_SOURCE_DIR}/worker_util.c)


IF (ENABLE_HIREDIS MATCHES "ON")
LIST(APPEND LIBRSPAMDSERVERSRC "${CMAKE_CURRENT_SOURCE_DIR}/fuzzy_backend_redis.c")
LIST(APPEND LIBRSPAMDSERVERSRC "${CMAKE_CURRENT_SOURCE_DIR}/redis_pool.c")
ENDIF ()
LIST(APPEND LIBRSPAMDSERVERSRC "${CMAKE_CURRENT_SOURCE_DIR}/fuzzy_backend_redis.c")
LIST(APPEND LIBRSPAMDSERVERSRC "${CMAKE_CURRENT_SOURCE_DIR}/redis_pool.c")


# Librspamd-server # Librspamd-server
SET(RSPAMD_SERVER ${LIBRSPAMDSERVERSRC} PARENT_SCOPE) SET(RSPAMD_SERVER ${LIBRSPAMDSERVERSRC} PARENT_SCOPE)

+ 4
- 6
src/libstat/CMakeLists.txt View File

${CMAKE_CURRENT_SOURCE_DIR}/backends/sqlite3_backend.c) ${CMAKE_CURRENT_SOURCE_DIR}/backends/sqlite3_backend.c)
SET(CACHESSRC ${CMAKE_CURRENT_SOURCE_DIR}/learn_cache/sqlite3_cache.c) SET(CACHESSRC ${CMAKE_CURRENT_SOURCE_DIR}/learn_cache/sqlite3_cache.c)


IF(ENABLE_HIREDIS MATCHES "ON")
SET(BACKENDSSRC ${BACKENDSSRC}
${CMAKE_CURRENT_SOURCE_DIR}/backends/redis_backend.c)
SET(CACHESSRC ${CACHESSRC}
${CMAKE_CURRENT_SOURCE_DIR}/learn_cache/redis_cache.c)
ENDIF(ENABLE_HIREDIS MATCHES "ON")
SET(BACKENDSSRC ${BACKENDSSRC}
${CMAKE_CURRENT_SOURCE_DIR}/backends/redis_backend.c)
SET(CACHESSRC ${CACHESSRC}
${CMAKE_CURRENT_SOURCE_DIR}/learn_cache/redis_cache.c)




SET(RSPAMD_STAT ${LIBSTATSRC} SET(RSPAMD_STAT ${LIBSTATSRC}

+ 1
- 3
test/CMakeLists.txt View File

IF (ENABLE_SNOWBALL MATCHES "ON") IF (ENABLE_SNOWBALL MATCHES "ON")
TARGET_LINK_LIBRARIES(rspamd-test stemmer) TARGET_LINK_LIBRARIES(rspamd-test stemmer)
ENDIF() ENDIF()
IF(ENABLE_HIREDIS MATCHES "ON")
TARGET_LINK_LIBRARIES(rspamd-test rspamd-hiredis)
ENDIF()
TARGET_LINK_LIBRARIES(rspamd-test rspamd-hiredis)
IF (ENABLE_HYPERSCAN MATCHES "ON") IF (ENABLE_HYPERSCAN MATCHES "ON")
TARGET_LINK_LIBRARIES(rspamd-test hs) TARGET_LINK_LIBRARIES(rspamd-test hs)
ENDIF() ENDIF()

+ 1
- 3
utils/CMakeLists.txt View File

IF (ENABLE_SNOWBALL MATCHES "ON") IF (ENABLE_SNOWBALL MATCHES "ON")
TARGET_LINK_LIBRARIES("${NAME}" stemmer) TARGET_LINK_LIBRARIES("${NAME}" stemmer)
ENDIF() ENDIF()
IF(ENABLE_HIREDIS MATCHES "ON")
TARGET_LINK_LIBRARIES("${NAME}" rspamd-hiredis)
ENDIF()
TARGET_LINK_LIBRARIES("${NAME}" rspamd-hiredis)
TARGET_LINK_LIBRARIES(${NAME} rspamd-linenoise) TARGET_LINK_LIBRARIES(${NAME} rspamd-linenoise)
TARGET_LINK_LIBRARIES("${NAME}" ${RSPAMD_REQUIRED_LIBRARIES}) TARGET_LINK_LIBRARIES("${NAME}" ${RSPAMD_REQUIRED_LIBRARIES})
ENDMACRO() ENDMACRO()

Loading…
Cancel
Save