* topic/christian/zeek-lib-fix:
Remove vestigial Conan bit in CMakeLists.txt
When configuring Spicy, be prepated for zeek_lib or zeek_exe targets.
Fix a typo in CMakeLists.txt when building Zeek as a library
This avoids a configuration error where zeek_exe is not defined (i.e. when
building (only) as a library). It anticipates building both the executable and
the library, which we used to do when using Conan but currently don't.
* origin/topic/vern/fine-grained-ZAM-profiling:
tie into updates to gen-zam
ZAM documentation updated to reflect finer-grained profiling
ZAM-specific BTest baseline changes for tweak to how ZAM bodies print
BTest baseline changes for tweak to how ZAM bodies print
ZAM execution changes to support richer profiling
use richer block-aware location information for ZAM instructions
better isolation of ZAM instruction elements hooks for tracking extended ZAM profiling location
framework for --enable-ZAM-profiling configuration profiles go to zprof.log rather than stdout
ZAM classes in support of finer-grained profiling
refined ZAM function profiling to include (correct) statement line number blocks
avoid potentially expensive mallinfo() call if result won't be used
The variant ended up conflicting with std::bind, which resulted in failures
on the btest invoking it. Change back to a single function that takes a
flow, and default it to a value in Exec.
git diff-index by default includes staged and non-staged changes.
The autogen-spicy-docs script copies over spicy-pygments.py from
the Spicy tree into doc/ext.
The job would attempt to commit scripts and script-reference even
though nothing actually is staged when a spurious diff existed in
ext/spicy-pygments.py. Guard from this by using --cached.
The Python docker-compose executable in the docker_builder image is not
functional anymore (TypeError: kwargs_from_env() got an unexpected
keyword argument 'ssl_version').
docker-compose v1 has been sun-setted for quite some time. Do the
minimal to switch to docker compose v2.
We already do have a test that check static builds, but none that tests
the exact same build flags we use for binary builds on OBS. This commit
fixes this oversight.
Related to GH-3647
* origin/topic/vern/script-opt-maint.Mar24:
AST location fixes for -O gen-C++
script optimization support for clearing tables/vectors using "delete"
fix for ZAM printing of instructions that modify slots other than slot 1
fixed bug where appending an empty vector to a vector-of-vector's had no effect
