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/vern/gen-zam-multi-files'

Browse source 
* origin/topic/vern/gen-zam-multi-files:
  enable ZAM operation specifications to reside in multiple files (not yet used)
This commit is contained in:
Tim Wojtulewicz 2024-05-08 13:09:25 -07:00
commit b2e4fbe58d
6 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
7.0.0-dev.231 | 2024-05-08 13:09:25 -0700
* enable ZAM operation specifications to reside in multiple files (not yet used) (Vern Paxson, Corelight)
7.0.0-dev.229 | 2024-05-08 09:55:01 -0700 7.0.0-dev.229 | 2024-05-08 09:55:01 -0700
* Move packet_analysis::Dispatcher to detail namespace (Tim Wojtulewicz, Corelight) * Move packet_analysis::Dispatcher to detail namespace (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
7.0.0-dev.229 7.0.0-dev.231

2
auxil/gen-zam

@ -1 +1 @@
Subproject commit 5887f1f04f525c4c682eb55aa0c7505574459c74 Subproject commit 376de10133c100948a2875258d11ab97b361467c

2
cmake

@ -1 +1 @@
Subproject commit 1d793368ac4d4b06cb2c9c716e5477dbf3c2a8e3 Subproject commit 925c32db4d6d952ec43fa18a85d8bb70138b9257

5
src/CMakeLists.txt
View file

@ -159,9 +159,10 @@ list(APPEND BINPAC_OUTPUTS "${BINPAC_OUTPUT_CC}")
include(Gen-ZAM) include(Gen-ZAM)
set(GEN_ZAM_SRC ${CMAKE_CURRENT_SOURCE_DIR}/script_opt/ZAM/Ops.in) set(GEN_ZAM_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/script_opt/ZAM/OPs)
set(GEN_ZAM_SRC ${GEN_ZAM_SRC_DIR}/ZAM.op)
gen_zam_target(${GEN_ZAM_SRC}) gen_zam_target(${GEN_ZAM_SRC_DIR})
# ############################################################################## # ##############################################################################
# Including subdirectories. # Including subdirectories.

0
src/script_opt/ZAM/Ops.in → src/script_opt/ZAM/OPs/ZAM.op
View file