jolt 0.9.440__tar.gz → 0.9.445__tar.gz

{jolt-0.9.440 → jolt-0.9.445}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jolt
-Version: 0.9.440
+Version: 0.9.445
 Summary: A task executor
 Home-page: https://github.com/srand/jolt
 Author: Robert Andersson
@@ -33,6 +33,7 @@ Requires-Dist: SecretStorage==3.3.3
 Requires-Dist: allure-python-commons==2.13.5
 Requires-Dist: attrs==24.2.0
 Requires-Dist: backports.tarfile==1.2.0
+Requires-Dist: blake3==1.0.8
 Requires-Dist: bottle==0.12.25
 Requires-Dist: brotli==1.2.0
 Requires-Dist: bz2file==0.98

{jolt-0.9.440 → jolt-0.9.445}/jolt/graph.py

@@ -139,9 +139,9 @@ class TaskProxy(object):
             if c.is_workspace_resource():
                 c.task.acquire_ws()
 
-        sha = hashlib.sha1()
-        HashInfluenceRegistry.get().apply_all(self.task, sha)
-        self.task.identity = sha.hexdigest()
+        hash = utils.hashfn()
+        HashInfluenceRegistry.get().apply_all(self.task, hash)
+        self.task.identity = hash.hexdigest()
 
         return str(self.task.identity)
 

{jolt-0.9.440 → jolt-0.9.445}/jolt/influence.py

@@ -1,5 +1,4 @@
 import datetime
-import hashlib
 import os
 from pathlib import Path, PurePath
 
@@ -158,17 +157,17 @@ class TaskSourceInfluence(HashInfluenceProvider):
         else:
             funcs = []
 
-        # Calculate sha1 sum for all functions
-        shasum = hashlib.sha1()
+        # Calculate hash sum for all functions
+        sum = ""
         for func in funcs:
             try:
                 func.__influence
             except AttributeError:
-                func.__influence = utils.sha1(inspection.getfuncsource(func))
+                func.__influence = utils.hashstring(inspection.getfuncsource(func))
             finally:
-                shasum.update(func.__influence.encode())
+                sum += func.__influence
 
-        return shasum.hexdigest() + ": " + funcname
+        return utils.hashstring(sum) + ": " + funcname
 
 
 def source(name, obj=None):
@@ -271,7 +270,7 @@ class TaskClassSourceInfluence(HashInfluenceProvider):
     name = "Source"
 
     def get_influence(self, task):
-        # Calculate sha1 sum for classes in hierarchy
+        # Calculate hash sum for classes in hierarchy
         result = ""
         for cls in reversed(task.__class__.mro()):
             if cls is object:
@@ -280,7 +279,7 @@ class TaskClassSourceInfluence(HashInfluenceProvider):
                 cls.__dict__["_TaskClassSourceInfluence__influence"]
             except KeyError:
                 try:
-                    cls.__influence = utils.sha1(inspection.getclasssource(cls))
+                    cls.__influence = utils.hashstring(inspection.getclasssource(cls))
                 except TypeError:
                     continue
             result += cls.__dict__["_TaskClassSourceInfluence__influence"] + \
@@ -529,7 +528,7 @@ class FileInfluence(HashInfluenceProvider):
         self._files = {}
 
     def get_file_influence(self, path):
-        return utils.filesha1(str(path))
+        return utils.hashfile(str(path))
 
     def get_filelist(self, task):
         try:

{jolt-0.9.440 → jolt-0.9.445}/jolt/loader.py

@@ -462,7 +462,7 @@ def export_workspace(tasks=None) -> common_pb.Workspace:
         with tools.cwd(loader.workspace_path):
             cwd = tools.getcwd()
             cachedir = config.get_cachedir()
