This is an automated email from the ASF dual-hosted git repository. szaszm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 736f660ad089538fcc795d028d36a94bbdd7083e Author: Martin Zink <[email protected]> AuthorDate: Fri Oct 2 17:32:20 2026 +0200 MINIFICPP-2912 Support rust options in win_build_vs.bat Closes #2271 Signed-off-by: Marton Szasz <[email protected]> --- Windows.md | 3 +++ cmake/MiNiFiOptions.cmake | 1 + minifi_rust/CMakeLists.txt | 4 ++++ win_build_vs.bat | 7 +++++++ 4 files changed, 15 insertions(+) diff --git a/Windows.md b/Windows.md index 592f89d0a..5d502c3c5 100644 --- a/Windows.md +++ b/Windows.md @@ -93,6 +93,9 @@ After the build directory it will take optional parameters modifying the CMake c | /NO_ENCRYPT_CONFIG | Disables build of encrypt-config binary | | /SCCACHE | Uses sccache build caching | | /BUSTACHE | Enables Bustache templating support | +| /RUST | Enables the build of rust based extensions. | +| /NO_PGP | Disables the PGP rust extension. | +| /NO_TENSOR | Disables the Tensor rust extension. | | /NO_OPC | Disables OPC extension | | /NO_OPS | Disables OPS extension | | /LOKI | Enables Grafana Loki extension | diff --git a/cmake/MiNiFiOptions.cmake b/cmake/MiNiFiOptions.cmake index dcd3a2b26..893a6c2b0 100644 --- a/cmake/MiNiFiOptions.cmake +++ b/cmake/MiNiFiOptions.cmake @@ -121,6 +121,7 @@ add_minifi_option(ENABLE_LLAMACPP "Enables llama.cpp support." ON) add_minifi_option(ENABLE_OPC "Instructs the build system to enable the OPC extension" ON) add_minifi_option(MINIFI_RUST "Enables the build of rust based extensions." OFF) add_minifi_dependent_option(MINIFI_EXTENSION_PGP "Enables the PGP rust extension." ON "MINIFI_RUST" OFF) +add_minifi_dependent_option(MINIFI_EXTENSION_TENSOR "Enables the Tensor rust extension." ON "MINIFI_RUST" OFF) add_minifi_option(MINIFI_LMDB "Enables the LMDB extension." OFF) set_minifi_cache_variable(CUSTOM_MALLOC OFF "Overwrite malloc implementation.") diff --git a/minifi_rust/CMakeLists.txt b/minifi_rust/CMakeLists.txt index a9f604011..eae2006de 100644 --- a/minifi_rust/CMakeLists.txt +++ b/minifi_rust/CMakeLists.txt @@ -43,6 +43,10 @@ if (NOT MINIFI_EXTENSION_PGP) set_target_properties(cargo-build_minifi_pgp PROPERTIES EXCLUDE_FROM_ALL TRUE) endif() +if (NOT MINIFI_EXTENSION_TENSOR) + set_target_properties(cargo-build_minifi_tensor PROPERTIES EXCLUDE_FROM_ALL TRUE) +endif() + include(CTest) # Build the test binaries during the build diff --git a/win_build_vs.bat b/win_build_vs.bat index a0f729513..45e4b46bc 100644 --- a/win_build_vs.bat +++ b/win_build_vs.bat @@ -45,6 +45,9 @@ set enable_gcp=ON set enable_elastic=ON set enable_grafana_loki=OFF set enable_couchbase=OFF +set enable_rust=OFF +set enable_pgp=ON +set enable_tensor=ON set test_custom_wel_provider=OFF set generator="Visual Studio 17 2022" set cpack=OFF @@ -84,6 +87,9 @@ for %%x in (%*) do ( if [%%~x] EQU [/NO_PYTHON_SCRIPTING] set enable_python_scripting=OFF if [%%~x] EQU [/LOKI] set enable_grafana_loki=ON if [%%~x] EQU [/COUCHBASE] set enable_couchbase=ON + if [%%~x] EQU [/RUST] set enable_rust=ON + if [%%~x] EQU [/NO_PGP] set enable_pgp=OFF + if [%%~x] EQU [/NO_TENSOR] set enable_tensor=OFF if [%%~x] EQU [/32] set build_platform=Win32 if [%%~x] EQU [/D] set cmake_build_type=RelWithDebInfo if [%%~x] EQU [/DD] set cmake_build_type=Debug @@ -114,6 +120,7 @@ cmake -G %generator% %build_platform_cmd% -DMINIFI_INCLUDE_VC_REDIST_MERGE_MODUL -DENABLE_BUSTACHE=%enable_bustache% -DENABLE_ENCRYPT_CONFIG=%enable_encrypt_config% -DENABLE_LUA_SCRIPTING=%enable_lua_scripting% -DENABLE_SMB=%enable_smb% ^ -DENABLE_MQTT=%enable_mqtt% -DENABLE_OPC=%enable_opc% -DENABLE_OPS=%enable_ops% ^ -DENABLE_PYTHON_SCRIPTING=%enable_python_scripting% -DENABLE_GRAFANA_LOKI=%enable_grafana_loki% -DENABLE_COUCHBASE=%enable_couchbase% ^ + -DMINIFI_RUST=%enable_rust% -DMINIFI_EXTENSION_PGP=%enable_pgp% -DMINIFI_EXTENSION_TENSOR=%enable_tensor% ^ -DBUILD_ROCKSDB=ON -DUSE_SYSTEM_UUID=OFF -DENABLE_LIBARCHIVE=ON -DENABLE_WEL=ON -DMINIFI_FAIL_ON_WARNINGS=OFF -DSKIP_TESTS=%skiptests% -DMINIFI_INCLUDE_VC_REDIST_DLLS=%vc_redist% ^ -DMINIFI_PERFORMANCE_TESTS=%performance_tests% ^ %strict_gsl_checks% -DMINIFI_INCLUDE_UCRT_DLLS=%ucrt% %sccache_arg% %EXTRA_CMAKE_ARGUMENTS% "%scriptdir%" && %buildcmd%
