Prepare the MeVisLab thirdparty libraries for the 4.0.2 release

Author: mrbean-bremen

README.md

@@ -21,6 +21,7 @@ Note that on POSIX platforms the Python 3 executable is called `python3`, while
 Additionally, under POSIX, `pip3` is not installed per default, while under Windows it is installed with Python as `pip`. 
 To be compatible with Windows _(yes, that's the wrong way around - blame MS!)_, we currently need the `python` and `pip` symlinks point to `python3` and `pip3` _(or better `python3 -m pip`)_ respectively.  Everything else may work, but has not been tested.
 
+
 Note also that on current Windows versions [Microsoft hijacks](https://docs.microsoft.com/en-us/windows/python/faqs#why-does-running-pythonexe-open-the-microsoft-store) the `python` and `python3` executables.
 
 
@@ -47,42 +48,8 @@ conan create -s build_type=Debug .
 conan create -s build_type=Release .
 ```
 
-If you have the `conan-config` package installed (MeVisLab internal only, see README.md in the main MeVisLab directory), you can instead use:
-```
-cd recipes/<recipe_name>
-conan tp:build .
-```
-to build both the debug and release packages.
-
-
 To fetch the package sources (includes applying patches):
 ```
 cd recipes/<recipe_name>
 conan source .
 ```
-
-
-## Jenkins Integration
-
-### Pipeline Description
-There are mainly two Jenkins files that control the build of all thirdparty libraries and tools: `Jenkinsfile` and `JenkinsfileLibrary` (both in the repository root). The first file parses `build_configuration.yml` and triggers the sequential build of all tiers, starting with tier0. For further details see the chapter _Build Configuration_.
-
-The conan package system is written in a way that it checks if the package itself or one of its dependencies has been changed since the last successful build. If nothing has changed, then the build and archiving step is skipped.
-Since even this check takes a certain amount of time, an additional optimization has been implemented. All changed files are collected since the last successful build of the complete thirdparty/branch build. And only those directly affected projects and the tiers below are triggered to be rebuild. This shortens the build time enormously. If one of the files `Jenkinsfile`, `JenkinsfileLibrary`, or `build_configuration.yml` is part of any changeset, then this optimization is skipped and all tiers with all projects are build.
-
-### Build Configuration
-The build configuration is described in the `build_configuration.yml` file, which references all the libraries and tools needed to build MeVisLab.
-Organizing the dependencies can be very tedious and cumbersome, especially when attempting to describe the smallest possible dependency graph.
-To simplify this, dependencies are broken down into different tiers, with the content of each tier organized according to the dependencies of the individual libraries and tools.
-For instance, if library A depends on another library B, then B must be referenced in one of the upper tiers (e.g. a tier with a lower number).
-
-The build of each library and tool for all specified platforms and build types must finish within a defined time frame. There is a default timeout that is used for all packages.
-However, if a certain package requires significantly more time, there is the possibility to define a timeout exception.
-
-These are the parameters that are defined in the file:
-
-| Parameter | Description |
-| --------- | ------------|
-| timeout_default: | Default time in minutes for all packages not specified otherwise |
-| timeout_exception: | A map of all packages with their individual timeouts |
-| tiers: | An ordered list of all tiers, starting with tier0 |

recipes/7zip/conanfile.py

@@ -3,14 +3,15 @@
 from conan.tools.layout import basic_layout
 from conan.tools.microsoft import NMakeToolchain
 from conans.errors import ConanInvalidConfiguration
+import os
 
 required_conan_version = ">=2.2.2"
 
 
 class ConanRecipe(ConanFile):
     name = "7zip"
-    version = "24.06"
-    license = ("LGPL-2.1-or-later", "BSD-3-Clause")
+    version = "24.08"
+    license = "LGPL-2.1-or-later AND BSD-3-Clause"
     homepage = "https://www.7-zip.org"
     description = "7-Zip is a file archiver with a high compression ratio"
     settings = "os", "arch", "compiler", "build_type"
@@ -39,7 +40,7 @@ def source(self):
         version = "".join(self.version.split("."))
         get(
             self,
-            sha256="2aa1660c773525b2ed84d6cd7ff0680c786ec0893b87e4db44654dcb7f5ac8b5",
+            sha256="aa04aac906a04df59e7301f4c69e9f48808e6c8ecae4eb697703a47bfb0ac042",
             url=f"https://sourceforge.net/projects/sevenzip/files/7-Zip/{self.version}/7z{version}-src.tar.xz",
         )
 
@@ -48,17 +49,29 @@ def generate(self):
         tc.generate()
 
     def build(self):
-        make_file = self.source_path / "CPP" / "Build.mak"
-        make_file.chmod(0o644)
+        make_file = os.path.join(self.source_folder, "CPP", "Build.mak")
+        os.chmod(make_file, 0o644)
         replace_in_file(self, make_file, "-MT", f"-{self.settings.compiler.runtime}")
         replace_in_file(self, make_file, "-MD", f"-{self.settings.compiler.runtime}")
-        self.run(f"nmake /f makefile PLATFORM=x64", cwd=self.source_path / "CPP" / "7zip")
+        self.run(f"nmake /f makefile PLATFORM=x64", cwd=os.path.join(self.source_folder, "CPP", "7zip"))
 
     def package(self):
-        copy(self, "License.txt", dst=self.package_path / "licenses", src=self.source_path / "DOC")
-        copy(self, "unRarLicense.txt", dst=self.package_path / "licenses", src=self.source_path / "DOC")
-        copy(self, "*/7z.exe", dst=self.package_path / "bin", src=self.source_path / "CPP" / "7zip", keep_path=False)
-        copy(self, "*/7z.dll", dst=self.package_path / "bin", src=self.source_path / "CPP" / "7zip", keep_path=False)
+        copy(self, "License.txt", dst=os.path.join(self.package_folder, "licenses"), src=os.path.join(self.source_folder, "DOC"))
+        copy(self, "unRarLicense.txt", dst=os.path.join(self.package_folder, "licenses"), src=os.path.join(self.source_folder, "DOC"))
+        copy(
+            self,
+            "*/7z.exe",
+            dst=os.path.join(self.package_folder, "bin"),
+            src=os.path.join(self.source_folder, "CPP", "7zip"),
+            keep_path=False,
+        )
+        copy(
+            self,
+            "*/7z.dll",
+            dst=os.path.join(self.package_folder, "bin"),
+            src=os.path.join(self.source_folder, "CPP", "7zip"),
+            keep_path=False,
+        )
 
     def package_info(self):
         self.cpp_info.includedirs.clear()

recipes/abseil/conanfile.py

@@ -8,7 +8,7 @@
 
 class ConanRecipe(ConanFile):
     name = "abseil"
-    version = "20240116.2"
+    version = "20240722.0"
     homepage = "https://abseil.io"
     description = "Collection of C++ libraries from Google"
     license = "Apache-2.0"
@@ -24,7 +24,7 @@ def layout(self):
     def source(self):
         get(
             self,
-            sha256="733726b8c3a6d39a4120d7e45ea8b41a434cdacde401cba500f14236c49b39dc",
+            sha256="f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3",
             url=f"https://github.com/abseil/abseil-cpp/archive/refs/tags/{self.version}.tar.gz",
             strip_root=True,
         )
@@ -45,10 +45,10 @@ def build(self):
         cmake.build()
 
     def package(self):
-        copy(self, pattern="LICENSE", src=self.source_path, dst=self.package_path / "licenses")
+        copy(self, pattern="LICENSE", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))
         cmake = CMake(self)
         cmake.install()
-        rmdir(self, self.package_path / "lib" / "pkgconfig")
+        rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))
 
     def package_info(self):
         self.cpp_info.builddirs.append(os.path.join("lib", "cmake"))

recipes/assimp/conanfile.py

@@ -2,13 +2,14 @@
 from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
 from conan.tools.files import patch, collect_libs, copy, get, rmdir
 from conan.tools.microsoft import is_msvc
+import os
 
 required_conan_version = ">=2.2.2"
 
 
 class ConanRecipe(ConanFile):
     name = "assimp"
-    version = "5.4.1"
+    version = "5.4.2"
     homepage = "https://www.assimp.org"
     description = "library to import and export various 3d-model-formats including scene-post-processing to generate missing render data"
     license = "BSD-3-Clause"
@@ -25,7 +26,7 @@ def requirements(self):
     def source(self):
         get(
             self,
-            sha256="08837ee7c50b98ca72d2c9e66510ca6640681db8800aa2d3b1fcd61ccc615113",
+            sha256="03e38d123f6bf19a48658d197fd09c9a69db88c076b56a476ab2da9f5eb87dcc",
             url=f"https://github.com/assimp/assimp/archive/v{self.version}.zip",
             strip_root=True,
         )
@@ -65,12 +66,12 @@ def build(self):
         cmake.build()
 
     def package(self):
-        copy(self, "LICENSE", src=self.source_path, dst=self.package_path / "licenses")
-        copy(self, "*.pdb", src=self.build_path / "bin", dst=self.package_path / "bin", keep_path=False)
+        copy(self, "LICENSE", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))
+        copy(self, "*.pdb", src=os.path.join(self.build_folder, "bin"), dst=os.path.join(self.package_folder, "bin"), keep_path=False)
         cmake = CMake(self)
         cmake.install()
-        rmdir(self, self.package_path / "lib" / "cmake")
-        rmdir(self, self.package_path / "lib" / "pkgconfig")
+        rmdir(self, os.path.join(self.package_folder, "lib", "cmake"))
+        rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))
 
     def package_info(self):
         self.cpp_info.set_property("cmake_file_name", "assimp")

recipes/c-blosc/conanfile.py

@@ -1,3 +1,4 @@
+import os
 from conan import ConanFile
 from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
 from conan.tools.files import copy, get, rmdir, collect_libs
@@ -7,7 +8,7 @@
 
 class ConanRecipe(ConanFile):
     name = "c-blosc"
-    version = "1.21.5"
+    version = "1.21.6"
     homepage = "https://www.blosc.org"
     description = "An extremely fast, multi-threaded, meta-compressor library"
     license = "BSD-3-Clause"
@@ -30,7 +31,7 @@ def requirements(self):
 
     def source(self):
         get(self,
-            sha256="32e61961bbf81ffea6ff30e9d70fca36c86178afd3e3cfa13376adec8c687509",
+            sha256="9fcd60301aae28f97f1301b735f966cc19e7c49b6b4321b839b4579a0c156f38",
             url=f"https://github.com/Blosc/c-blosc/archive/refs/tags/v{self.version}.tar.gz",
             strip_root=True
         )
@@ -87,11 +88,11 @@ def build(self):
         cmake.build()
 
     def package(self):
-        copy(self, "LICENSE.txt", src=self.source_path, dst=self.package_path / "licenses")
-        copy(self, "*.pdb", src=self.build_path, dst=self.package_path / "bin", keep_path=False, excludes="*vc???.pdb")
+        copy(self, "LICENSE.txt", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))
+        copy(self, "*.pdb", src=self.build_folder, dst=os.path.join(self.package_folder, "bin"), keep_path=False, excludes="*vc???.pdb")
         cmake = CMake(self)
         cmake.install()
-        rmdir(self, self.package_path / "lib" / "pkgconfig")
+        rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))
 
     def package_info(self):
         self.cpp_info.set_property("pkg_config_name", "blosc")

recipes/conan_generator/conanfile.py

@@ -104,20 +104,47 @@ def __init__(self, conanfile):
         self.conanfile = conanfile
 
     def _get_licenses_of_dependency(self, dependency):
-        # support several licenses:
+    
+        def partition_all(s: str, separators: tuple[str]):
+            if separators:
+                before, sep, after = s.partition(separators[0])
+                if sep:
+                    # separator occurred in sub-string, also separate strings left and right of it
+                    return partition_all(before, separators[1:]) + [sep] + partition_all(after, separators)
+                else:
+                    # separator didn't occur, try next separator
+                    return partition_all(s, separators[1:])
+            elif s:
+                return [s]
+            else:
+                return []
+    
+        separators = (" ", "(", ")")
+        non_parts = separators + ("AND", "OR")
         licenses = dependency.license
-        if not isinstance(licenses, (list, tuple)):
-            licenses = [licenses]
+        if isinstance(licenses, (list, tuple)):
+            # support license lists:
+            license_list = licenses
+            licenses = " AND ".join(licenses)
+        else:
+            # split potential SPDX license expression
+            license_list = partition_all(licenses, separators)
         license_names = []
-        for license_id in licenses:
+        for license_id in license_list:
+            if license_id in non_parts:
+                # license_names.append(license_id)  # should we retain the license expression???
+                continue
             lic = spdx_licenses.get(license_id.lower(), other_licenses.get(license_id.lower()))
-            if not lic:
-                self.conanfile.output.info("\n\n")
-                self.conanfile.output.error(f"Invalid license: '{license_id}'")
-                self.conanfile.output.info("Please use a SPDX license identifier (https://spdx.org/licenses/).")
-            else:
+            if lic:
                 license_names.append(lic['name'])
-        return licenses, license_names
+            else:
+                # use license id unchanged
+                license_names.append(license_id)
+                if not license_id.lower().startswith("licenseref-"):
+                    self.conanfile.output.info("\n\n")
+                    self.conanfile.output.error(f"Invalid license: '{license_id}' in {dependency.ref.name}")
+                    self.conanfile.output.info("Please use a SPDX license identifier (https://spdx.org/licenses/).")
+        return licenses, ", ".join(license_names)
 
 
 class ThirdPartyInformationDeps(_ThirdPartyInformationBase):
@@ -140,8 +167,8 @@ def generate(self, package_id="MeVis/ThirdParty"):
                 "id": pkg_name.lower(),
                 "name": get_display_name(dependency),
                 "version": str(dependency.ref.version),
-                "license": ", ".join(licenses),
-                "license_name": ", ".join(license_names),
+                "license": licenses,
+                "license_name": license_names,
                 "homepage": dependency.homepage,
                 "description": dependency.description,
                 # TODO MeVisLab shows all licenses anyway.
@@ -236,7 +263,7 @@ def get_content(self):
                 "cpp_info": dependency.cpp_info,
                 "name": get_display_name(dependency),
                 "version": str(dependency.ref.version),
-                "license": ", ".join(licenses),
+                "license": licenses,
                 "public_sdk_only": public_sdk_only,
                 "description": dependency.description,
                 "homepage": dependency.homepage,