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

GH-184: add bro-config --build_type, outputs CMake build type

Browse source
This commit is contained in:
Jon Siwek 2018-10-05 14:24:34 -05:00
parent 0dfc79c64d
commit 0f55080625
5 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
2.6-beta2-24 | 2018-10-05 14:24:34 -0500
* GH-184: add `bro-config --build_type`, outputs CMake build type (Jon Siwek, Corelight)
2.6-beta2-22 | 2018-10-04 11:31:48 -0500 2.6-beta2-22 | 2018-10-04 11:31:48 -0500
* Add return value checks for some RPC parsing functions (Jon Siwek, Corelight) * Add return value checks for some RPC parsing functions (Jon Siwek, Corelight)

1
CMakeLists.txt
View file

@ -230,6 +230,7 @@ if ( NOT BINARY_PACKAGING_MODE )
set(BRO_DIST ${CMAKE_SOURCE_DIR}) set(BRO_DIST ${CMAKE_SOURCE_DIR})
endif () endif ()
string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bro-config.h.in configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bro-config.h.in
${CMAKE_CURRENT_BINARY_DIR}/bro-config.h) ${CMAKE_CURRENT_BINARY_DIR}/bro-config.h)
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})

2
VERSION
View file

@ -1 +1 @@
2.6-beta2-22 2.6-beta2-24

2
aux/bro-aux

@ -1 +1 @@
Subproject commit cdc9303cf497ad0b0cbbe3af8f17ec3628953d0b Subproject commit 4aceb3d1ef14d14fae1ee86ae4ba17647293a902

6
bro-config.in
View file

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
version=@VERSION@ version=@VERSION@
build_type=@CMAKE_BUILD_TYPE_LOWER@
prefix=@CMAKE_INSTALL_PREFIX@ prefix=@CMAKE_INSTALL_PREFIX@
script_dir=@BRO_SCRIPT_INSTALL_PATH@ script_dir=@BRO_SCRIPT_INSTALL_PATH@
site_dir=@BRO_SCRIPT_INSTALL_PATH@/site site_dir=@BRO_SCRIPT_INSTALL_PATH@/site
@ -16,7 +17,7 @@ caf_root=@BRO_CONFIG_CAF_ROOT_DIR@
broker_root=@BRO_CONFIG_BROKER_ROOT_DIR@ broker_root=@BRO_CONFIG_BROKER_ROOT_DIR@
usage="\ usage="\
Usage: bro-config [--version] [--prefix] [--script_dir] [--site_dir] [--plugin_dir] [--config_dir] [--python_dir] [--include_dir] [--cmake_dir] [--bropath] [--bro_dist] [--binpac_root] [--caf_root] [--broker_root]" Usage: bro-config [--version] [--build_type] [--prefix] [--script_dir] [--site_dir] [--plugin_dir] [--config_dir] [--python_dir] [--include_dir] [--cmake_dir] [--bropath] [--bro_dist] [--binpac_root] [--caf_root] [--broker_root]"
if [ $# -eq 0 ] ; then if [ $# -eq 0 ] ; then
echo "${usage}" 1>&2 echo "${usage}" 1>&2
@ -36,6 +37,9 @@ while [ $# -ne 0 ]; do
--prefix) --prefix)
echo $prefix echo $prefix
;; ;;
--build_type)
echo $build_type
;;
--script_dir) --script_dir)
echo $script_dir echo $script_dir
;; ;;