-            indexhash = utils.sha1(cwd)
+            indexhash = utils.hashstring(cwd)
             indexfile = tools.expand_path(
                 "{cachedir}/indexes/{}/{}",
                 indexhash[:2], indexhash[2:],

{jolt-0.9.440 → jolt-0.9.445}/jolt/pkgs/abseil.py

@@ -27,17 +27,21 @@ class Abseil(cmake.CMake):
         if self.system == "windows":
             artifact.cxxinfo.msvcrt = "Dynamic"
         artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
-        if self.shared:
-            artifact.environ.LD_LIBRARY_PATH.append("lib")
 
-        with tools.cwd(artifact.path, "lib"):
-            for libfile in tools.glob("*.lib"):
-                libname, _ = os.path.splitext(libfile)
-                artifact.cxxinfo.libraries.append(libname)
-            for libfile in tools.glob("lib*.a"):
-                libname, _ = os.path.splitext(libfile)
-                artifact.cxxinfo.libraries.append(libname[3:])
+        with tools.cwd(artifact.path):
+            for libdir in ["lib", "lib32", "lib64"]:
+                if not tools.exists(libdir):
+                    continue
+                with tools.cwd(libdir):
+                    artifact.cxxinfo.libpaths.append(libdir)
+                    if self.shared:
+                        artifact.environ.LD_LIBRARY_PATH.append(libdir)
+                    for libfile in tools.glob("*.lib"):
+                        libname, _ = os.path.splitext(libfile)
+                        artifact.cxxinfo.libraries.append(libname)
+                    for libfile in tools.glob("lib*.a"):
+                        libname, _ = os.path.splitext(libfile)
+                        artifact.cxxinfo.libraries.append(libname[3:])
 
 
 TaskRegistry.get().add_task_class(Abseil)

jolt-0.9.445/jolt/pkgs/blake3.py

@@ -0,0 +1,15 @@
+from jolt import attributes, Parameter
+from jolt.plugins import cmake, git
+from jolt.tasks import TaskRegistry
+
+
+@attributes.requires("requires_git")
+@cmake.requires()
+class Blake3(cmake.CMake):
+    name = "blake3"
+    version = Parameter("1.8.3", help="blake3 version.")
+    requires_git = ["git:url=https://github.com/BLAKE3-team/BLAKE3.git,rev={version}"]
+    srcdir = "{git[BLAKE3]}/c"
+
+
+TaskRegistry.get().add_task_class(Blake3)

{jolt-0.9.440 → jolt-0.9.445}/jolt/pkgs/boost.py

@@ -95,17 +95,21 @@ class Boost(Task):
         with tools.cwd(self.installdir):
             artifact.collect("*", symlinks=True)
         artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
 
-        with tools.cwd(self.installdir, "lib"):
-            for lib in tools.glob("libboost_*.a"):
-                name, _ = os.path.splitext(os.path.basename(lib))
-                artifact.cxxinfo.libraries.append(name[3:])
+        for libdir in ["lib", "lib32", "lib64"]:
+            if not os.path.isdir(os.path.join(artifact.path, libdir)):
+                continue
+            artifact.cxxinfo.libpaths.append(libdir)
 
-            arch = tools.getenv("VSCMD_ARG_TGT_ARCH", "x64")
-            for lib in tools.glob(f"lib*-mt-{arch}-*.lib"):
-                name, _ = os.path.splitext(lib)
-                artifact.cxxinfo.libraries.append(name)
+            with tools.cwd(self.installdir, libdir):
+                for lib in tools.glob("libboost_*.a"):
+                    name, _ = os.path.splitext(os.path.basename(lib))
+                    artifact.cxxinfo.libraries.append(name[3:])
+
+                arch = tools.getenv("VSCMD_ARG_TGT_ARCH", "x64")
+                for lib in tools.glob(f"lib*-mt-{arch}-*.lib"):
+                    name, _ = os.path.splitext(lib)
+                    artifact.cxxinfo.libraries.append(name)
 
 
 TaskRegistry.get().add_task_class(Boost)

{jolt-0.9.440 → jolt-0.9.445}/jolt/pkgs/boringssl.py

@@ -1,6 +1,6 @@
 from jolt import attributes, BooleanParameter, Parameter
 from jolt.pkgs import nasm
-from jolt.plugins import cmake, git
+from jolt.plugins import cmake, cxxinfo, git
 from jolt.tasks import TaskRegistry
 
 
@@ -10,6 +10,7 @@ from jolt.tasks import TaskRegistry
 @attributes.system
 @cmake.requires()
 @cmake.use_ninja()
+@cxxinfo.publish(libraries=["ssl", "crypto"])
 class BoringSSL(cmake.CMake):
     name = "boringssl"
     version = Parameter("0.20251124.0", help="boringssl version.")
@@ -21,12 +22,5 @@ class BoringSSL(cmake.CMake):
         "BUILD_SHARED_LIBS={shared[ON,OFF]}",
     ]
 
