jolt 0.9.444__py3-none-any.whl → 0.9.447__py3-none-any.whl

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/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/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/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/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/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/pkgs/curl.py

@@ -1,6 +1,6 @@
 from jolt import attributes, BooleanParameter, Parameter
 from jolt.pkgs import brotli, ssl, zlib, zstd
-from jolt.plugins import git, cmake
+from jolt.plugins import cxxinfo, git, cmake
 from jolt.tasks import TaskRegistry
 
 
@@ -12,6 +12,7 @@ from jolt.tasks import TaskRegistry
 @attributes.system
 @cmake.requires()
 @cmake.use_ninja()
+@cxxinfo.publish()
 class Curl(cmake.CMake):
     name = "curl"
     version = Parameter("8.17.0", help="Curl version.")
@@ -34,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/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/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/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/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/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/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/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/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/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/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/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)

jolt/pkgs/libogg.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=["ogg"])
 class Libogg(cmake.CMake):
     name = "libogg"
     version = Parameter("1.3.6", help="libogg version.")
@@ -18,11 +19,5 @@ class Libogg(cmake.CMake):
         "CMAKE_POLICY_VERSION_MINIMUM=3.5",
     ]
 
-    def publish(self, artifact, tools):
-        super().publish(artifact, tools)
-        artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
-        artifact.cxxinfo.libraries.append("ogg")
-
 
 TaskRegistry.get().add_task_class(Libogg)

jolt/pkgs/libtirpc.py

@@ -1,10 +1,11 @@
 from jolt import attributes, Parameter
-from jolt.plugins import autotools, fetch
+from jolt.plugins import autotools, cxxinfo, fetch
 from jolt.tasks import TaskRegistry
 
 
 @attributes.requires("requires_src")
 @autotools.requires()
+@cxxinfo.publish(libraries=["tirpc"])
 class Libtirpc(autotools.Autotools):
     """Libtirpc package"""
     name = "libtirpc"
@@ -14,11 +15,5 @@ class Libtirpc(autotools.Autotools):
     srcdir = "{fetch[src]}/libtirpc-{version}"
     options = ["--disable-gssapi"]
 
-    def publish(self, artifact, tools):
-        super().publish(artifact, tools)
-        artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
-        artifact.cxxinfo.libraries.append("tirpc")
-
 
 TaskRegistry.get().add_task_class(Libtirpc)

jolt/pkgs/libvorbis.py

@@ -1,6 +1,6 @@
 from jolt import attributes, BooleanParameter, Parameter
 from jolt.pkgs import cmake, libogg
-from jolt.plugins import git, cmake, pkgconfig
+from jolt.plugins import cxxinfo, git, cmake, pkgconfig
 from jolt.tasks import TaskRegistry
 
 
@@ -9,6 +9,7 @@ from jolt.tasks import TaskRegistry
 @cmake.requires()
 @cmake.use_ninja()
 @pkgconfig.requires()
+@cxxinfo.publish(libraries=["vorbis", "vorbisenc", "vorbisfile"])
 class Libvorbis(cmake.CMake):
     name = "libvorbis"
     version = Parameter("1.3.7", help="libvorbis version.")
@@ -21,13 +22,5 @@ class Libvorbis(cmake.CMake):
         "CMAKE_POLICY_VERSION_MINIMUM=3.5",
     ]
 
-    def publish(self, artifact, tools):
-        super().publish(artifact, tools)
-        artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
-        artifact.cxxinfo.libraries.append("vorbis")
-        artifact.cxxinfo.libraries.append("vorbisenc")
-        artifact.cxxinfo.libraries.append("vorbisfile")
-
 
 TaskRegistry.get().add_task_class(Libvorbis)

jolt/pkgs/libxml2.py

@@ -1,6 +1,6 @@
 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
 
 
@@ -8,6 +8,7 @@ from jolt.tasks import TaskRegistry
 @attributes.system
 @cmake.requires()
 @cmake.use_ninja()
+@cxxinfo.publish()
 class Libxml2(cmake.CMake):
     name = "libxml2"
     version = Parameter("2.15.1", help="Libxml2 version.")
@@ -22,8 +23,6 @@ class Libxml2(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("libxml2{shared[,s]}")
         else:

jolt/pkgs/lz4.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_git")
 @cmake.requires()
 @cmake.use_ninja()
+@cxxinfo.publish(libraries=["lz4"])
 class Lz4(cmake.CMake):
     name = "lz4"
     version = Parameter("1.10.0", help="LZ4 version.")
@@ -16,11 +17,5 @@ class Lz4(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("lz4")
-
 
 TaskRegistry.get().add_task_class(Lz4)

jolt/pkgs/mstch.py

@@ -1,6 +1,6 @@
 from jolt import attributes, Parameter
 from jolt.pkgs import boost
-from jolt.plugins import cmake, fetch
+from jolt.plugins import cmake, cxxinfo, fetch
 from jolt.tasks import TaskRegistry
 
 
@@ -8,6 +8,7 @@ from jolt.tasks import TaskRegistry
 @attributes.requires("requires_src")
 @cmake.requires()
 @cmake.use_ninja()
+@cxxinfo.publish(libraries=["mstch"])
 class MSTCH(cmake.CMake):
     name = "mstch"
     version = Parameter("1.0.2", help="MSTCH version.")
@@ -18,11 +19,5 @@ class MSTCH(cmake.CMake):
         "CMAKE_POLICY_VERSION_MINIMUM=3.5",
     ]
 
-    def publish(self, artifact, tools):
-        super().publish(artifact, tools)
-        artifact.cxxinfo.incpaths.append("include")
-        artifact.cxxinfo.libpaths.append("lib")
-        artifact.cxxinfo.libraries.append("mstch")
-
 
 TaskRegistry.get().add_task_class(MSTCH)