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

Bring Broccoli back for the time being.

Browse source 
It's deprecated and now disabled by default, but can be reenabled by
configuring with --enable-broccoli.
This commit is contained in:
Robin Sommer 2018-05-16 23:36:36 +00:00
parent fe7e1ee7f0
commit 87552390e5
8 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -4,6 +4,9 @@
[submodule "aux/binpac"]
path = aux/binpac
url = git://git.bro.org/binpac
[submodule "aux/broccoli"]
path = aux/broccoli
url = git://git.bro.org/broccoli
[submodule "aux/broctl"]
path = aux/broctl
url = git://git.bro.org/broctl

11
CHANGES
View file

@ -1,7 +1,14 @@
2.5-573 | 2018-05-16 23:46:35 +0000
2.5-574 | 2018-05-16 23:52:05 +0000
* Support 802.11 monitor mode. (Pierre LALET)
* Switch Bro's communication over to Broker; deprecate the old
communication system, including Broccoli. See NEWS for more.
* Extend switch statement to branch by type of the operand. See NEWS
for more.
* Add new operators "is" and "as" for dynamic type casting and type
checking. See NEWS for more.
2.5-569 | 2018-05-10 11:24:07 -0500

2
CMakeLists.txt
View file

@ -249,6 +249,7 @@ include(CheckOptionalBuildSources)
CheckOptionalBuildSources(aux/broctl Broctl INSTALL_BROCTL)
CheckOptionalBuildSources(aux/bro-aux Bro-Aux INSTALL_AUX_TOOLS)
CheckOptionalBuildSources(aux/broccoli Broccoli INSTALL_BROCCOLI)
########################################################################
## Packaging Setup
@ -288,6 +289,7 @@ message(
"\nCXXFLAGS: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${BuildType}}"
"\nCPP: ${CMAKE_CXX_COMPILER}"
"\n"
"\nBroccoli: ${INSTALL_BROCCOLI}"
"\nBroctl: ${INSTALL_BROCTL}"
"\nAux. Tools: ${INSTALL_AUX_TOOLS}"
"\n"

2
VERSION
View file

@ -1 +1 @@
2.5-573
2.5-574

7
configure vendored
View file

@ -50,6 +50,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
(automatically on when perftools is present on Linux)
--enable-perftools-debug use Google's perftools for debugging
--enable-jemalloc link against jemalloc
--enable-broccoli build or install the Broccoli library (deprecated)
--disable-broctl don't install Broctl
--disable-auxtools don't build or install auxiliary tools
--disable-perftools don't try to build with Google Perftools
@ -66,7 +67,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
--with-flex=PATH path to flex executable
--with-bison=PATH path to bison executable
--with-python=PATH path to Python executable
--with-caf=PATH path to C++ Actor Framework installation
--with-caf=PATH path to C++ Actor Framework installation for using external version
(a required Broker dependency)
Optional Packages in Non-Standard Locations:
@ -133,6 +134,7 @@ append_cache_entry ENABLE_PERFTOOLS_DEBUG BOOL false
append_cache_entry ENABLE_JEMALLOC BOOL false
append_cache_entry BinPAC_SKIP_INSTALL BOOL true
append_cache_entry BUILD_SHARED_LIBS BOOL true
append_cache_entry INSTALL_BROCCOLI BOOL false
append_cache_entry INSTALL_AUX_TOOLS BOOL true
append_cache_entry INSTALL_BROCTL BOOL true
append_cache_entry CPACK_SOURCE_IGNORE_FILES STRING
@ -209,6 +211,9 @@ while [ $# -ne 0 ]; do
--enable-jemalloc)
append_cache_entry ENABLE_JEMALLOC BOOL true
;;
--enable-broccoli)
append_cache_entry INSTALL_BROCCOLI BOOL yes
;;
--disable-broctl)
append_cache_entry INSTALL_BROCTL BOOL false
;;

2
doc/CMakeLists.txt
View file

@ -2,6 +2,8 @@ set(SPHINX_INPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/sphinx_input)
set(SPHINX_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/sphinx_output)
set(BROXYGEN_SCRIPT_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/broxygen_script_output)
set(BROXYGEN_CACHE_DIR ${CMAKE_CURRENT_BINARY_DIR}/broxygen_cache)
set(BROCCOLI_DOCS_SRC ${CMAKE_BINARY_DIR}/aux/broccoli/doc/html)
set(BROCCOLI_DOCS_DST ${CMAKE_BINARY_DIR}/html/broccoli-api)
set(BROKER_DOCS_SRC ${CMAKE_BINARY_DIR}/aux/broker/doc/html)
set(BROKER_DOCS_DST ${CMAKE_BINARY_DIR}/html/broker-manual)

2
src/Stmt.cc
View file

@ -739,7 +739,7 @@ SwitchStmt::SwitchStmt(Expr* index, case_list* arg_cases) :
{
Init();
bool have_exprs = false;
bool have_exprs = false;
bool have_types = false;
loop_over_list(*cases, i)