-    def publish(self, artifact, tools):
-        super().publish(artifact, tools)
-        artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
-        artifact.cxxinfo.libraries.append("ssl")
-        artifact.cxxinfo.libraries.append("crypto")
-
 
 TaskRegistry.get().add_task_class(BoringSSL)

jolt-0.9.445/jolt/pkgs/brotli.py

@@ -0,0 +1,20 @@
+from jolt import attributes, BooleanParameter, Parameter
+from jolt.plugins import git, cmake
+from jolt.tasks import TaskRegistry
+
+
+@attributes.requires("requires_git")
+@cmake.requires()
+@cmake.use_ninja()
+class Brotli(cmake.CMake):
+    name = "brotli"
+    version = Parameter("1.2.0", help="Brotli version.")
+    shared = BooleanParameter(False, help="Build shared libraries.")
+    requires_git = ["git:url=https://github.com/google/brotli.git,rev=v{version},submodules=true"]
+    srcdir = "{git[brotli]}"
+    options = [
+        "BUILD_SHARED_LIBS={shared[ON,OFF]}",
+    ]
+
+
+TaskRegistry.get().add_task_class(Brotli)

{jolt-0.9.440 → jolt-0.9.445}/jolt/pkgs/bzip2.py

@@ -1,6 +1,6 @@
 from jolt import attributes, BooleanParameter, Parameter
 from jolt.tasks import TaskRegistry
-from jolt.plugins import fetch, ninja
+from jolt.plugins import cxxinfo, fetch, ninja
 
 
 @attributes.requires("requires_src")
@@ -32,8 +32,6 @@ class LibBzip2(ninja.CXXLibrary):
     def publish(self, artifact, tools):
         super().publish(artifact, tools)
         artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
-        artifact.cxxinfo.libraries.append("bz2")
         artifact.environ.CMAKE_PREFIX_PATH.append(".")
 
         with tools.cwd("{fetch[src]}/bzip2-{version}"):

{jolt-0.9.440 → jolt-0.9.445}/jolt/pkgs/cares.py

@@ -1,12 +1,13 @@
 from jolt import attributes, BooleanParameter, Parameter
 from jolt.pkgs import cmake
-from jolt.plugins import git, cmake
+from jolt.plugins import cxxinfo, git, cmake
 from jolt.tasks import TaskRegistry
 
 
 @attributes.requires("requires_git")
 @cmake.requires()
 @cmake.use_ninja()
+@cxxinfo.publish(libraries=["cares"])
 class CAres(cmake.CMake):
     name = "c-ares"
     version = Parameter("1.34.6", help="c-ares version.")
@@ -19,11 +20,5 @@ class CAres(cmake.CMake):
         "CARES_BUILD_TESTS=OFF",
     ]
 
-    def publish(self, artifact, tools):
-        super().publish(artifact, tools)
-        artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
-        artifact.cxxinfo.libraries.append("cares")
-
 
 TaskRegistry.get().add_task_class(CAres)

{jolt-0.9.440 → jolt-0.9.445}/jolt/pkgs/catch2.py

