Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-12 03:28:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/timw/fix-windows-build'

Browse source 
* origin/topic/timw/fix-windows-build:
  Fix linking of zeek_build_info on Windows
  CI: Enable Windows builds for PRs
  Call python explicitly from cmake for collecting repo info on Windows
  Rework zeek-inet-ntop snprintf return value handling
This commit is contained in:
Tim Wojtulewicz 2023-02-15 11:12:28 -07:00
commit 5ec72a7698
6 changed files with 32 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.cirrus.yml
View file

@ -391,7 +391,6 @@ windows_task:
# Give verbose error output on a test failure. # Give verbose error output on a test failure.
CTEST_OUTPUT_ON_FAILURE: 1 CTEST_OUTPUT_ON_FAILURE: 1
<< : *BRANCH_WHITELIST << : *BRANCH_WHITELIST
<< : *SKIP_TASK_ON_PR
# Container images # Container images

10
CHANGES
View file

@ -1,3 +1,13 @@
6.0.0-dev.52 | 2023-02-15 11:12:28 -0700
* Fix linking of zeek_build_info on Windows (Tim Wojtulewicz)
* CI: Enable Windows builds for PRs (Tim Wojtulewicz)
* Call python explicitly from cmake for collecting repo info on Windows (Tim Wojtulewicz)
* Rework zeek-inet-ntop snprintf return value handling (Tim Wojtulewicz)
6.0.0-dev.47 | 2023-02-15 19:10:35 +0100 6.0.0-dev.47 | 2023-02-15 19:10:35 +0100
* zeek-setup: Ensure telemetry_mgr is created before other managers (Arne Welzel, Corelight) * zeek-setup: Ensure telemetry_mgr is created before other managers (Arne Welzel, Corelight)

12
CMakeLists.txt
View file

@ -860,11 +860,23 @@ endforeach()
######################################################################## ########################################################################
## Populate the ZEEK_BUILD_INFO for use in src/version.c.in ## Populate the ZEEK_BUILD_INFO for use in src/version.c.in
if ( WIN32 )
# Windows installs Python to C:\Python311\python, but doesn't create a version
# or symlink to python3. Call python with the script directly since the shebang
# in the script won't work here.
execute_process(COMMAND "python" "${PROJECT_SOURCE_DIR}/ci/collect-repo-info.py" "${ZEEK_INCLUDE_PLUGINS}"
WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
OUTPUT_VARIABLE ZEEK_BUILD_INFO
RESULT_VARIABLE ZEEK_BUILD_INFO_RESULT
OUTPUT_STRIP_TRAILING_WHITESPACE)
else()
execute_process(COMMAND "${PROJECT_SOURCE_DIR}/ci/collect-repo-info.py" "${ZEEK_INCLUDE_PLUGINS}" execute_process(COMMAND "${PROJECT_SOURCE_DIR}/ci/collect-repo-info.py" "${ZEEK_INCLUDE_PLUGINS}"
WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
OUTPUT_VARIABLE ZEEK_BUILD_INFO OUTPUT_VARIABLE ZEEK_BUILD_INFO
RESULT_VARIABLE ZEEK_BUILD_INFO_RESULT RESULT_VARIABLE ZEEK_BUILD_INFO_RESULT
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
endif()
if ( NOT ZEEK_BUILD_INFO_RESULT EQUAL "0" ) if ( NOT ZEEK_BUILD_INFO_RESULT EQUAL "0" )
message(FATAL_ERROR "Could not collect repository info") message(FATAL_ERROR "Could not collect repository info")

2
VERSION
View file

@ -1 +1 @@
6.0.0-dev.47 6.0.0-dev.52

2
src/3rdparty

@ -1 +1 @@
Subproject commit 104714d6bd0a23d35397997875ed6a506ecd4b22 Subproject commit 58e63b262e542895024c821e791214008604cd55

8
src/zeek-setup.cc
View file

@ -202,12 +202,8 @@ std::shared_ptr<zeek::detail::SampleLogger> zeek::detail::sample_logger;
zeek::detail::FragmentManager* zeek::detail::fragment_mgr = nullptr; zeek::detail::FragmentManager* zeek::detail::fragment_mgr = nullptr;
int signal_val = 0; int signal_val = 0;
#ifdef _MSC_VER extern "C" char version[];
char version[] = VERSION; extern "C" const char zeek_build_info[];
#else
extern char version[];
#endif
extern const char zeek_build_info[];
const char* zeek::detail::command_line_policy = nullptr; const char* zeek::detail::command_line_policy = nullptr;
vector<string> zeek::detail::params; vector<string> zeek::detail::params;