apigear-io · dorotaphanSiili · Oct 17, 2024 · Oct 18, 2024 · Oct 26, 2024 · Nov 18, 2024
diff --git a/docs/docs/features/conan.md b/docs/docs/features/conan.md
@@ -8,6 +8,9 @@ import helloWorldModuleComponent from '!!raw-loader!./data/helloworld.module.yam
 
 With this feature you we generate a conan support for your project. It helps with packaging and to managing dependencies for different platforms, OSs, compilers, architecture, cross-builds. Read more about conan and its all benefits [here](https://conan.io/).
 
+::tip::
+Make sure your conan profile has all the required settings set to desired values e.g. the cpp standard set to 17.
+:::
 
 ### File overview for module
 

diff --git a/goldenmaster/apigear/CMakeLists.txt b/goldenmaster/apigear/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(apigear)
 
 set(CMAKE_CXX_STANDARD 17)

diff --git a/goldenmaster/apigear/olink/CMakeLists.txt b/goldenmaster/apigear/olink/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(poco-olink)
 
 set(CMAKE_CXX_STANDARD 17)

diff --git a/goldenmaster/apigear/olink/tests/CMakeLists.txt b/goldenmaster/apigear/olink/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(test_poco_olink)
 
 set(SPDLOG_DEBUG_ON true)

diff --git a/goldenmaster/apigear/utilities/CMakeLists.txt b/goldenmaster/apigear/utilities/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(utilities)
 
 set(CMAKE_CXX_STANDARD 17)

diff --git a/goldenmaster/apigear/utilities/tests/CMakeLists.txt b/goldenmaster/apigear/utilities/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(test_apigear_utilities)
 
 set(SPDLOG_DEBUG_ON true)

diff --git a/goldenmaster/examples/app/CMakeLists.txt b/goldenmaster/examples/app/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(App)
 
 # append local binary directory for conan packages to be found

diff --git a/goldenmaster/examples/appthreadsafe/CMakeLists.txt b/goldenmaster/examples/appthreadsafe/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(AppThreadSafe)
 
 # append local binary directory for conan packages to be found

diff --git a/goldenmaster/examples/mqttclient/CMakeLists.txt b/goldenmaster/examples/mqttclient/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(MQTTClient)
 
 # append local binary directory for conan packages to be found

diff --git a/goldenmaster/examples/mqttserver/CMakeLists.txt b/goldenmaster/examples/mqttserver/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(MQTTServer)
 
 # append local binary directory for conan packages to be found

diff --git a/goldenmaster/examples/olinkclient/CMakeLists.txt b/goldenmaster/examples/olinkclient/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(OLinkClient)
 
 # append local binary directory for conan packages to be found

diff --git a/goldenmaster/examples/olinkserver/CMakeLists.txt b/goldenmaster/examples/olinkserver/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(OLinkServer)
 
 # append local binary directory for conan packages to be found

diff --git a/goldenmaster/modules/counter/CMakeLists.txt b/goldenmaster/modules/counter/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(counter)
 
 # needed to access CMAKE_INSTALL_LIBDIR

diff --git a/goldenmaster/modules/counter/conan/test_package/CMakeLists.txt b/goldenmaster/modules/counter/conan/test_package/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(Testcounter)
 include(CTest)
 find_package(counter CONFIG REQUIRED)

diff --git a/goldenmaster/modules/custom_types/CMakeLists.txt b/goldenmaster/modules/custom_types/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(custom_types)
 
 # needed to access CMAKE_INSTALL_LIBDIR

diff --git a/goldenmaster/modules/custom_types/conan/test_package/CMakeLists.txt b/goldenmaster/modules/custom_types/conan/test_package/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(Testcustom_types)
 include(CTest)
 find_package(custom_types CONFIG REQUIRED)

diff --git a/goldenmaster/modules/extern_types/CMakeLists.txt b/goldenmaster/modules/extern_types/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(extern_types)
 
 # needed to access CMAKE_INSTALL_LIBDIR

diff --git a/goldenmaster/modules/extern_types/conan/test_package/CMakeLists.txt b/goldenmaster/modules/extern_types/conan/test_package/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(Testextern_types)
 include(CTest)
 find_package(extern_types CONFIG REQUIRED)

diff --git a/goldenmaster/modules/tb_enum/CMakeLists.txt b/goldenmaster/modules/tb_enum/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(tb_enum)
 
 # needed to access CMAKE_INSTALL_LIBDIR

diff --git a/goldenmaster/modules/tb_enum/conan/test_package/CMakeLists.txt b/goldenmaster/modules/tb_enum/conan/test_package/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(Testtb_enum)
 include(CTest)
 find_package(tb_enum CONFIG REQUIRED)

diff --git a/goldenmaster/modules/tb_names/CMakeLists.txt b/goldenmaster/modules/tb_names/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(tb_names)
 
 # needed to access CMAKE_INSTALL_LIBDIR

diff --git a/goldenmaster/modules/tb_names/conan/test_package/CMakeLists.txt b/goldenmaster/modules/tb_names/conan/test_package/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(Testtb_names)
 include(CTest)
 find_package(tb_names CONFIG REQUIRED)

diff --git a/goldenmaster/modules/tb_same1/CMakeLists.txt b/goldenmaster/modules/tb_same1/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(tb_same1)
 
 # needed to access CMAKE_INSTALL_LIBDIR

diff --git a/goldenmaster/modules/tb_same1/conan/test_package/CMakeLists.txt b/goldenmaster/modules/tb_same1/conan/test_package/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(Testtb_same1)
 include(CTest)
 find_package(tb_same1 CONFIG REQUIRED)

diff --git a/goldenmaster/modules/tb_same2/CMakeLists.txt b/goldenmaster/modules/tb_same2/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(tb_same2)
 
 # needed to access CMAKE_INSTALL_LIBDIR

diff --git a/goldenmaster/modules/tb_same2/conan/test_package/CMakeLists.txt b/goldenmaster/modules/tb_same2/conan/test_package/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(Testtb_same2)
 include(CTest)
 find_package(tb_same2 CONFIG REQUIRED)

diff --git a/goldenmaster/modules/tb_simple/CMakeLists.txt b/goldenmaster/modules/tb_simple/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(tb_simple)
 
 # needed to access CMAKE_INSTALL_LIBDIR

diff --git a/goldenmaster/modules/tb_simple/conan/test_package/CMakeLists.txt b/goldenmaster/modules/tb_simple/conan/test_package/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(Testtb_simple)
 include(CTest)
 find_package(tb_simple CONFIG REQUIRED)

diff --git a/goldenmaster/modules/testbed1/CMakeLists.txt b/goldenmaster/modules/testbed1/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(testbed1)
 
 # needed to access CMAKE_INSTALL_LIBDIR

diff --git a/goldenmaster/modules/testbed1/conan/test_package/CMakeLists.txt b/goldenmaster/modules/testbed1/conan/test_package/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(Testtestbed1)
 include(CTest)
 find_package(testbed1 CONFIG REQUIRED)

diff --git a/goldenmaster/modules/testbed2/CMakeLists.txt b/goldenmaster/modules/testbed2/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(testbed2)
 
 # needed to access CMAKE_INSTALL_LIBDIR

diff --git a/goldenmaster/modules/testbed2/conan/test_package/CMakeLists.txt b/goldenmaster/modules/testbed2/conan/test_package/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(Testtestbed2)
 include(CTest)
 find_package(testbed2 CONFIG REQUIRED)

diff --git a/rules.yaml b/rules.yaml
@@ -152,6 +152,53 @@ features:
           target: "{{lower (camel .Interface.Name)}}client.h"
         - source: "module/generated/mqtt/mqttclient.cpp.tpl"
           target: "{{lower (camel .Interface.Name)}}client.cpp"
+  - name: nats
+    requires:
+      - api
+      - core
+      - apigear
+    scopes:
+    - match: module
+      documents:
+        - source: "apigear/nats/CMakeLists.txt"
+          raw: true
+        - source: "apigear/nats/natstypes.h"
+          raw: true
+        - source: "apigear/nats/private/natscwrapper.cpp"
+          raw: true
+        - source: "apigear/nats/private/natscwrapper.h"
+          raw: true
+        - source: "apigear/nats/natsbase.cpp"
+          raw: true
+        - source: "apigear/nats/natsbase.h"
+          raw: true
+        - source: "apigear/nats/natsclient.cpp"
+          raw: true
+        - source: "apigear/nats/natsclient.h"
+          raw: true
+        - source: "apigear/nats/natsservice.cpp"
+          raw: true
+        - source: "apigear/nats/natsservice.h"
+          raw: true
+        - source: "apigear/nats/baseadapter.cpp"
+          raw: true
+        - source: "apigear/nats/baseadapter.h"
+          raw: true
+        - source: "apigear/nats/natscommon.h"
+          raw: true
+        - source: "module/generated/nats/CMakeLists.txt.tpl"
+          target: "modules/{{snake .Module.Name}}/generated/nats/CMakeLists.txt"
+    - match: interface
+      prefix: "modules/{{snake .Module.Name}}/generated/nats/"
+      documents:
+        - source: "module/generated/nats/natsservice.h.tpl"
+          target: "{{lower (camel .Interface.Name)}}service.h"
+        - source: "module/generated/nats/natsservice.cpp.tpl"
+          target: "{{lower (camel .Interface.Name)}}service.cpp"
+        - source: "module/generated/nats/natsclient.h.tpl"
+          target: "{{lower (camel .Interface.Name)}}client.h"
+        - source: "module/generated/nats/natsclient.cpp.tpl"
+          target: "{{lower (camel .Interface.Name)}}client.cpp"
   - name: apigear
     scopes:
     - match: system
@@ -164,6 +211,8 @@ features:
           raw: true
         - source: "apigear/utilities/threadpool.h"
           raw: true
+        - source: "apigear/utilities/single_pub.hpp"
+          raw: true
         - source: "apigear/utilities/CMakeLists.txt"
           raw: true
         - source: "apigear/utilities/tests/CMakeLists.txt"

diff --git a/templates/CMakeLists.txt.tpl b/templates/CMakeLists.txt.tpl
@@ -91,6 +91,9 @@ if(NOT apigear_FOUND)
 {{- end }}
 {{- if $.Features.mqtt }}
   set(APIGEAR_BUILD_WITH_MQTT ON CACHE INTERNAL "Enable support for MQTT")
+{{- end }}
+{{- if $.Features.nats }}
+  set(APIGEAR_BUILD_WITH_NATS ON CACHE INTERNAL "Enable support for Nats")
 {{- end }}
   FetchContent_Declare(apigear
     SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/apigear"
@@ -127,3 +130,7 @@ add_subdirectory(examples/olinkclient)
 add_subdirectory(examples/mqttserver)
 add_subdirectory(examples/mqttclient)
 {{- end }}
+{{- if .Features.examples_nats }}
+add_subdirectory(examples/natsserver)
+add_subdirectory(examples/natsclient)
+{{- end }}
diff --git a/templates/apigear/ApigearConfig.cmake.in b/templates/apigear/ApigearConfig.cmake.in
@@ -4,6 +4,7 @@ set(APIGEAR_VERSION 3.7.0)
 set(APIGEAR_BUILD_WITH_OLINK @APIGEAR_BUILD_WITH_OLINK@)
 set(APIGEAR_BUILD_WITH_MONITOR @APIGEAR_BUILD_WITH_MONITOR@)
 set(APIGEAR_BUILD_WITH_MQTT @APIGEAR_BUILD_WITH_MQTT@)
+set(APIGEAR_BUILD_WITH_NATS @APIGEAR_BUILD_WITH_NATS@)
 
 # make sure we have all needed dependencies
 include(CMakeFindDependencyMacro)
@@ -18,7 +19,10 @@ find_dependency(eclipse-paho-mqtt-c COMPONENTS paho-mqtt3as-static REQUIRED)
 # needed for paho-c, should be forwarded implicitly but is not
 find_dependency(OpenSSL REQUIRED)
 endif()
-if(APIGEAR_BUILD_WITH_OLINK OR APIGEAR_BUILD_WITH_MONITOR OR APIGEAR_BUILD_WITH_MQTT)
+if(APIGEAR_BUILD_WITH_NATS)
+find_dependency(cnats COMPONENTS nats_static REQUIRED)
+endif()
+if(APIGEAR_BUILD_WITH_OLINK OR APIGEAR_BUILD_WITH_MONITOR OR APIGEAR_BUILD_WITH_MQTT OR APIGEAR_BUILD_WITH_NATS)
 find_dependency(nlohmann_json REQUIRED)
 endif()
 
@@ -32,6 +36,9 @@ endif()
 if(APIGEAR_BUILD_WITH_MQTT)
 INCLUDE("${CMAKE_CURRENT_LIST_DIR}/ApiGearPahoMQTTTargets.cmake")
 endif()
+if(APIGEAR_BUILD_WITH_NATS)
+INCLUDE("${CMAKE_CURRENT_LIST_DIR}/ApiGearNatsTargets.cmake")
+endif()
 
 check_required_components(utilities)
 if(APIGEAR_BUILD_WITH_MONITOR)
@@ -43,3 +50,6 @@ endif()
 if(APIGEAR_BUILD_WITH_MQTT)
 check_required_components(paho-mqtt)
 endif()
+if(APIGEAR_BUILD_WITH_NATS)
+check_required_components(nats)
+endif()
diff --git a/templates/apigear/CMakeLists.txt b/templates/apigear/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.24)
 project(apigear)
 
 set(CMAKE_CXX_STANDARD 17)
@@ -16,6 +16,7 @@ option(BUILD_TESTING "Enable this option to build the test targets" OFF)
 option(APIGEAR_BUILD_WITH_OLINK "Enables the build of the OLINK backend" OFF)
 option(APIGEAR_BUILD_WITH_MONITOR "Enables the build of the monitoring support library" OFF)
 option(APIGEAR_BUILD_WITH_MQTT "Enables the build of the MQTT backend" OFF)
+option(APIGEAR_BUILD_WITH_NATS "Enables the build of the nats backend" OFF)
 # this options is only here for the conan build until there is a conan based solution for objectlink-core
 option(APIGEAR_FETCH_OLINKCORE "Fetch and build objectlink-core, if not pre-installed" OFF)
 
@@ -60,11 +61,16 @@ add_subdirectory(mqtt)
 list(APPEND apigear_COMPONENTS "mqtt")
 endif()
 
+if(APIGEAR_BUILD_WITH_NATS)
+add_subdirectory(nats)
+list(APPEND apigear_COMPONENTS "nats")
+endif()
+
 include(CMakePackageConfigHelpers)
 configure_package_config_file(ApigearConfig.cmake.in
   ${CMAKE_CURRENT_BINARY_DIR}/apigearConfig.cmake
   INSTALL_DESTINATION ${InstallDir}
-  PATH_VARS APIGEAR_BUILD_WITH_MONITOR APIGEAR_BUILD_WITH_OLINK APIGEAR_BUILD_WITH_MQTT)
+  PATH_VARS APIGEAR_BUILD_WITH_MONITOR APIGEAR_BUILD_WITH_OLINK APIGEAR_BUILD_WITH_MQTT APIGEAR_BUILD_WITH_NATS)
 write_basic_package_version_file(
   ${CMAKE_CURRENT_BINARY_DIR}/apigearConfigVersion.cmake
   VERSION 3.7.0
-Original file line number
+Diff line change
@@ Expand Up @@
     With this feature you we generate a conan support for your project. It helps with packaging and to managing dependencies for different platforms, OSs, compilers, architecture, cross-builds. Read more about conan and its all benefits [here](https://conan.io/).
+    ::tip::
+    Make sure your conan profile has all the required settings set to desired values e.g. the cpp standard set to 17.
+    :::
     ### File overview for module
@@ Expand Down @@