@@ -1,12 +1,13 @@
 from jolt import attributes, BooleanParameter, Parameter, Task
 from jolt.pkgs import cmake
-from jolt.plugins import git, cmake
+from jolt.plugins import cxxinfo, git, cmake
 from jolt.tasks import TaskRegistry
 
 
 @attributes.requires("requires_git")
 @cmake.requires()
 @cmake.use_ninja()
+@cxxinfo.publish(libraries=["Catch2"])
 class Catch2(cmake.CMake):
     name = "catch2"
     version = Parameter("3.11.0", help="catch2 version.")
@@ -17,12 +18,6 @@ class Catch2(cmake.CMake):
         "BUILD_SHARED_LIBS={shared[ON,OFF]}",
     ]
 
-    def publish(self, artifact, tools):
-        super().publish(artifact, tools)
-        artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
-        artifact.cxxinfo.libraries.append("Catch2")
-
 
 class Catch2Main(Task):
     name = "catch2/main"

{jolt-0.9.440 → jolt-0.9.445}/jolt/pkgs/curl.py

@@ -1,24 +1,32 @@
 from jolt import attributes, BooleanParameter, Parameter
-from jolt.pkgs import cmake, ssl
-from jolt.plugins import git, cmake
+from jolt.pkgs import brotli, ssl, zlib, zstd
+from jolt.plugins import cxxinfo, git, cmake
 from jolt.tasks import TaskRegistry
 
 
+@attributes.requires("requires_brotli")
 @attributes.requires("requires_git")
 @attributes.requires("requires_ssl")
+@attributes.requires("requires_zlib")
+@attributes.requires("requires_zstd")
 @attributes.system
 @cmake.requires()
 @cmake.use_ninja()
+@cxxinfo.publish()
 class Curl(cmake.CMake):
     name = "curl"
     version = Parameter("8.17.0", help="Curl version.")
     shared = BooleanParameter(False, help="Build shared libraries.")
+    requires_brotli = ["brotli"]
     requires_git = ["git:url=https://github.com/curl/curl.git,rev=curl-{_version_tag},submodules=true"]
     requires_ssl = ["virtual/ssl"]
+    requires_zlib = ["virtual/zlib"]
+    requires_zstd = ["zstd"]
     srcdir = "{git[curl]}"
     options = [
         "BUILD_SHARED_LIBS={shared[ON,OFF]}",
         "CURL_USE_LIBPSL=OFF",
+        "USE_LIBIDN2=OFF",
     ]
 
     @property
@@ -27,8 +35,6 @@ class Curl(cmake.CMake):
 
     def publish(self, artifact, tools):
         super().publish(artifact, tools)
-        artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
         if self.system == "windows":
             artifact.cxxinfo.libraries.append("libcurl_imp")
         else:

{jolt-0.9.440 → jolt-0.9.445}/jolt/pkgs/double_conversion.py

@@ -1,12 +1,13 @@
 from jolt import attributes, Parameter
 from jolt.pkgs import cmake
-from jolt.plugins import git, cmake
+from jolt.plugins import cxxinfo, git, cmake
 from jolt.tasks import TaskRegistry
 
 
 @attributes.requires("requires_git")
 @cmake.requires()
 @cmake.use_ninja()
+@cxxinfo.publish(libraries=["double-conversion"])
 class DoubleConversion(cmake.CMake):
     name = "double-conversion"
     version = Parameter("3.4.0", help="double_conversion version.")
@@ -14,11 +15,5 @@ class DoubleConversion(cmake.CMake):
     requires_git = ["git:url=https://github.com/google/double-conversion.git,rev=v{version}"]
     srcdir = "{git[double-conversion]}"
 
-    def publish(self, artifact, tools):
-        super().publish(artifact, tools)
-        artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
-        artifact.cxxinfo.libraries.append("double-conversion")
-
 
 TaskRegistry.get().add_task_class(DoubleConversion)

{jolt-0.9.440 → jolt-0.9.445}/jolt/pkgs/flatbuffers.py

