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

GH-1068: Add zeek symlink to allow "zeek/Foo.h" include style

Browse source 
Also changes `zeek-config --include_dir` to now output
`$prefix/include:$prefix/include/zeek` instead of only
`$prefix/include/zeek`
This commit is contained in:
Jon Siwek 2020-07-20 17:54:09 -07:00
parent 8e70ff653f
commit 9642feeaf2
8 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
NEWS
View file

@ -272,6 +272,13 @@ Deprecated Functionality
fields since those are redundant with what's already available in fields since those are redundant with what's already available in
the connection parameter. the connection parameter.
- External plugins should include Zeek header files like
``#include <zeek/Foo.h>`` instead of ``#include <Foo.h>``. The later
style is considered deprecated. Reliance on ``zeek-config --include_dir``
to contain ``$prefix/include/zeek`` is also deprecated: its replacement
output is expected to be just ``$prefix/include``, with it currently
outputting both paths, delimited by a colon, during the deprecation period.
Zeek 3.1.0 Zeek 3.1.0
========== ==========

2
auxil/zeek-aux

@ -1 +1 @@
Subproject commit 919095f2ad3a99fd728eeeaab4b6e8f5fb12d202 Subproject commit 07509a08b62fa6cf1e006689fc9fb89d76adb716

2
cmake

@ -1 +1 @@
Subproject commit 6cb83a5a4a41adb7f7a5cc97661088caaa863180 Subproject commit 8961b95de79fc72bede13550a79489b2542fcdd8

2
doc

@ -1 +1 @@
Subproject commit 9958974168016e84879af38410881022d1f1fd6d Subproject commit 1f5a0a47c558b36ebfc2dec66f02cfafb752c250

1
src/zeek Symbolic link
View file

@ -0,0 +1 @@
.

12
testing/btest/plugins/func-hook-plugin/src/Plugin.cc
View file

@ -1,12 +1,12 @@
#include "Plugin.h" #include "Plugin.h"
#include <Val.h> #include <zeek/Val.h>
#include <Func.h> #include <zeek/Func.h>
#include <Event.h> #include <zeek/Event.h>
#include <Conn.h> #include <zeek/Conn.h>
#include <Desc.h> #include <zeek/Desc.h>
#include <threading/Formatter.h> #include <zeek/threading/Formatter.h>
namespace plugin { namespace Demo_Hooks { Plugin plugin; } } namespace plugin { namespace Demo_Hooks { Plugin plugin; } }

2
testing/btest/plugins/func-hook-plugin/src/Plugin.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <plugin/Plugin.h> #include <zeek/plugin/Plugin.h>
namespace plugin { namespace plugin {
namespace Demo_Hooks { namespace Demo_Hooks {

3
zeek-config.in
View file

@ -9,7 +9,8 @@ plugin_dir=@BRO_PLUGIN_INSTALL_PATH@
config_dir=@ZEEK_ETC_INSTALL_DIR@ config_dir=@ZEEK_ETC_INSTALL_DIR@
python_dir=@PY_MOD_INSTALL_DIR@ python_dir=@PY_MOD_INSTALL_DIR@
cmake_dir=@CMAKE_INSTALL_PREFIX@/share/zeek/cmake cmake_dir=@CMAKE_INSTALL_PREFIX@/share/zeek/cmake
include_dir=@CMAKE_INSTALL_PREFIX@/include/zeek # Remove in v4.1: don't need @prefix@/include/zeek, just @prefix@/include
include_dir=@CMAKE_INSTALL_PREFIX@/include:@CMAKE_INSTALL_PREFIX@/include/zeek
zeekpath=@DEFAULT_ZEEKPATH@ zeekpath=@DEFAULT_ZEEKPATH@
zeek_dist=@ZEEK_DIST@ zeek_dist=@ZEEK_DIST@
binpac_root=@ZEEK_CONFIG_BINPAC_ROOT_DIR@ binpac_root=@ZEEK_CONFIG_BINPAC_ROOT_DIR@