Merge pull request #311 from mtconnect/upgrade_boost_to_1_82

Upgrade boost to 1.82 and Dockerfile with tests

Author: wsobel

.github/workflows/build.yml

@@ -29,6 +29,7 @@ on:
 jobs:
   build_windows:
     runs-on: windows-2019
+    name: "Windows 2019 Arch: ${{ matrix.arch }}, Shared: ${{ matrix.shared }}"
     strategy:
       matrix:
         arch: ["x86", "amd64"]
@@ -106,6 +107,7 @@ jobs:
 
   build_linux:
     runs-on: ubuntu-latest
+    name: "Ubuntu Latest, Shared: ${{ matrix.shared }}"
     strategy:
       matrix:
         shared: ["True", "False"]
@@ -147,6 +149,7 @@ jobs:
         
   build_macos:
     runs-on: macos-latest
+    name: "MacOS Latest, Shared: ${{ matrix.shared }}"
     strategy:
       matrix:
         shared: ["True", "False"]

Dockerfile

@@ -14,6 +14,8 @@
 #     --push \
 #     .
 #
+#   To run tests, use `--build-arg WITH_TESTS=true`
+#
 #   # Note: In this case, I would suggest to map port `5000` to `5000`. The user can always change the port according to their needs.
 #   docker run -it --rm --init --name agent -p5001:5000 \
 #     mtconnect/agent:2.0.0.12_RC18
@@ -70,20 +72,25 @@ WORKDIR /root/agent
 # bring in the repo contents, minus .dockerignore files
 COPY . .
 
-# make installer
-RUN conan profile detect \
-  && conan create . \
-    --build=missing \
-    -c "tools.build:jobs=$CONAN_CPU_COUNT" \
-    -c tools.build:skip_test=True \
-    -o agent_prefix=mtc \
-    -o cpack=True \
-    -o "with_ruby=$WITH_RUBY" \
-    -o cpack_destination=/root/agent \
-    -o cpack_name=dist \
-    -o cpack_generator=TGZ \
-    -pr "$CONAN_PROFILE" \
-    -tf ''
+ARG WITH_TESTS=false
+ARG WITH_TESTS_ARG=argument
+
+# Build and optionally test
+RUN if [ -z "$WITH_TESTS" ] || [ "$WITH_TESTS" = "false" ]; \
+      then WITH_TESTS_ARG="--test-folder="; \
+      else WITH_TESTS_ARG=""; fi \
+   && conan profile detect \
+   && conan create . \
+     --build=missing \
+     -c "tools.build:jobs=$CONAN_CPU_COUNT" \
+     -o agent_prefix=mtc \
+     -o cpack=True \
+     -o "with_ruby=$WITH_RUBY" \
+     -o cpack_destination=/root/agent \
+     -o cpack_name=dist \
+     -o cpack_generator=TGZ \
+     -pr "$CONAN_PROFILE" \
+     ${WITH_TESTS_ARG}
 
 # ---------------------------------------------------------------------
 # release

Dockerfile.alpine

@@ -14,6 +14,8 @@
 #     --push \
 #     .
 #
+#   To run tests, use `--build-arg WITH_TESTS=true`
+#
 #   # Note: In this case, I would suggest to map port `5000` to `5000`. The user can always change the port according to their needs.
 #   docker run -it --rm --init --name agent -p5001:5000 \
 #     mtconnect/agent:2.0.0.12_RC18
@@ -69,20 +71,25 @@ WORKDIR /root/agent
 # bring in the repo contents, minus .dockerignore files
 COPY . .
 