@@ -1,12 +1,13 @@
 from jolt import attributes, BooleanParameter, Parameter
 from jolt.pkgs import cmake
-from jolt.plugins import git, cmake
+from jolt.plugins import cxxinfo, git, cmake
 from jolt.tasks import TaskRegistry
 
 
 @attributes.requires("requires_git")
 @cmake.requires()
 @cmake.use_ninja()
+@cxxinfo.publish(libraries=["flatbuffers"])
 class Flatbuffers(cmake.CMake):
     name = "flatbuffers"
     version = Parameter("25.9.23", help="Flatbuffers version.")
@@ -19,11 +20,5 @@ class Flatbuffers(cmake.CMake):
         "FLATBUFFERS_BUILD_TESTS=OFF",
     ]
 
-    def publish(self, artifact, tools):
-        super().publish(artifact, tools)
-        artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
-        artifact.cxxinfo.libraries.append("flatbuffers")
-
 
 TaskRegistry.get().add_task_class(Flatbuffers)

{jolt-0.9.440 → jolt-0.9.445}/jolt/pkgs/fmt.py

@@ -1,11 +1,12 @@
 from jolt import attributes, BooleanParameter, Parameter
-from jolt.plugins import git, cmake
+from jolt.plugins import cxxinfo, git, cmake
 from jolt.tasks import TaskRegistry
 
 
 @attributes.requires("requires_git")
 @cmake.requires()
 @cmake.use_ninja()
+@cxxinfo.publish(libraries=["fmt"])
 class Fmt(cmake.CMake):
     name = "fmt"
     version = Parameter("12.1.0", help="Fmt version.")
@@ -17,11 +18,5 @@ class Fmt(cmake.CMake):
         "FMT_TEST=OFF",
     ]
 
-    def publish(self, artifact, tools):
-        super().publish(artifact, tools)
-        artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
-        artifact.cxxinfo.libraries.append("fmt")
-
 
 TaskRegistry.get().add_task_class(Fmt)

{jolt-0.9.440 → jolt-0.9.445}/jolt/pkgs/googletest.py

@@ -1,12 +1,13 @@
 from jolt import attributes, BooleanParameter, Parameter, Task
 from jolt.pkgs import cmake
-from jolt.plugins import git, cmake
+from jolt.plugins import cxxinfo, git, cmake
 from jolt.tasks import TaskRegistry
 
 
 @attributes.requires("requires_git")
 @cmake.requires()
 @cmake.use_ninja()
+@cxxinfo.publish(libraries=["gmock", "gtest"])
 class GoogleTest(cmake.CMake):
     name = "google/test"
     version = Parameter("1.12.1", help="GoogleTest version.")
@@ -17,13 +18,6 @@ class GoogleTest(cmake.CMake):
         "BUILD_SHARED_LIBS={shared[ON,OFF]}",
     ]
 
-    def publish(self, artifact, tools):
-        super().publish(artifact, tools)
-        artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
-        artifact.cxxinfo.libraries.append("gmock")
-        artifact.cxxinfo.libraries.append("gtest")
-
 
 class GTestMain(Task):
     name = "google/test/main"

{jolt-0.9.440 → jolt-0.9.445}/jolt/pkgs/grpc.py

@@ -1,6 +1,6 @@
 from jolt import attributes, BooleanParameter, Parameter, Task
 from jolt.pkgs import abseil, cares, cmake, nasm, protobuf, re2, ssl, zlib
-from jolt.plugins import git, cmake
+from jolt.plugins import cxxinfo, git, cmake
 from jolt.tasks import TaskRegistry
 
 
@@ -15,6 +15,7 @@ from jolt.tasks import TaskRegistry
 @attributes.system
 @cmake.requires()
 @cmake.use_ninja()
+@cxxinfo.publish()
 class Grpc(cmake.CMake):
     name = "grpc"
     version = Parameter("1.76.0", help="Grpc version.")
