This is an automated email from the ASF dual-hosted git repository. fgerlits pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 4e08a9426635ed0a70c79bd70907a9b235b8ce15 Author: Martin Zink <[email protected]> AuthorDate: Fri Aug 25 15:45:02 2023 +0200 MINIFICPP-2198 Correctly mark GPS Extension as unavailable on Windows Also: mark Kubernetes extension as Linux only in README.md Signed-off-by: Ferenc Gerlits <[email protected]> This closes #1645 --- README.md | 58 +++++++++++++++++++++---------------------- Windows.md | 1 - extensions/gps/CMakeLists.txt | 2 +- win_build_vs.bat | 3 +-- 4 files changed, 31 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index a10391a55..eeffe9cda 100644 --- a/README.md +++ b/README.md @@ -72,35 +72,35 @@ The next table outlines CMAKE flags that correspond with MiNiFi extensions. Exte Through JNI extensions you can run NiFi processors using NARs. The JNI extension set allows you to run these Java processors. MiNiFi C++ will favor C++ implementations over Java implements. In the case where a processor is implemented in either language, the one in C++ will be selected; however, will remain transparent to the consumer. -| Extension Set | Processors and Controller Services [...] -|----------------------------------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- [...] -| Archive Extensions | [ApplyTemplate](PROCESSORS.md#applytemplate)<br/>[BinFiles](PROCESSORS.md#binfiles)<br/>[CompressContent](PROCESSORS.md#compresscontent)<br/>[ManipulateArchive](PROCESSORS.md#manipulatearchive)<br/>[MergeContent](PROCESSORS.md#mergecontent)<br/>[FocusArchiveEntry](PROCESSORS.md#focusarchiveentry)<br/>[UnfocusArchiveEntry](PROCESSORS.md#unfocusarchiveentry) [...] -| AWS | [AWSCredentialsService](CONTROLLERS.md#awscredentialsservice)<br/>[PutS3Object](PROCESSORS.md#puts3object)<br/>[DeleteS3Object](PROCESSORS.md#deletes3object)<br/>[FetchS3Object](PROCESSORS.md#fetchs3object)<br/>[ListS3](PROCESSORS.md#lists3) [...] -| Azure | [AzureStorageCredentialsService](CONTROLLERS.md#azurestoragecredentialsservice)<br/>[PutAzureBlobStorage](PROCESSORS.md#putazureblobstorage)<br/>[DeleteAzureBlobStorage](PROCESSORS.md#deleteazureblobstorage)<br/>[FetchAzureBlobStorage](PROCESSORS.md#fetchazureblobstorage)<br/>[ListAzureBlobStorage](PROCESSORS.md#listazureblobstorage)<br/>[PutAzureDataLakeStorage](PROCESSORS.md#putazuredatalakestorage)<br/>[DeleteAzureDataLakeStorage](PROCESSORS.md#del [...] -| CivetWeb | [ListenHTTP](PROCESSORS.md#listenhttp) [...] -| CURL | [InvokeHTTP](PROCESSORS.md#invokehttp) [...] -| Elasticsearch | [ElasticsearchCredentialsControllerService](CONTROLLERS.md#elasticsearchcredentialscontrollerservice)<br/>[PostElasticsearch](PROCESSORS.md#postelasticsearch) [...] -| GPS | [GetGPS](PROCESSORS.md#getgps) [...] -| Google Cloud Platform | [DeleteGCSObject](PROCESSORS.md#deletegcsobject)<br>[FetchGCSObject](PROCESSORS.md#fetchgcsobject)<br>[GCPCredentialsControllerService](CONTROLLERS.md#gcpcredentialscontrollerservice)<br>[ListGCSBucket](PROCESSORS.md#listgcsbucket)<br>[PutGCSObject](PROCESSORS.md#putgcsobject) [...] -| Kafka | [PublishKafka](PROCESSORS.md#publishkafka)<br>[ConsumeKafka](PROCESSORS.md#consumekafka) [...] -| Kubernetes | [KubernetesControllerService](CONTROLLERS.md#kubernetescontrollerservice) [...] -| JNI | **NiFi Processors** [...] -| Lua Scripting | [ExecuteScript](PROCESSORS.md#executescript) [...] -| MQTT | [ConsumeMQTT](PROCESSORS.md#consumemqtt)<br/>[PublishMQTT](PROCESSORS.md#publishmqtt) [...] -| OPC | [FetchOPCProcessor](PROCESSORS.md#fetchopcprocessor)<br/>[PutOPCProcessor](PROCESSORS.md#putopcprocessor) [...] -| OpenCV | [CaptureRTSPFrame](PROCESSORS.md#capturertspframe)<br/>[MotionDetector](PROCESSORS.md#motiondetector) [...] -| OpenWSMAN | SourceInitiatedSubscriptionListener [...] -| PCAP | [CapturePacket](PROCESSORS.md#capturepacket) [...] -| PDH (Windows only) | [PerformanceDataMonitor](PROCESSORS.md#performancedatamonitor) [...] -| ProcFs (Linux only) | [ProcFsMonitor](PROCESSORS.md#procfsmonitor) [...] -| Python Scripting | [ExecuteScript](PROCESSORS.md#executescript)<br>[ExecutePythonProcessor](PROCESSORS.md#executepythonprocessor)<br/>**Custom Python Processors** [...] -| Sensors | GetEnvironmentalSensors<br/>GetMovementSensors [...] -| SFTP | [FetchSFTP](PROCESSORS.md#fetchsftp)<br/>[ListSFTP](PROCESSORS.md#listsftp)<br/>[PutSFTP](PROCESSORS.md#putsftp) [...] -| SQL | [ExecuteSQL](PROCESSORS.md#executesql)<br/>[PutSQL](PROCESSORS.md#putsql)<br/>[QueryDatabaseTable](PROCESSORS.md#querydatabasetable)<br/> [...] -| Splunk | [PutSplunkHTTP](PROCESSORS.md#putsplunkhttp)<br/>[QuerySplunkIndexingStatus](PROCESSORS.md#querysplunkindexingstatus) [...] -| Systemd | [ConsumeJournald](PROCESSORS.md#consumejournald) [...] -| USB Camera | [GetUSBCamera](PROCESSORS.md#getusbcamera) [...] -| Windows Event Log (Windows only) | [CollectorInitiatedSubscription](PROCESSORS.md#collectorinitiatedsubscription)<br/>[ConsumeWindowsEventLog](PROCESSORS.md#consumewindowseventlog)<br/>[TailEventLog](PROCESSORS.md#taileventlog) [...] +| Extension Set | Processors and Controller Services [...] +|-----------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- [...] +| Archive Extensions | [ApplyTemplate](PROCESSORS.md#applytemplate)<br/>[BinFiles](PROCESSORS.md#binfiles)<br/>[CompressContent](PROCESSORS.md#compresscontent)<br/>[ManipulateArchive](PROCESSORS.md#manipulatearchive)<br/>[MergeContent](PROCESSORS.md#mergecontent)<br/>[FocusArchiveEntry](PROCESSORS.md#focusarchiveentry)<br/>[UnfocusArchiveEntry](PROCESSORS.md#unfocusarchiveentry) [...] +| AWS | [AWSCredentialsService](CONTROLLERS.md#awscredentialsservice)<br/>[PutS3Object](PROCESSORS.md#puts3object)<br/>[DeleteS3Object](PROCESSORS.md#deletes3object)<br/>[FetchS3Object](PROCESSORS.md#fetchs3object)<br/>[ListS3](PROCESSORS.md#lists3) [...] +| Azure | [AzureStorageCredentialsService](CONTROLLERS.md#azurestoragecredentialsservice)<br/>[PutAzureBlobStorage](PROCESSORS.md#putazureblobstorage)<br/>[DeleteAzureBlobStorage](PROCESSORS.md#deleteazureblobstorage)<br/>[FetchAzureBlobStorage](PROCESSORS.md#fetchazureblobstorage)<br/>[ListAzureBlobStorage](PROCESSORS.md#listazureblobstorage)<br/>[PutAzureDataLakeStorage](PROCESSORS.md#putazuredatalakestorage)<br/>[DeleteAzureDataLakeStorage](PROCESSORS.md#deleteaz [...] +| CivetWeb | [ListenHTTP](PROCESSORS.md#listenhttp) [...] +| CURL | [InvokeHTTP](PROCESSORS.md#invokehttp) [...] +| Elasticsearch | [ElasticsearchCredentialsControllerService](CONTROLLERS.md#elasticsearchcredentialscontrollerservice)<br/>[PostElasticsearch](PROCESSORS.md#postelasticsearch) [...] +| GPS (Linux and macOS) | [GetGPS](PROCESSORS.md#getgps) [...] +| Google Cloud Platform | [DeleteGCSObject](PROCESSORS.md#deletegcsobject)<br>[FetchGCSObject](PROCESSORS.md#fetchgcsobject)<br>[GCPCredentialsControllerService](CONTROLLERS.md#gcpcredentialscontrollerservice)<br>[ListGCSBucket](PROCESSORS.md#listgcsbucket)<br>[PutGCSObject](PROCESSORS.md#putgcsobject) [...] +| Kafka | [PublishKafka](PROCESSORS.md#publishkafka)<br>[ConsumeKafka](PROCESSORS.md#consumekafka) [...] +| Kubernetes (Linux) | [KubernetesControllerService](CONTROLLERS.md#kubernetescontrollerservice) [...] +| JNI | **NiFi Processors** [...] +| Lua Scripting | [ExecuteScript](PROCESSORS.md#executescript) [...] +| MQTT | [ConsumeMQTT](PROCESSORS.md#consumemqtt)<br/>[PublishMQTT](PROCESSORS.md#publishmqtt) [...] +| OPC | [FetchOPCProcessor](PROCESSORS.md#fetchopcprocessor)<br/>[PutOPCProcessor](PROCESSORS.md#putopcprocessor) [...] +| OpenCV | [CaptureRTSPFrame](PROCESSORS.md#capturertspframe)<br/>[MotionDetector](PROCESSORS.md#motiondetector) [...] +| OpenWSMAN | SourceInitiatedSubscriptionListener [...] +| PCAP | [CapturePacket](PROCESSORS.md#capturepacket) [...] +| PDH (Windows) | [PerformanceDataMonitor](PROCESSORS.md#performancedatamonitor) [...] +| ProcFs (Linux) | [ProcFsMonitor](PROCESSORS.md#procfsmonitor) [...] +| Python Scripting | [ExecuteScript](PROCESSORS.md#executescript)<br>[ExecutePythonProcessor](PROCESSORS.md#executepythonprocessor)<br/>**Custom Python Processors** [...] +| Sensors | GetEnvironmentalSensors<br/>GetMovementSensors [...] +| SFTP | [FetchSFTP](PROCESSORS.md#fetchsftp)<br/>[ListSFTP](PROCESSORS.md#listsftp)<br/>[PutSFTP](PROCESSORS.md#putsftp) [...] +| SQL | [ExecuteSQL](PROCESSORS.md#executesql)<br/>[PutSQL](PROCESSORS.md#putsql)<br/>[QueryDatabaseTable](PROCESSORS.md#querydatabasetable)<br/> [...] +| Splunk | [PutSplunkHTTP](PROCESSORS.md#putsplunkhttp)<br/>[QuerySplunkIndexingStatus](PROCESSORS.md#querysplunkindexingstatus) [...] +| Systemd (Linux) | [ConsumeJournald](PROCESSORS.md#consumejournald) [...] +| USB Camera | [GetUSBCamera](PROCESSORS.md#getusbcamera) [...] +| Windows Event Log (Windows) | [CollectorInitiatedSubscription](PROCESSORS.md#collectorinitiatedsubscription)<br/>[ConsumeWindowsEventLog](PROCESSORS.md#consumewindowseventlog)<br/>[TailEventLog](PROCESSORS.md#taileventlog) [...] Please see our [Python guide](extensions/script/README.md) on how to write Python processors and use them within MiNiFi C++. diff --git a/Windows.md b/Windows.md index 412b8daa3..3502594ff 100644 --- a/Windows.md +++ b/Windows.md @@ -71,7 +71,6 @@ After the build directory it will take optional parameters modifying the CMake c | /Z | Enables Azure extension | | /MQTT | Enables MQTT extension | | /N | Enables Nanofi | -| /GPS | Enables GPS extension | | /LUA_SCRIPTING | Enables Lua scripting extension | | /PYTHON_SCRIPTING | Enables Python scripting extension | | /SENSORS | Enables the Sensors package | diff --git a/extensions/gps/CMakeLists.txt b/extensions/gps/CMakeLists.txt index 033efcb32..03be15211 100644 --- a/extensions/gps/CMakeLists.txt +++ b/extensions/gps/CMakeLists.txt @@ -17,7 +17,7 @@ # under the License. # -if (NOT (ENABLE_ALL OR ENABLE_GPS)) +if (WIN32 OR NOT (ENABLE_ALL OR ENABLE_GPS)) return() endif() diff --git a/win_build_vs.bat b/win_build_vs.bat index 734cfd2bc..c4d98c810 100755 --- a/win_build_vs.bat +++ b/win_build_vs.bat @@ -83,7 +83,6 @@ for %%x in (%*) do ( if [%%~x] EQU [/BUSTACHE] set enable_bustache=ON if [%%~x] EQU [/COAP] set enable_coap=ON if [%%~x] EQU [/ENCRYPT_CONFIG] set enable_encrypt_config=ON - if [%%~x] EQU [/GPS] set enable_gps=ON if [%%~x] EQU [/LUA_SCRIPTING] set enable_lua_scripting=ON if [%%~x] EQU [/MQTT] set enable_mqtt=ON if [%%~x] EQU [/OPC] set enable_opc=ON @@ -118,7 +117,7 @@ cmake -G %generator% %build_platform_cmd% -DINSTALLER_MERGE_MODULES=%installer_m -DCMAKE_BUILD_TYPE_INIT=%cmake_build_type% -DCMAKE_BUILD_TYPE=%cmake_build_type% -DWIN32=WIN32 -DENABLE_LIBRDKAFKA=%build_kafka% -DENABLE_JNI=%build_jni% -DOPENSSL_OFF=OFF ^ -DENABLE_COAP=%build_coap% -DENABLE_AWS=%build_AWS% -DENABLE_PDH=%build_PDH% -DENABLE_AZURE=%build_azure% -DENABLE_SFTP=%build_SFTP% -DENABLE_SPLUNK=%build_SPLUNK% -DENABLE_GCP=%build_GCP% ^ -DENABLE_NANOFI=%build_nanofi% -DENABLE_OPENCV=%build_opencv% -DENABLE_PROMETHEUS=%build_prometheus% -DENABLE_ELASTICSEARCH=%build_ELASTIC% -DUSE_SHARED_LIBS=OFF -DENABLE_CONTROLLER=OFF ^ - -DENABLE_BUSTACHE=%enable_bustache% -DENABLE_COAP=%enable_coap% -DENABLE_ENCRYPT_CONFIG=%enable_encrypt_config% -DENABLE_GPS=%enable_gps% -DENABLE_LUA_SCRIPTING=%enable_lua_scripting% ^ + -DENABLE_BUSTACHE=%enable_bustache% -DENABLE_COAP=%enable_coap% -DENABLE_ENCRYPT_CONFIG=%enable_encrypt_config% -DENABLE_LUA_SCRIPTING=%enable_lua_scripting% ^ -DENABLE_MQTT=%enable_mqtt% -DENABLE_OPC=%enable_opc% -DENABLE_OPENWSMAN=%enable_openwsman% -DENABLE_OPS=%enable_ops% -DENABLE_PCAP=%enable_pcap% ^ -DENABLE_PYTHON_SCRIPTING=%enable_python_scripting% -DENABLE_SENSORS=%enable_sensors% -DENABLE_USB_CAMERA=%enable_usb_camera% ^ -DBUILD_ROCKSDB=ON -DFORCE_WINDOWS=ON -DUSE_SYSTEM_UUID=OFF -DDISABLE_LIBARCHIVE=OFF -DENABLE_WEL=ON -DFAIL_ON_WARNINGS=OFF -DSKIP_TESTS=%skiptests% ^
