Updated mruby to 3.4

Author: wsobel

agent_lib/CMakeLists.txt

@@ -465,10 +465,13 @@ target_clangtidy_setup(agent_lib)
 
 include(../cmake/document.cmake)
 if (AGENT_WITH_DOCS AND DOXYGEN_FOUND)
+  message(WARNING ": Setting up to create documentation")
   file(GLOB _tests ${CMAKE_CURRENT_SOURCE_DIR}/../test_package/*.hpp ${CMAKE_CURRENT_SOURCE_DIR}/../test_package/*.cpp)
   doxygen_add_docs(docs README.md ${AGENT_SOURCES} ${_tests}
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/.." )
-  install(DIRECTORY "${PROJECT_BINARY_DIR}/Documentation/" DESTINATION "Documentation")  
+  install(DIRECTORY "${PROJECT_BINARY_DIR}/Documentation/" DESTINATION "Documentation")
+else()
+    message(WARNING ": Documentation will not be created")
 endif()
 
 target_sources(agent_lib PUBLIC FILE_SET headers

conan/mruby/conanfile.py

@@ -14,7 +14,7 @@
 
 class MRubyConan(ConanFile):
     name = "mruby"
-    version = "3.2.0"
+    version = "3.4.0"
     license = "https://github.com/mruby/mruby/blob/master/LICENSE"
     author = "Yukihiro “Matz” Matsumoto"
     homepage = "https://mruby.org/"
@@ -37,7 +37,7 @@ class MRubyConan(ConanFile):
     _ruby_version_dir = "ruby-{}.{}.0".format(_major, _minor)
 
     def source(self):
-        get(self, "https://github.com/mruby/mruby/archive/refs/tags/3.2.0.zip", strip_root=True, destination=self.source_folder)
+        get(self, "https://github.com/mruby/mruby/archive/refs/tags/3.4.0.zip", strip_root=True, destination=self.source_folder)
         get(self, "https://github.com/mattn/mruby-onig-regexp/archive/refs/heads/master.zip",
             strip_root=True, destination=os.path.join(self.source_folder, 'mrbgems', 'mruby-onig-regexp'))
 

conanfile.py

@@ -9,7 +9,7 @@
 
 class MTConnectAgentConan(ConanFile):
     name = "mtconnect_agent"
-    version = "2.6"
+    version = "2.7"
     url = "https://github.com/mtconnect/cppagent.git"
     license = "Apache License 2.0"
     settings = "os", "compiler", "arch", "build_type"
@@ -93,14 +93,13 @@ def tool_requires_version(self, package, version):
         buf = io.StringIO()
         command = f"{package} --version"
         res = self.run(command, shell=True, stdout=buf)
+        self.output.info(f"Command: '{command}' returned {res}")
         ver = [0, 0, 0]
         if res == 0:
             text = buf.getvalue()
             self.output.debug(f"{command} returned:\n{text}")
             ver = [int(d) for d in re.search(r"\d+\.\d+\.\d+", text).group(0).split('.')]
             self.output.info(f"Version of {package} is {ver}")
-        else:
-            self.output.info(f"Command: '{command}' returned {res}")
 
         if ver < version:
             ver_text = '.'.join([str(x) for x in version])
@@ -112,7 +111,7 @@ def tool_requires_version(self, package, version):
     def build_requirements(self):
         self.tool_requires_version("cmake", [3, 26, 4])
         if self.options.with_docs:
-            self.tool_requires_version("doxygen", [1, 15, 0])
+            self.tool_requires_version("doxygen", [1, 16, 0])
 
     def requirements(self):
         self.requires("boost/1.88.0", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
@@ -125,7 +124,7 @@ def requirements(self):
         self.requires("bzip2/1.0.8", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
 
         if self.options.with_ruby:
-            self.requires("mruby/3.2.0", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
+            self.requires("mruby/3.4.0", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
 
         self.requires("gtest/1.17.0", headers=True, libs=True, transitive_headers=True, transitive_libs=True, test=True)