Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/neverlord/plugin-dir'

Browse source 
* origin/topic/neverlord/plugin-dir:
  Fix install directory for plugins
This commit is contained in:
Arne Welzel 2023-04-24 10:33:29 +02:00
commit 1b710d5534
6 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
6.0.0-dev.412 | 2023-04-24 10:33:29 +0200
* Fix install directory for plugins (Dominik Charousset, Corelight)
6.0.0-dev.410 | 2023-04-24 09:46:59 +0200 6.0.0-dev.410 | 2023-04-24 09:46:59 +0200
* policy: Import zeek-community-id scripts into protocols/conn frameworks/notice (Christian Kreibich, Corelight) * policy: Import zeek-community-id scripts into protocols/conn frameworks/notice (Christian Kreibich, Corelight)

11
CMakeLists.txt
View file

@ -412,22 +412,17 @@ get_filename_component(ZEEK_SCRIPT_INSTALL_PATH ${ZEEK_SCRIPT_INSTALL_PATH}
# plugins, etc. # plugins, etc.
set(ZEEK_LIBDIR_PATH ${CMAKE_INSTALL_FULL_LIBDIR}/zeek) set(ZEEK_LIBDIR_PATH ${CMAKE_INSTALL_FULL_LIBDIR}/zeek)
if (ZEEK_PLUGIN_DIR) if (NOT ZEEK_PLUGIN_DIR)
set(BRO_PLUGIN_INSTALL_PATH ${ZEEK_PLUGIN_DIR} set(ZEEK_PLUGIN_DIR ${ZEEK_LIBDIR_PATH}/plugins
CACHE STRING "Installation path for plugins" FORCE)
else ()
set(BRO_PLUGIN_INSTALL_PATH ${ZEEK_LIBDIR_PATH}/plugins
CACHE STRING "Installation path for plugins" FORCE) CACHE STRING "Installation path for plugins" FORCE)
endif() endif()
set(bro_plugin_install_path "${BRO_PLUGIN_INSTALL_PATH}")
set(cmake_binary_dir "${CMAKE_BINARY_DIR}") set(cmake_binary_dir "${CMAKE_BINARY_DIR}")
set(cmake_current_binary_dir "${CMAKE_CURRENT_BINARY_DIR}") set(cmake_current_binary_dir "${CMAKE_CURRENT_BINARY_DIR}")
set(cmake_install_prefix "${CMAKE_INSTALL_PREFIX}") set(cmake_install_prefix "${CMAKE_INSTALL_PREFIX}")
set(cmake_source_dir "${CMAKE_SOURCE_DIR}") set(cmake_source_dir "${CMAKE_SOURCE_DIR}")
set(zeek_script_install_path "${ZEEK_SCRIPT_INSTALL_PATH}") set(zeek_script_install_path "${ZEEK_SCRIPT_INSTALL_PATH}")
if ( MSVC ) if ( MSVC )
string(REGEX REPLACE "^([A-Za-z]):/(.*)" "/\\1/\\2" bro_plugin_install_path "${bro_plugin_install_path}")
string(REGEX REPLACE "^([A-Za-z]):/(.*)" "/\\1/\\2" cmake_binary_dir "${cmake_binary_dir}") string(REGEX REPLACE "^([A-Za-z]):/(.*)" "/\\1/\\2" cmake_binary_dir "${cmake_binary_dir}")
string(REGEX REPLACE "^([A-Za-z]):/(.*)" "/\\1/\\2" cmake_current_binary_dir "${cmake_current_binary_dir}") string(REGEX REPLACE "^([A-Za-z]):/(.*)" "/\\1/\\2" cmake_current_binary_dir "${cmake_current_binary_dir}")
string(REGEX REPLACE "^([A-Za-z]):/(.*)" "/\\1/\\2" cmake_install_prefix "${cmake_install_prefix}") string(REGEX REPLACE "^([A-Za-z]):/(.*)" "/\\1/\\2" cmake_install_prefix "${cmake_install_prefix}")
@ -1379,7 +1374,7 @@ message(
"\nInstall prefix: ${CMAKE_INSTALL_PREFIX}" "\nInstall prefix: ${CMAKE_INSTALL_PREFIX}"
"\nConfig file dir: ${ZEEK_ETC_INSTALL_DIR}" "\nConfig file dir: ${ZEEK_ETC_INSTALL_DIR}"
"\nLog dir: ${ZEEK_LOG_DIR}" "\nLog dir: ${ZEEK_LOG_DIR}"
"\nPlugin dir: ${BRO_PLUGIN_INSTALL_PATH}" "\nPlugin dir: ${ZEEK_PLUGIN_DIR}"
"\nPython module dir: ${PY_MOD_INSTALL_DIR}" "\nPython module dir: ${PY_MOD_INSTALL_DIR}"
"\nScript dir: ${ZEEK_SCRIPT_INSTALL_PATH}" "\nScript dir: ${ZEEK_SCRIPT_INSTALL_PATH}"
"\nSpool dir: ${ZEEK_SPOOL_DIR}" "\nSpool dir: ${ZEEK_SPOOL_DIR}"

2
VERSION
View file

@ -1 +1 @@
6.0.0-dev.410 6.0.0-dev.412

2
cmake

@ -1 +1 @@
Subproject commit 6fd9b7405a2ee5c62e1a4d70ee47da8ca8bacb9a Subproject commit 6f096c3f6dcb9f35664cf25a58989bc5d123b995

4
src/ZeekPluginBootstrap.cmake.in
View file

@ -5,6 +5,10 @@
set(ZEEK_CMAKE_CONFIG_DIR "@ZEEK_CMAKE_CONFIG_DIR@" set(ZEEK_CMAKE_CONFIG_DIR "@ZEEK_CMAKE_CONFIG_DIR@"
CACHE PATH "Internal Zeek variable: the CMake package path for Zeek." FORCE) CACHE PATH "Internal Zeek variable: the CMake package path for Zeek." FORCE)
# Tells ZeekPlugin.cmake where to install plugins.
set(ZEEK_PLUGIN_DIR "@ZEEK_PLUGIN_DIR@"
CACHE PATH "Internal Zeek variable: the directory for installing Zeek plugins." FORCE)
# Allows scripts to locate files in the Zeek install tree. # Allows scripts to locate files in the Zeek install tree.
set(ZEEK_CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@" set(ZEEK_CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
CACHE PATH "Internal Zeek variable: CMAKE_INSTALL_PREFIX of Zeek." FORCE) CACHE PATH "Internal Zeek variable: CMAKE_INSTALL_PREFIX of Zeek." FORCE)

6
src/ZeekPluginConfig.cmake.in
View file

@ -11,6 +11,12 @@ if ( NOT ZEEK_PLUGIN_SCRIPTS_PATH )
CACHE PATH "Path to utility shell scripts." FORCE) CACHE PATH "Path to utility shell scripts." FORCE)
endif () endif ()
# Path for installing plugins.
if ( NOT ZEEK_PLUGIN_DIR )
set(ZEEK_PLUGIN_DIR "@ZEEK_PLUGIN_DIR@"
CACHE STRING "Installation path for plugins" FORCE)
endif ()
# For finding Zeek sources. # For finding Zeek sources.
if ( NOT ZEEK_SOURCE_DIR ) if ( NOT ZEEK_SOURCE_DIR )
set(ZEEK_SOURCE_DIR "@ZEEK_SOURCE_DIR@" set(ZEEK_SOURCE_DIR "@ZEEK_SOURCE_DIR@"