@@ -47,8 +48,6 @@ class Grpc(cmake.CMake):
         super().publish(artifact, tools)
         if self.system == "windows":
             artifact.cxxinfo.msvcrt = "Dynamic"
-        artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
 
 
 class GrpcC(Task):

{jolt-0.9.440 → jolt-0.9.445}/jolt/pkgs/jsoncpp.py

@@ -1,6 +1,6 @@
 from jolt import attributes, BooleanParameter, Parameter
 from jolt.pkgs import cmake
-from jolt.plugins import git, cmake, pkgconfig
+from jolt.plugins import cxxinfo, git, cmake, pkgconfig
 from jolt.tasks import TaskRegistry
 
 
@@ -8,6 +8,7 @@ from jolt.tasks import TaskRegistry
 @attributes.system
 @cmake.requires()
 @cmake.use_ninja()
+@cxxinfo.publish()
 class JsonCPP(cmake.CMake):
     name = "jsoncpp"
     version = Parameter("1.9.6", help="JsonCPP version.")
@@ -20,8 +21,6 @@ class JsonCPP(cmake.CMake):
 
     def publish(self, artifact, tools):
         super().publish(artifact, tools)
-        artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
         if self.system == "windows":
             artifact.cxxinfo.libraries.append("jsoncpp_static")
         else:

{jolt-0.9.440 → jolt-0.9.445}/jolt/pkgs/libarchive.py

@@ -1,6 +1,6 @@
 from jolt import attributes, BooleanParameter, Parameter
 from jolt.tasks import TaskRegistry
-from jolt.plugins import cmake, git
+from jolt.plugins import cmake, cxxinfo, git
 from jolt.pkgs import bzip2, libexpat, lz4, openssl, xz, zlib, zstd
 
 
@@ -14,6 +14,7 @@ from jolt.pkgs import bzip2, libexpat, lz4, openssl, xz, zlib, zstd
 @attributes.requires("requires_git")
 @cmake.requires()
 @cmake.use_ninja()
+@cxxinfo.publish(libraries=["archive"])
 class Libarchive(cmake.CMake):
     name = "libarchive"
     version = Parameter("3.8.5", help="libarchive version.")
@@ -33,11 +34,5 @@ class Libarchive(cmake.CMake):
         "ENABLE_TEST=OFF",
     ]
 
-    def publish(self, artifact, tools):
-        super().publish(artifact, tools)
-        artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
-        artifact.cxxinfo.libraries.append("archive")
-
 
 TaskRegistry.get().add_task_class(Libarchive)

{jolt-0.9.440 → jolt-0.9.445}/jolt/pkgs/libcap.py

@@ -1,13 +1,15 @@
 from jolt import attributes, Parameter, Task
-from jolt.plugins import fetch
-from jolt.tasks import TaskRegistry
+from jolt.plugins import cxxinfo, fetch
+from jolt.tasks import BooleanParameter, TaskRegistry
 
 
 @attributes.common_metadata()
 @attributes.requires("requires_src")
+@cxxinfo.publish(libraries=["cap", "psx"])
 class Libcap(Task):
     name = "libcap"
     version = Parameter("2.77", help="Libcap version.")
+    shared = BooleanParameter(False, help="Build shared libraries.")
     requires_src = ["git:url=https://git.kernel.org/pub/scm/libs/libcap/libcap.git,rev=libcap-{version}"]
     srcdir = "{git[libcap]}"
 
@@ -19,7 +21,7 @@ class Libcap(Task):
 
         # Patch pkgconfig files
         with tools.cwd(self.installdir):
