[Minor] Move hyperscan tools to the libserver domain

diff --git a/src/libserver/CMakeLists.txt b/src/libserver/CMakeLists.txt
index d287f44c127ea5a4bb6585425438f07075379db3..c4940f9171cb83da6eb75011ec64e200ad8a1ac8 100644 (file)
--- a/src/libserver/CMakeLists.txt
+++ b/src/libserver/CMakeLists.txt
@@ -42,6 +42,7 @@ SET(LIBRSPAMDSERVERSRC
                                ${CMAKE_CURRENT_SOURCE_DIR}/html/html_url.cxx
                                ${CMAKE_CURRENT_SOURCE_DIR}/html/html.cxx
                                ${CMAKE_CURRENT_SOURCE_DIR}/html/html_tests.cxx
+                               ${CMAKE_CURRENT_SOURCE_DIR}/hyperscan_tools.cxx
                                ${LIBCSSSRC})
 
 # Librspamd-server

diff --git a/src/libutil/cxx/hyperscan_tools.cxx b/src/libserver/hyperscan_tools.cxx
similarity index 99%
rename from src/libutil/cxx/hyperscan_tools.cxx
rename to src/libserver/hyperscan_tools.cxx
index f5086d1e488bc895cf699621e335ae967f0ad57c..3dedad52d849b211587e7d311ea0ac46dcaef580 100644 (file)
--- a/src/libutil/cxx/hyperscan_tools.cxx
+++ b/src/libserver/hyperscan_tools.cxx
@@ -20,10 +20,9 @@
 #include "contrib/ankerl/unordered_dense.h"
 #include "contrib/ankerl/svector.h"
 #include "fmt/core.h"
-#include "locked_file.hxx"
+#include "libutil/cxx/locked_file.hxx"
 #include "hs.h"
 #include "logger.h"
-#include "locked_file.hxx"
 
 #include <glob.h> /* for glob */
 #include <unistd.h> /* for unlink */

diff --git a/src/libutil/CMakeLists.txt b/src/libutil/CMakeLists.txt
index 8602baf6ef4fbfb6d3676f36f674cf9ca3b815c1..7b31037206c95fb2f8c31e75f6e0432ee0cbf7a5 100644 (file)
--- a/src/libutil/CMakeLists.txt
+++ b/src/libutil/CMakeLists.txt
@@ -18,7 +18,6 @@ SET(LIBRSPAMDUTILSRC
                                ${CMAKE_CURRENT_SOURCE_DIR}/heap.c
                                ${CMAKE_CURRENT_SOURCE_DIR}/multipattern.c
                                ${CMAKE_CURRENT_SOURCE_DIR}/cxx/utf8_util.cxx
-                               ${CMAKE_CURRENT_SOURCE_DIR}/cxx/locked_file.cxx
-                               ${CMAKE_CURRENT_SOURCE_DIR}/cxx/hyperscan_tools.cxx)
+                               ${CMAKE_CURRENT_SOURCE_DIR}/cxx/locked_file.cxx)
 # Rspamdutil
 SET(RSPAMD_UTIL ${LIBRSPAMDUTILSRC} PARENT_SCOPE)
\ No newline at end of file