(#4442) Update stlab

* uniform syntax

* adds version 1.5.5

* adds new recipe options

* changes requirement logic

* changes configure logic

* adapts package_id for the new options

* new logic for package_info()

* adds 1.5.5 version to sources

* adds the rest of the settings

* removes calls to base class methods

* moves validation code to validate() method

* adds pthread in package_info

* addresses PR comments

* addresses PR comments

* Update recipes/stlab/all/conanfile.py

Co-authored-by: Uilian Ries <uilianries@gmail.com>

Co-authored-by: Uilian Ries <uilianries@gmail.com>

recipes/stlab/all/conandata.yml

@@ -1,7 +1,10 @@
 sources:
+  "1.5.5":
+    url: "https://github.com/stlab/libraries/archive/v1.5.5.tar.gz"
+    sha256: "30ec5a36b4c074feac72a1b9a744f0b279010e18c7bb04bbdc5d44fe9eaf5ad8"
   "1.5.4":
     url: "https://github.com/stlab/libraries/archive/v1.5.4.tar.gz"
     sha256: "87306f58f6614f4a1ca54dda52fedff7e610d3b3dae035829657bac77bc33640"
-  1.5.2:
+  "1.5.2":
     url: https://github.com/stlab/libraries/archive/v1.5.2.tar.gz
     sha256: a82eb013e51d0bb3ee2050f0eda31e11997cb4ca74d2abfdc2c8249c5c67c9fb

recipes/stlab/all/conanfile.py

@@ -11,48 +11,166 @@ class Stlab(ConanFile):
     license = 'BSL-1.0'
     topics = 'conan', 'c++', 'concurrency', 'futures', 'channels'
 
-    settings = 'compiler'
+    settings = "arch", "os", "compiler", "build_type", 
 
     options = {
-        'coroutines': [True, False]
+        "boost_optional": [True, False],
+        "boost_variant": [True, False],
+        "coroutines": [True, False],
+        "task_system": ["portable", "libdispatch", "emscripten", "pnacl", "windows", "auto"],
     }
+
     default_options = {
-        'coroutines': False
+        "boost_optional": False,
+        "boost_variant": False,
+        "coroutines": False,
+        "task_system": "auto",
     }
 
     no_copy_source = True
     _source_subfolder = 'source_subfolder'
 
-    requires = 'boost/1.69.0'
+    def _use_boost(self):
+        return self.options.boost_optional or self.options.boost_variant
+
+    def _requires_libdispatch(self):
+        # On macOS it is not necessary to use the libdispatch conan package, because the library is 
+        # included in the OS.
+        return self.options.task_system == "libdispatch" and self.settings.os != "Macos"
+
+    def requirements(self):
+        if self._use_boost():
+            self.requires("boost/1.75.0")
+
+        if self._requires_libdispatch():
+            self.requires("libdispatch/5.3.2")
 
     def source(self):
         tools.get(**self.conan_data["sources"][self.version])
         extracted_dir = "libraries-" + self.version
         os.rename(extracted_dir, self._source_subfolder)
 
-    def configure(self):
+    def _fix_boost_components(self):
+        if self.settings.os != "Macos": return
+        if self.settings.compiler != "apple-clang": return
+        if Version(self.settings.compiler.version) >= "12": return
+
+        #
+        # On Apple we have to force the usage of boost.variant, because Apple's implementation of C++17 is not complete.
+        #
+        self.output.info("Apple-Clang versions less than 12 do not correctly support std::optional or std::variant, so we will use boost::optional and boost::variant instead.")
+        self.options.boost_optional = True
+        self.options.boost_variant = True
+
+    def _default_task_system(self):
+        if self.settings.os == "Macos": 
+            return "libdispatch"
+
+        if self.settings.os == "Windows":
+            return "windows"
+
+        if self.settings.os == "Emscripten":
+            return "emscripten"
+
+        return "portable"
+
+    def _validate_task_system_libdispatch(self):
+        if self.settings.os == "Linux":
+            if self.settings.compiler != "clang":
+                raise ConanInvalidConfiguration("{}/{} task_system=libdispatch needs Clang compiler when using OS: {}. Use Clang compiler or switch to task_system=portable or task_system=auto".format(self.name, self.version, self.settings.os))
+        elif self.settings.os != "Macos":
+            raise ConanInvalidConfiguration("{}/{} task_system=libdispatch is not supported on {}. Try using task_system=auto".format(self.name, self.version, self.settings.os))
+
+    def _validate_task_system_windows(self):
+        if self.settings.os != "Windows":
+            self.output.info("Libdispatch is not supported on {}. The task system is changed to {}.".format(self.settings.os, self.options.task_system))
+            raise ConanInvalidConfiguration("{}/{} task_system=windows is not supported on {}. Try using task_system=auto".format(self.name, self.version, self.settings.os))
+
+    def _validate_task_system_emscripten(self):
+        if self.settings.os != "Emscripten":
+            raise ConanInvalidConfiguration("{}/{} task_system=emscripten is not supported on {}. Try using task_system=auto".format(self.name, self.version, self.settings.os))
+
+    def _validate_task_system(self):
+        if self.options.task_system == "libdispatch":
+            self._validate_task_system_libdispatch()
+        elif self.options.task_system == "windows":
+            self._validate_task_system_windows()
+        elif self.options.task_system == "emscripten":
+            self._validate_task_system_emscripten()
+
+    def _validate_boost_components(self):
+        if self.settings.os != "Macos": return
+        if self.settings.compiler != "apple-clang": return
+        if Version(self.settings.compiler.version) >= "12": return
+        if self.options.boost_optional and self.options.boost_variant: return
+        #
+        # On Apple we have to force the usage of boost.variant, because Apple's implementation of C++17 
+        # is not complete.
+        #
+        msg = "Apple-Clang versions less than 12 do not correctly support std::optional or std::variant, so we will use boost::optional and boost::variant instead. "
+        if not self.options.boost_optional and not self.options.boost_variant:
+            msg += "Try -o boost_optional=True -o boost_variant=True"
+        elif not self.options.boost_optional:
+            msg += "Try -o boost_optional=True."
+        else:
+            msg += "Try -o boost_variant=True."
+
+        raise ConanInvalidConfiguration(msg)
+
+    def validate(self):
         if self.settings.compiler.get_safe("cppstd"):
             tools.check_min_cppstd(self, '17')
 
         if self.settings.compiler == "gcc" and Version(self.settings.compiler.version) < "9":
-            raise ConanInvalidConfiguration("Need gcc >= 9")
+            raise ConanInvalidConfiguration("Need GCC >= 9")
 
         if self.settings.compiler == "clang" and Version(self.settings.compiler.version) < "8":
-            raise ConanInvalidConfiguration("Need clang >= 8")
+            raise ConanInvalidConfiguration("Need Clang >= 8")
 
         if self.settings.compiler == "Visual Studio" and Version(self.settings.compiler.version) < "15.8":
             raise ConanInvalidConfiguration("Need Visual Studio >= 2017 15.8 (MSVC 19.15)")
 
+        self._validate_task_system()
+        self._validate_boost_components()
+
+    def configure(self):
+        if self.options.task_system == "auto":
+            self.options.task_system = self._default_task_system()
+        self.output.info("Stlab Task System: {}.".format(self.options.task_system))
+
     def package(self):
         self.copy("*LICENSE", dst="licenses", keep_path=False)
         self.copy("stlab/*", src=self._source_subfolder, dst='include/')
 
     def package_id(self):
         self.info.header_only()
+        self.info.options.boost_optional = "ANY"
+        self.info.options.boost_variant = "ANY"
 
     def package_info(self):
         coroutines_value = 1 if self.options.coroutines else 0
 
         self.cpp_info.defines = [
             'STLAB_FUTURE_COROUTINES={}'.format(coroutines_value)
         ]
+
+        if self.options.boost_optional:
+            self.cpp_info.defines.append("STLAB_FORCE_BOOST_OPTIONAL")
+
+        if self.options.boost_variant:
+            self.cpp_info.defines.append("STLAB_FORCE_BOOST_VARIANT")
+
+        if self.options.task_system == "portable":
+            self.cpp_info.defines.append("STLAB_FORCE_TASK_SYSTEM_PORTABLE")
+        elif self.options.task_system == "libdispatch":
+            self.cpp_info.defines.append("STLAB_FORCE_TASK_SYSTEM_LIBDISPATCH")
+        elif self.options.task_system == "emscripten":
+            self.cpp_info.defines.append("STLAB_FORCE_TASK_SYSTEM_EMSRIPTEN")  #Note: there is a typo in Stlab Cmake.
+            self.cpp_info.defines.append("STLAB_FORCE_TASK_SYSTEM_EMSCRIPTEN") #Note: for typo fix in later versions
+        elif self.options.task_system == "pnacl":
+            self.cpp_info.defines.append("STLAB_FORCE_TASK_SYSTEM_PNACL")
+        elif self.options.task_system == "windows":
+            self.cpp_info.defines.append("STLAB_FORCE_TASK_SYSTEM_WINDOWS")
+
+        if self.settings.os == "Linux":
+            self.cpp_info.system_libs = ["pthread"]

recipes/stlab/config.yml

@@ -1,5 +1,7 @@
 versions:
+  "1.5.5":
+    folder: all
   "1.5.4":
     folder: all
-  1.5.2:
+  "1.5.2":
     folder: all