[Feature] Allow static lua files in any parts of rspamd sources

diff --git a/src/rspamadm/lua_preprocess.pl b/lua_preprocess.pl
similarity index 100%
rename from src/rspamadm/lua_preprocess.pl
rename to lua_preprocess.pl

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a7b03f55ce997b699c60114ab641db05f73589c6..0c1e31dbe8cbe0cb17525d999b2ff4a9ac327074 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -111,6 +111,8 @@ TARGET_LINK_LIBRARIES(rspamd-server rspamd-cdb)
 TARGET_LINK_LIBRARIES(rspamd-server rspamd-lpeg)
 TARGET_LINK_LIBRARIES(rspamd-server lcbtrie)
 
+ADD_DEPENDENCIES(rspamd-server rspamd_lua_preprocess)
+
 IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
        ADD_DEPENDENCIES(rspamd-server rspamd-clang)
 ENDIF()

diff --git a/src/lua/CMakeLists.txt b/src/lua/CMakeLists.txt
index cb97ca3ed6513f77d6f1124ebb4b60a995691795..544fbac3ace7e79a38446f2f3ff7b602a6ce7c97 100644 (file)
--- a/src/lua/CMakeLists.txt
+++ b/src/lua/CMakeLists.txt
@@ -30,3 +30,10 @@ SET(LUASRC                     ${CMAKE_CURRENT_SOURCE_DIR}/lua_common.c
                                          ${CMAKE_CURRENT_SOURCE_DIR}/lua_map.c)
 
 SET(RSPAMD_LUA ${LUASRC} PARENT_SCOPE)
+SET(RSPAMDMLUASRC "")
+ADD_CUSTOM_TARGET(rspamd_lua_preprocess
+        ${PERL_EXECUTABLE}
+            "${CMAKE_SOURCE_DIR}/lua_preprocess.pl"
+            "${CMAKE_CURRENT_SOURCE_DIR}"
+            "${CMAKE_CURRENT_BINARY_DIR}"
+        SOURCES ${RSPAMDMLUASRC} ${CMAKE_SOURCE_DIR}/lua_preprocess.pl)
\ No newline at end of file

diff --git a/src/rspamadm/CMakeLists.txt b/src/rspamadm/CMakeLists.txt
index 65b8669bcfb354a71a63f1c4e941a1d513de508b..992e2a3aaef50e10e887ff6e8beb3631c4d99e6c 100644 (file)
--- a/src/rspamadm/CMakeLists.txt
+++ b/src/rspamadm/CMakeLists.txt
@@ -25,10 +25,10 @@ SET(RSPAMADMLUASRC
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 ADD_CUSTOM_TARGET(rspamadm_lua_preprocess
         ${PERL_EXECUTABLE}
-            "${CMAKE_CURRENT_SOURCE_DIR}/lua_preprocess.pl"
+            "${CMAKE_SOURCE_DIR}/lua_preprocess.pl"
             "${CMAKE_CURRENT_SOURCE_DIR}"
             "${CMAKE_CURRENT_BINARY_DIR}"
-        SOURCES ${RSPAMADMLUASRC} ${CMAKE_CURRENT_SOURCE_DIR}/lua_preprocess.pl)
+        SOURCES ${RSPAMADMLUASRC} ${CMAKE_SOURCE_DIR}/lua_preprocess.pl)
 IF (ENABLE_HYPERSCAN MATCHES "ON")
     LIST(APPEND RSPAMADMSRC "${CMAKE_SOURCE_DIR}/src/hs_helper.c")
 ENDIF()