-# make installer
-RUN conan profile detect \
-  && conan create . \
-    --build=missing \
-    -c "tools.build:jobs=$CONAN_CPU_COUNT" \
-    -c tools.build:skip_test=True \
-    -o agent_prefix=mtc \
-    -o cpack=True \
-    -o "with_ruby=$WITH_RUBY" \
-    -o cpack_destination=/root/agent \
-    -o cpack_name=dist \
-    -o cpack_generator=TGZ \
-    -pr "$CONAN_PROFILE" \
-    -tf ''
+ARG WITH_TESTS=false
+ARG WITH_TESTS_ARG=argument
+
+# Build and optionally test
+RUN if [ -z "$WITH_TESTS" ] || [ "$WITH_TESTS" = "false" ]; \
+      then WITH_TESTS_ARG="--test-folder="; \
+      else WITH_TESTS_ARG=""; fi \
+   && conan profile detect \
+   && conan create . \
+     --build=missing \
+     -c "tools.build:jobs=$CONAN_CPU_COUNT" \
+     -o agent_prefix=mtc \
+     -o cpack=True \
+     -o "with_ruby=$WITH_RUBY" \
+     -o cpack_destination=/root/agent \
+     -o cpack_name=dist \
+     -o cpack_generator=TGZ \
+     -pr "$CONAN_PROFILE" \
+     ${WITH_TESTS_ARG}
 
 # ---------------------------------------------------------------------
 # release

appveyor.yml

@@ -4,13 +4,13 @@
 
 class MqttcppConan(ConanFile):
     name = "mqtt_cpp"
-    version = "13.1.0"
+    version = "13.2.1"
     license = "Boost Software License, Version 1.0"
     author = "Takatoshi Kondo [email protected]"
     url = "https://github.com/redboltz/mqtt_cpp"
     description = "MQTT client/server for C++14 based on Boost.Asio"
     topics = ("mqtt")
-    requires = ["boost/1.79.0"]
+    requires = ["boost/1.82.0"]
     no_copy_source = True
     exports_sources = "include/*"
 

conan/mqtt_cpp/conanfile.py

@@ -70,7 +70,7 @@ class MTConnectAgentConan(ConanFile):
         "date*:use_system_tz_db": True
         }
 
-    exports_sources = "*"
+    exports_sources = "*", "!build", "!test_package/build"
     exports = "conan/mqtt_cpp/*", "conan/mruby/*"
 
     def validate(self):
@@ -91,14 +91,23 @@ def config_options(self):
         if is_msvc(self):
             self.options.rm_safe("fPIC")                
 
+    def build_requirements(self):
+        self.tool_requires("cmake/3.26.4")
+        
+        if self.options.with_docs:
+            buf = io.StringIO()            
+            res = self.run(["doxygen --version"], shell=True, stdout=buf)
+            if (res != 0 or not buf.getvalue().startswith('1.9')):
+                self.tool_requires("doxygen/1.9.4")
+
     def requirements(self):