-            for pc in tools.glob("lib/pkgconfig/*.pc") + tools.glob("lib64/pkgconfig/*.pc"):
+            for pc in tools.glob("lib*/pkgconfig/*.pc"):
                 tools.replace_in_file(
                     pc,
                     "prefix=/usr",
@@ -38,6 +40,12 @@ class Libcap(Task):
 
     def publish(self, artifact, tools):
         with tools.cwd(self.installdir):
+            if self.shared:
+                for lib in tools.glob("lib*/*.a"):
+                    tools.unlink(lib)
+            else:
+                for lib in tools.glob("lib*/*.so*"):
+                    tools.unlink(lib)
             artifact.collect("*", symlinks=True)
 
 

{jolt-0.9.440 → jolt-0.9.445}/jolt/pkgs/libedit.py

@@ -1,6 +1,6 @@
 from jolt import attributes, BooleanParameter, Parameter
 from jolt.pkgs import ncurses
-from jolt.plugins import git, autotools, pkgconfig
+from jolt.plugins import cxxinfo, git, autotools, pkgconfig
 from jolt.tasks import TaskRegistry
 
 
@@ -8,6 +8,7 @@ from jolt.tasks import TaskRegistry
 @attributes.requires("requires_ncurses")
 @autotools.requires()
 @pkgconfig.requires()
+@cxxinfo.publish(libraries=["edit"])
 class Libedit(autotools.Autotools):
     name = "libedit"
     version = Parameter("20251016-3.1", help="Libedit version.")
@@ -31,9 +32,6 @@ class Libedit(autotools.Autotools):
 
     def publish(self, artifact, tools):
         super().publish(artifact, tools)
-        artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
-        artifact.cxxinfo.libraries.append("edit")
         artifact.environ.CMAKE_PREFIX_PATH.append(".")
         if self.shared:
             artifact.environ.LD_LIBRARY_PATH.append("lib")

{jolt-0.9.440 → jolt-0.9.445}/jolt/pkgs/libevent.py

@@ -1,6 +1,7 @@
+import os
 from jolt import attributes, Parameter
 from jolt.pkgs import cmake, openssl
-from jolt.plugins import git, cmake, pkgconfig
+from jolt.plugins import cxxinfo, git, cmake, pkgconfig
 from jolt.tasks import TaskRegistry
 
 
@@ -9,6 +10,7 @@ from jolt.tasks import TaskRegistry
 @cmake.requires()
 @cmake.use_ninja()
 @pkgconfig.requires()
+@cxxinfo.publish(libraries=["event"])
 class LibEvent(cmake.CMake):
     name = "libevent"
     version = Parameter("2.1.12", help="libevent version.")
@@ -19,7 +21,13 @@ class LibEvent(cmake.CMake):
 
     def publish(self, artifact, tools):
         super().publish(artifact, tools)
-        with tools.cwd(artifact.path, "lib/cmake/libevent"):
+
+        for libdir in ["lib", "lib32", "lib64"]:
+            if os.path.isdir(os.path.join(artifact.path, libdir)):
+                self.libdir = libdir
+                break
+
+        with tools.cwd(artifact.path, "{libdir}/cmake/libevent"):
             for file in tools.glob("*.cmake"):
                 tools.replace_in_file(
                     file,

{jolt-0.9.440 → jolt-0.9.445}/jolt/pkgs/libexpat.py

@@ -1,11 +1,12 @@
 from jolt import attributes, BooleanParameter, Parameter
-from jolt.plugins import cmake, git
+from jolt.plugins import cmake, cxxinfo, git
 from jolt.tasks import TaskRegistry
 
 
 @attributes.requires("requires_src")
 @cmake.requires()
 @cmake.use_ninja()
+@cxxinfo.publish(libraries=["expat"])
 class Libexpat(cmake.CMake):
     name = "libexpat"
     version = Parameter("2.7.3", help="Expat version.")
@@ -17,11 +18,5 @@ class Libexpat(cmake.CMake):
         "BUILD_SHARED_LIBS={shared[ON,OFF]}",
     ]
 
-    def publish(self, artifact, tools):
-        super().publish(artifact, tools)
-        artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
-        artifact.cxxinfo.libraries.append("expat")
-
 
 TaskRegistry.get().add_task_class(Libexpat)