-        self.requires("boost/1.79.0", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
+        self.requires("boost/1.82.0", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
         self.requires("libxml2/2.10.3", headers=True, libs=True, visible=True, transitive_headers=True, transitive_libs=True)
         self.requires("date/2.4.1", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
         self.requires("nlohmann_json/3.9.1", headers=True, libs=False, transitive_headers=True, transitive_libs=False)
         self.requires("openssl/3.0.8", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
         self.requires("rapidjson/cci.20220822", headers=True, libs=False, transitive_headers=True, transitive_libs=False)
-        self.requires("mqtt_cpp/13.1.0", headers=True, libs=False, transitive_headers=True, transitive_libs=False)
+        self.requires("mqtt_cpp/13.2.1", headers=True, libs=False, transitive_headers=True, transitive_libs=False)
         self.requires("bzip2/1.0.8", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
 
         if self.options.with_ruby:
@@ -164,15 +173,6 @@ def generate(self):
         deps = CMakeDeps(self)
         deps.generate()
 
-    def build_requirements(self):
-        self.tool_requires("cmake/3.26.4")
-        
-        if self.options.with_docs:
-            buf = io.StringIO()            
-            res = self.run(["doxygen --version"], shell=True, stdout=buf)
-            if (res != 0 or not buf.getvalue().startswith('1.9')):
-                self.tool_requires("doxygen/1.9.4")
-
     def build(self):
         cmake = CMake(self)
         cmake.verbose = True

conanfile.py

@@ -20,6 +20,10 @@
 /// @file config.hpp
 /// @brief common includes and cross platform requirements
 
+// TODO: Remove when BOOST fixes its multiple defined symbol issue with phoenix placeholders
+#define BOOST_PHOENIX_STL_TUPLE_H_
+#define BOOST_BIND_NO_PLACEHOLDERS
+
 #include <boost/config.hpp>
 
 #ifndef __STDC_LIMIT_MACROS

src/mtconnect/config.hpp

@@ -351,7 +351,7 @@ namespace mtconnect::configuration {
             using namespace chrono;
             using namespace chrono_literals;
 
-            using boost::placeholders::_1;
+            using std::placeholders::_1;
 
             m_monitorTimer.expires_from_now(100ms);
             m_monitorTimer.async_wait(boost::bind(&AgentConfiguration::monitorFiles, this, _1));
@@ -373,7 +373,7 @@ namespace mtconnect::configuration {
     using namespace chrono;
     using namespace chrono_literals;
 
-    using boost::placeholders::_1;
+    using std::placeholders::_1;
 
     m_monitorTimer.expires_from_now(m_monitorInterval);
     m_monitorTimer.async_wait(boost::bind(&AgentConfiguration::monitorFiles, this, _1));
@@ -610,13 +610,85 @@ namespace mtconnect::configuration {
     // Formatter for the logger
     core->add_sink(m_sink);
   }
+  
+  static std::string ExpandValue(const std::map<std::string, std::string> &values, const std::string &s)
+  {
+    static std::regex pat("\\$(([A-Za-z0-9_]+)|\\{([^}]+)\\})");
+    stringstream out;
+    std::sregex_iterator iter(s.begin(), s.end(), pat);
+    std::sregex_iterator end;
+    std::sregex_iterator::value_type::value_type suf;
+
+    if (iter == end)
+    {
+      return s;
+    }
+
+    while (iter != end)
+    {
+      out << iter->prefix().str();
+      string sym;
+      if ((*iter)[3].matched)
+        sym = (*iter)[3].str();
+      else if ((*iter)[2].matched)
+        sym = (*iter)[2].str();
+
+      // Resolve match text
+      auto opt = values.find(sym);
+      if (opt != values.end())
+      {
+        out << opt->second;
+      }
+      else if (auto env = getenv(sym.c_str()))
+      {
+        out << env;
+      }
+      else
+      {
+        out << iter->str();
+      }
+
+      suf = iter->suffix();
+      iter++;
+    }
+
+    out << suf.str();
+
+    return out.str();
+  }
+
+  static void ExpandValues(std::map<std::string,std::string> values,
+                              boost::property_tree::ptree &node)
+  {
+    if (auto value = node.get_value_optional<std::string>();
+        value->find('$') != std::string::npos)
+    {
+      auto expanded = ExpandValue(values, *value);
+      node.put_value(expanded);
+    }
+    
+    for (auto &block : node)
+    {
+      ExpandValues(values, block.second);
+      const auto &value = block.second.get_value_optional<std::string>();
+      if (value && !value->empty())
+        values[block.first] = *value;
+    }
+  }
+  
+  void AgentConfiguration::expandConfigVariables(boost::property_tree::ptree &config)
+  {
+    std::map<std::string,std::string> values;
+    ExpandValues(values, config);
+  }
+
 
-  void AgentConfiguration::loadConfig(const std::string &file)
+  void AgentConfiguration::loadConfig(const std::string &text)
   {
     NAMED_SCOPE("AgentConfiguration::loadConfig");
 
     // Now get our configuration
-    auto config = Parser::parse(file);
+    auto config = Parser::parse(text);
 
     // if (!m_loggerFile)
     if (!m_sink)