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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (53) hide show
  1. jolt/pkgs/abseil.py +14 -10
  2. jolt/pkgs/boost.py +13 -9
  3. jolt/pkgs/boringssl.py +2 -8
  4. jolt/pkgs/bzip2.py +1 -3
  5. jolt/pkgs/cares.py +2 -7
  6. jolt/pkgs/catch2.py +2 -7
  7. jolt/pkgs/curl.py +2 -3
  8. jolt/pkgs/double_conversion.py +2 -7
  9. jolt/pkgs/flatbuffers.py +2 -7
  10. jolt/pkgs/fmt.py +2 -7
  11. jolt/pkgs/googletest.py +2 -8
  12. jolt/pkgs/grpc.py +2 -3
  13. jolt/pkgs/jsoncpp.py +2 -3
  14. jolt/pkgs/libarchive.py +2 -7
  15. jolt/pkgs/libcap.py +11 -3
  16. jolt/pkgs/libedit.py +2 -4
  17. jolt/pkgs/libevent.py +10 -2
  18. jolt/pkgs/libexpat.py +2 -7
  19. jolt/pkgs/libogg.py +2 -7
  20. jolt/pkgs/libtirpc.py +2 -7
  21. jolt/pkgs/libvorbis.py +2 -9
  22. jolt/pkgs/libxml2.py +2 -3
  23. jolt/pkgs/lz4.py +2 -7
  24. jolt/pkgs/mstch.py +2 -7
  25. jolt/pkgs/mysql.py +2 -7
  26. jolt/pkgs/ng_log.py +2 -7
  27. jolt/pkgs/openssl.py +14 -11
  28. jolt/pkgs/paho.py +4 -5
  29. jolt/pkgs/poco.py +13 -10
  30. jolt/pkgs/protobuf.py +2 -3
  31. jolt/pkgs/pugixml.py +2 -7
  32. jolt/pkgs/rapidjson.py +2 -5
  33. jolt/pkgs/rapidyaml.py +2 -8
  34. jolt/pkgs/re2.py +2 -7
  35. jolt/pkgs/sdl.py +2 -3
  36. jolt/pkgs/simdjson.py +2 -7
  37. jolt/pkgs/soci.py +2 -3
  38. jolt/pkgs/spdlog.py +2 -7
  39. jolt/pkgs/sqlite.py +3 -11
  40. jolt/pkgs/ssl.py +1 -1
  41. jolt/pkgs/xz.py +2 -7
  42. jolt/pkgs/yamlcpp.py +2 -7
  43. jolt/pkgs/zeromq.py +3 -11
  44. jolt/pkgs/zlib.py +9 -11
  45. jolt/pkgs/zstd.py +2 -3
  46. jolt/plugins/cmake.py +2 -1
  47. jolt/plugins/cxxinfo.py +32 -0
  48. jolt/version.py +1 -1
  49. {jolt-0.9.444.dist-info → jolt-0.9.447.dist-info}/METADATA +1 -1
  50. {jolt-0.9.444.dist-info → jolt-0.9.447.dist-info}/RECORD +53 -53
  51. {jolt-0.9.444.dist-info → jolt-0.9.447.dist-info}/WHEEL +1 -1
  52. {jolt-0.9.444.dist-info → jolt-0.9.447.dist-info}/entry_points.txt +0 -0
  53. {jolt-0.9.444.dist-info → jolt-0.9.447.dist-info}/top_level.txt +0 -0
jolt/pkgs/mysql.py CHANGED
@@ -1,6 +1,6 @@
1
1
  from jolt import attributes, BooleanParameter, Parameter
2
2
  from jolt.pkgs import boost, curl, libedit, libtirpc, lz4, openssl, rapidjson, zlib, zstd
3
- from jolt.plugins import cmake, git, pkgconfig
3
+ from jolt.plugins import cmake, cxxinfo, git, pkgconfig
4
4
  from jolt.tasks import TaskRegistry
5
5
 
6
6
 
@@ -34,6 +34,7 @@ class MySQLBase(cmake.CMake):
34
34
  srcdir = "{git[mysql-server]}"
35
35
 
36
36
 
37
+ @cxxinfo.publish(libraries=["mysqlclient"])
37
38
  class LibMySQLClient(MySQLBase):
38
39
  name = "libmysqlclient"
39
40
  shared = BooleanParameter(False, help="Build shared libraries")
@@ -50,11 +51,5 @@ class LibMySQLClient(MySQLBase):
50
51
  "WITHOUT_SERVER=ON",
51
52
  ]
52
53
 
53
- def publish(self, artifact, tools):
54
- super().publish(artifact, tools)
55
- artifact.cxxinfo.incpaths.append("include")
56
- artifact.cxxinfo.libpaths.append("lib")
57
- artifact.cxxinfo.libraries.append("mysqlclient")
58
-
59
54
 
60
55
  TaskRegistry.get().add_task_class(LibMySQLClient)
jolt/pkgs/ng_log.py CHANGED
@@ -1,12 +1,13 @@
1
1
  from jolt import attributes, BooleanParameter, Parameter
2
2
  from jolt.pkgs import cmake
3
- from jolt.plugins import git, cmake
3
+ from jolt.plugins import cxxinfo, git, cmake
4
4
  from jolt.tasks import TaskRegistry
5
5
 
6
6
 
7
7
  @attributes.requires("requires_git")
8
8
  @cmake.requires()
9
9
  @cmake.use_ninja()
10
+ @cxxinfo.publish(libraries=["ng-log"])
10
11
  class NgLog(cmake.CMake):
11
12
  name = "ng-log"
12
13
  version = Parameter("0.8.2", help="ng_log version.")
@@ -15,11 +16,5 @@ class NgLog(cmake.CMake):
15
16
  srcdir = "{git[ng-log]}"
16
17
  options = ["BUILD_SHARED_LIBS={shared[ON,OFF]}"]
17
18
 
18
- def publish(self, artifact, tools):
19
- super().publish(artifact, tools)
20
- artifact.cxxinfo.incpaths.append("include")
21
- artifact.cxxinfo.libpaths.append("lib")
22
- artifact.cxxinfo.libraries.append("ng-log")
23
-
24
19
 
25
20
  TaskRegistry.get().add_task_class(NgLog)
jolt/pkgs/openssl.py CHANGED
@@ -1,6 +1,6 @@
1
1
  from jolt import attributes, BooleanParameter, Parameter, Task
2
2
  from jolt.pkgs import nasm, perl
3
- from jolt.plugins import git
3
+ from jolt.plugins import cxxinfo, git
4
4
  from jolt.tasks import TaskRegistry
5
5
 
6
6
 
@@ -9,6 +9,7 @@ from jolt.tasks import TaskRegistry
9
9
  @attributes.requires("requires_{system}_nasm")
10
10
  @attributes.common_metadata()
11
11
  @attributes.system
12
+ @cxxinfo.publish(libraries=["ssl", "crypto"])
12
13
  class OpenSSL(Task):
13
14
  name = "openssl"
14
15
  version = Parameter("3.6.0", help="openssl version.")
@@ -40,15 +41,17 @@ class OpenSSL(Task):
40
41
  def publish(self, artifact, tools):
41
42
  with tools.cwd(self.installdir):
42
43
  artifact.collect("*", symlinks=True)
43
- artifact.cxxinfo.incpaths.append("include")
44
- artifact.cxxinfo.libpaths.append("lib")
45
- artifact.cxxinfo.libraries.append("ssl")
46
- artifact.cxxinfo.libraries.append("crypto")
47
44
  artifact.strings.install_prefix = self.installdir
48
45
  if self.system == "windows":
49
46
  self.publish_pkgconfig(artifact, tools)
50
47
 
51
48
  def publish_pkgconfig(self, artifact, tools):
49
+ with tools.cwd(artifact.path):
50
+ for libdir in ["lib", "lib32", "lib64"]:
51
+ if tools.exist(libdir):
52
+ self.libdir = libdir
53
+ break
54
+
52
55
  with tools.tmpdir() as tmp, tools.cwd(tmp):
53
56
  tools.write_file(
54
57
  "openssl.pc",
@@ -56,7 +59,7 @@ class OpenSSL(Task):
56
59
  # See: man pkg-config
57
60
  prefix=${{pcfiledir}}/../..
58
61
  exec_prefix=${{prefix}}/bin
59
- libdir=${{prefix}}/lib
62
+ libdir=${{prefix}}/{libdir}
60
63
  includedir=${{prefix}}/include
61
64
 
62
65
  Name: OpenSSL
@@ -70,7 +73,7 @@ Requires: libssl libcrypto
70
73
  # See: man pkg-config
71
74
  prefix=${{pcfiledir}}/../..
72
75
  exec_prefix=${{prefix}}/bin
73
- libdir=${{prefix}}/lib
76
+ libdir=${{prefix}}/{libdir}
74
77
  includedir=${{prefix}}/include
75
78
  enginesdir=${{libdir}}/engines-3
76
79
 
@@ -86,7 +89,7 @@ Cflags: -I${{includedir}}
86
89
  # See: man pkg-config
87
90
  prefix=${{pcfiledir}}/../..
88
91
  exec_prefix=${{prefix}}/bin
89
- libdir=${{prefix}}/lib
92
+ libdir=${{prefix}}/{libdir}
90
93
  includedir=${{prefix}}/include
91
94
 
92
95
  Name: OpenSSL-libssl
@@ -95,9 +98,9 @@ Version: {version}-{identity}
95
98
  Libs: -L${{libdir}} -lssl
96
99
  Cflags: -I${{includedir}}
97
100
  """)
98
- artifact.collect("openssl.pc", "lib/pkgconfig/")
99
- artifact.collect("libcrypto.pc", "lib/pkgconfig/")
100
- artifact.collect("libssl.pc", "lib/pkgconfig/")
101
+ artifact.collect("openssl.pc", "{libdir}/pkgconfig/")
102
+ artifact.collect("libcrypto.pc", "{libdir}/pkgconfig/")
103
+ artifact.collect("libssl.pc", "{libdir}/pkgconfig/")
101
104
 
102
105
 
103
106
  TaskRegistry.get().add_task_class(OpenSSL)
jolt/pkgs/paho.py CHANGED
@@ -1,6 +1,6 @@
1
1
  from jolt import attributes, BooleanParameter, Parameter
2
2
  from jolt.pkgs import openssl
3
- from jolt.plugins import cmake, git
3
+ from jolt.plugins import cmake, cxxinfo, git
4
4
  from jolt.tasks import TaskRegistry
5
5
 
6
6
 
@@ -8,6 +8,7 @@ from jolt.tasks import TaskRegistry
8
8
  @attributes.requires("requires_ssl_{ssl[on,off]}")
9
9
  @cmake.requires()
10
10
  @cmake.use_ninja()
11
+ @cxxinfo.publish()
11
12
  class PahoMQTT_C(cmake.CMake):
12
13
  name = "paho/mqtt-c"
13
14
  version = Parameter("1.3.15", help="Paho MQTT C version.")
@@ -24,8 +25,6 @@ class PahoMQTT_C(cmake.CMake):
24
25
 
25
26
  def publish(self, artifact, tools):
26
27
  super().publish(artifact, tools)
27
- artifact.cxxinfo.incpaths.append("include")
28
- artifact.cxxinfo.libpaths.append("lib")
29
28
  if self.shared:
30
29
  artifact.cxxinfo.libraries.append("paho-mqtt3c")
31
30
  else:
@@ -36,6 +35,7 @@ class PahoMQTT_C(cmake.CMake):
36
35
  @attributes.requires("requires_mqtt_c")
37
36
  @cmake.requires()
38
37
  @cmake.use_ninja()
38
+ @cxxinfo.publish()
39
39
  class PahoMQTT_CXX(cmake.CMake):
40
40
  name = "paho/mqtt-cxx"
41
41
  version = Parameter("1.5.2", help="Paho MQTT C++ version.")
@@ -52,8 +52,6 @@ class PahoMQTT_CXX(cmake.CMake):
52
52
 
53
53
  def publish(self, artifact, tools):
54
54
  super().publish(artifact, tools)
55
- artifact.cxxinfo.incpaths.append("include")
56
- artifact.cxxinfo.libpaths.append("lib")
57
55
  if self.shared:
58
56
  artifact.cxxinfo.libraries.append("paho-mqttpp3")
59
57
  else:
@@ -63,6 +61,7 @@ class PahoMQTT_CXX(cmake.CMake):
63
61
  @attributes.requires("requires_git")
64
62
  @cmake.requires()
65
63
  @cmake.use_ninja()
64
+ @cxxinfo.publish()
66
65
  class PahoMQTT_Embedded_C(cmake.CMake):
67
66
  name = "paho/mqtt-embedded-c"
68
67
  version = "1.1.0"
jolt/pkgs/poco.py CHANGED
@@ -1,6 +1,6 @@
1
1
  from jolt import attributes, BooleanParameter, Parameter
2
2
  from jolt.pkgs import cmake, ssl
3
- from jolt.plugins import git, cmake
3
+ from jolt.plugins import cxxinfo, git, cmake
4
4
  from jolt.tasks import TaskRegistry
5
5
  import os
6
6
 
@@ -10,6 +10,7 @@ import os
10
10
  @attributes.system
11
11
  @cmake.requires()
12
12
  @cmake.use_ninja()
13
+ @cxxinfo.publish()
13
14
  class Poco(cmake.CMake):
14
15
  name = "poco"
15
16
  version = Parameter("1.14.2", help="Poco version")
@@ -26,16 +27,18 @@ class Poco(cmake.CMake):
26
27
  super().publish(artifact, tools)
27
28
  if self.system == "windows":
28
29
  artifact.cxxinfo.msvcrt = "Dynamic"
29
- artifact.cxxinfo.incpaths.append("include")
30
- artifact.cxxinfo.libpaths.append("lib")
31
30
 
32
- with tools.cwd(artifact.path, "lib"):
33
- for libfile in tools.glob("*.lib"):
34
- libname, _ = os.path.splitext(libfile)
35
- artifact.cxxinfo.libraries.append(libname)
36
- for libfile in tools.glob("lib*.a"):
37
- libname, _ = os.path.splitext(libfile)
38
- artifact.cxxinfo.libraries.append(libname[3:])
31
+ for libdir in ["lib", "lib32", "lib64"]:
32
+ full_libdir = os.path.join(artifact.path, libdir)
33
+ if not os.path.isdir(full_libdir):
34
+ continue
35
+ with tools.cwd(artifact.path, libdir):
36
+ for libfile in tools.glob("*.lib"):
37
+ libname, _ = os.path.splitext(libfile)
38
+ artifact.cxxinfo.libraries.append(libname)
39
+ for libfile in tools.glob("lib*.a"):
40
+ libname, _ = os.path.splitext(libfile)
41
+ artifact.cxxinfo.libraries.append(libname[3:])
39
42
 
40
43
 
41
44
  TaskRegistry.get().add_task_class(Poco)
jolt/pkgs/protobuf.py CHANGED
@@ -1,6 +1,6 @@
1
1
  from jolt import attributes, BooleanParameter, Parameter, Task
2
2
  from jolt.pkgs import cmake
3
- from jolt.plugins import git, cmake
3
+ from jolt.plugins import cxxinfo, git, cmake
4
4
  from jolt.tasks import TaskRegistry
5
5
 
6
6
 
@@ -9,6 +9,7 @@ from jolt.tasks import TaskRegistry
9
9
  @attributes.system
10
10
  @cmake.requires()
11
11
  @cmake.use_ninja()
12
+ @cxxinfo.publish()
12
13
  class Protobuf(cmake.CMake):
13
14
  """
14
15
  Protocol buffers main package.
@@ -33,8 +34,6 @@ class Protobuf(cmake.CMake):
33
34
  super().publish(artifact, tools)
34
35
  if self.system == "windows":
35
36
  artifact.cxxinfo.msvcrt = "Dynamic"
36
- artifact.cxxinfo.incpaths.append("include")
37
- artifact.cxxinfo.libpaths.append("lib")
38
37
 
39
38
 
40
39
  class ProtobufLib(Task):
jolt/pkgs/pugixml.py CHANGED
@@ -1,12 +1,13 @@
1
1
  from jolt import attributes, BooleanParameter, Parameter
2
2
  from jolt.pkgs import cmake
3
- from jolt.plugins import git, cmake
3
+ from jolt.plugins import cxxinfo, git, cmake
4
4
  from jolt.tasks import TaskRegistry
5
5
 
6
6
 
7
7
  @attributes.requires("requires_git")
8
8
  @cmake.requires()
9
9
  @cmake.use_ninja()
10
+ @cxxinfo.publish(libraries=["pugixml"])
10
11
  class PugiXML(cmake.CMake):
11
12
  name = "pugixml"
12
13
  version = Parameter("1.15", help="PugiXML version.")
@@ -17,11 +18,5 @@ class PugiXML(cmake.CMake):
17
18
  "BUILD_SHARED_LIBS={shared[ON,OFF]}",
18
19
  ]
19
20
 
20
- def publish(self, artifact, tools):
21
- super().publish(artifact, tools)
22
- artifact.cxxinfo.incpaths.append("include")
23
- artifact.cxxinfo.libpaths.append("lib")
24
- artifact.cxxinfo.libraries.append("pugixml")
25
-
26
21
 
27
22
  TaskRegistry.get().add_task_class(PugiXML)
jolt/pkgs/rapidjson.py CHANGED
@@ -1,12 +1,13 @@
1
1
  from jolt import attributes, Parameter
2
2
  from jolt.pkgs import cmake
3
- from jolt.plugins import git, cmake
3
+ from jolt.plugins import cxxinfo, git, cmake
4
4
  from jolt.tasks import TaskRegistry
5
5
 
6
6
 
7
7
  @attributes.requires("requires_git")
8
8
  @cmake.requires()
9
9
  @cmake.use_ninja()
10
+ @cxxinfo.publish()
10
11
  class RapidJSON(cmake.CMake):
11
12
  name = "rapidjson"
12
13
  version = Parameter("24b5e7a", help="rapidjson version.")
@@ -18,9 +19,5 @@ class RapidJSON(cmake.CMake):
18
19
  "RAPIDJSON_BUILD_TESTS=OFF",
19
20
  ]
20
21
 
21
- def publish(self, artifact, tools):
22
- super().publish(artifact, tools)
23
- artifact.cxxinfo.incpaths.append("include")
24
-
25
22
 
26
23
  TaskRegistry.get().add_task_class(RapidJSON)
jolt/pkgs/rapidyaml.py CHANGED
@@ -1,11 +1,12 @@
1
1
  from jolt import attributes, BooleanParameter, Parameter
2
- from jolt.plugins import cmake, git
2
+ from jolt.plugins import cmake, cxxinfo, git
3
3
  from jolt.tasks import TaskRegistry
4
4
 
5
5
 
6
6
  @attributes.requires("requires_src")
7
7
  @cmake.requires()
8
8
  @cmake.use_ninja()
9
+ @cxxinfo.publish(libraries=["ryml", "c4core"])
9
10
  class RapidYAML(cmake.CMake):
10
11
  name = "rapidyaml"
11
12
  version = Parameter("0.7.0", help="RapidYAML version.")
@@ -17,12 +18,5 @@ class RapidYAML(cmake.CMake):
17
18
  "RYML_BUILD_TESTS=OFF",
18
19
  ]
19
20
 
20
- def publish(self, artifact, tools):
21
- super().publish(artifact, tools)
22
- artifact.cxxinfo.incpaths.append("include")
23
- artifact.cxxinfo.libpaths.append("lib")
24
- artifact.cxxinfo.libraries.append("ryml")
25
- artifact.cxxinfo.libraries.append("c4core")
26
-
27
21
 
28
22
  TaskRegistry.get().add_task_class(RapidYAML)
jolt/pkgs/re2.py CHANGED
@@ -1,6 +1,6 @@
1
1
  from jolt import attributes, BooleanParameter, Parameter
2
2
  from jolt.pkgs import cmake
3
- from jolt.plugins import git, cmake
3
+ from jolt.plugins import cxxinfo, git, cmake
4
4
  from jolt.tasks import TaskRegistry
5
5
 
6
6
 
@@ -8,6 +8,7 @@ from jolt.tasks import TaskRegistry
8
8
  @attributes.requires("requires_git")
9
9
  @cmake.requires()
10
10
  @cmake.use_ninja()
11
+ @cxxinfo.publish(libraries=["re2"])
11
12
  class RE2(cmake.CMake):
12
13
  name = "re2"
13
14
  version = Parameter("2025-11-05", help="re2 version.")
@@ -20,11 +21,5 @@ class RE2(cmake.CMake):
20
21
  "RE2_BUILD_TESTING=OFF",
21
22
  ]
22
23
 
23
- def publish(self, artifact, tools):
24
- super().publish(artifact, tools)
25
- artifact.cxxinfo.incpaths.append("include")
26
- artifact.cxxinfo.libpaths.append("lib")
27
- artifact.cxxinfo.libraries.append("re2")
28
-
29
24
 
30
25
  TaskRegistry.get().add_task_class(RE2)
jolt/pkgs/sdl.py CHANGED
@@ -1,6 +1,6 @@
1
1
  from jolt import BooleanParameter, Parameter, attributes
2
2
  from jolt.pkgs import cmake
3
- from jolt.plugins import cmake, git
3
+ from jolt.plugins import cmake, cxxinfo, git
4
4
  from jolt.tasks import TaskRegistry
5
5
 
6
6
 
@@ -8,6 +8,7 @@ from jolt.tasks import TaskRegistry
8
8
  @attributes.system
9
9
  @cmake.requires()
10
10
  @cmake.use_ninja()
11
+ @cxxinfo.publish()
11
12
  class SDL(cmake.CMake):
12
13
  name = "sdl"
13
14
  version = Parameter("3.2.28", help="SDL version.")
@@ -17,8 +18,6 @@ class SDL(cmake.CMake):
17
18
 
18
19
  def publish(self, artifact, tools):
19
20
  super().publish(artifact, tools)
20
- artifact.cxxinfo.incpaths.append("include")
21
- artifact.cxxinfo.libpaths.append("lib")
22
21
  if self.system == "windows":
23
22
  artifact.cxxinfo.libraries.append("SDL2{shared[,-static]}")
24
23
  else:
jolt/pkgs/simdjson.py CHANGED
@@ -1,12 +1,13 @@
1
1
  from jolt import attributes, BooleanParameter, Parameter
2
2
  from jolt.pkgs import cmake
3
- from jolt.plugins import git, cmake
3
+ from jolt.plugins import cxxinfo, git, cmake
4
4
  from jolt.tasks import TaskRegistry
5
5
 
6
6
 
7
7
  @attributes.requires("requires_git")
8
8
  @cmake.requires()
9
9
  @cmake.use_ninja()
10
+ @cxxinfo.publish(libraries=["simdjson"])
10
11
  class Simdjson(cmake.CMake):
11
12
  name = "simdjson"
12
13
  version = Parameter("4.2.4", help="simdjson version.")
@@ -17,11 +18,5 @@ class Simdjson(cmake.CMake):
17
18
  "BUILD_SHARED_LIBS={shared[ON,OFF]}",
18
19
  ]
19
20
 
20
- def publish(self, artifact, tools):
21
- super().publish(artifact, tools)
22
- artifact.cxxinfo.incpaths.append("include")
23
- artifact.cxxinfo.libpaths.append("lib")
24
- artifact.cxxinfo.libraries.append("simdjson")
25
-
26
21
 
27
22
  TaskRegistry.get().add_task_class(Simdjson)
jolt/pkgs/soci.py CHANGED
@@ -1,6 +1,6 @@
1
1
  from jolt import attributes, BooleanParameter, Parameter
2
2
  from jolt.pkgs import boost, cmake, mysql, sqlite
3
- from jolt.plugins import git, cmake
3
+ from jolt.plugins import cxxinfo, git, cmake
4
4
  from jolt.tasks import TaskRegistry
5
5
 
6
6
 
@@ -10,6 +10,7 @@ from jolt.tasks import TaskRegistry
10
10
  @attributes.requires("requires_sqlite_{sqlite[on,off]}")
11
11
  @cmake.requires()
12
12
  @cmake.use_ninja()
13
+ @cxxinfo.publish()
13
14
  class Soci(cmake.CMake):
14
15
  name = "soci"
15
16
  version = Parameter("4.1.2", help="Soci version")
@@ -33,8 +34,6 @@ class Soci(cmake.CMake):
33
34
 
34
35
  def publish(self, artifact, tools):
35
36
  super().publish(artifact, tools)
36
- artifact.cxxinfo.incpaths.append("include")
37
- artifact.cxxinfo.libpaths.append("lib")
38
37
  if self.sqlite:
39
38
  artifact.cxxinfo.libraries.append("soci_sqlite3")
40
39
  if self.mysql:
jolt/pkgs/spdlog.py CHANGED
@@ -1,12 +1,13 @@
1
1
  from jolt import attributes, BooleanParameter, Parameter
2
2
  from jolt.pkgs import cmake
3
- from jolt.plugins import git, cmake
3
+ from jolt.plugins import cxxinfo, git, cmake
4
4
  from jolt.tasks import TaskRegistry
5
5
 
6
6
 
7
7
  @attributes.requires("requires_git")
8
8
  @cmake.requires()
9
9
  @cmake.use_ninja()
10
+ @cxxinfo.publish(libraries=["spdlog"])
10
11
  class Spdlog(cmake.CMake):
11
12
  name = "spdlog"
12
13
  version = Parameter("1.16.0", help="spdlog version.")
@@ -19,11 +20,5 @@ class Spdlog(cmake.CMake):
19
20
  "SPDLOG_BUILD_TESTS=OFF",
20
21
  ]
21
22
 
22
- def publish(self, artifact, tools):
23
- super().publish(artifact, tools)
24
- artifact.cxxinfo.incpaths.append("include")
25
- artifact.cxxinfo.libpaths.append("lib")
26
- artifact.cxxinfo.libraries.append("spdlog")
27
-
28
23
 
29
24
  TaskRegistry.get().add_task_class(Spdlog)
jolt/pkgs/sqlite.py CHANGED
@@ -1,10 +1,11 @@
1
1
  from jolt import BooleanParameter, attributes, Alias, Parameter, Task
2
- from jolt.plugins import git, autotools
2
+ from jolt.plugins import cxxinfo, git, autotools
3
3
  from jolt.tasks import TaskRegistry
4
4
 
5
5
 
6
6
  @attributes.requires("requires_git")
7
7
  @autotools.requires()
8
+ @cxxinfo.publish(libraries=["sqlite3"])
8
9
  class SQLitePosix(autotools.Autotools):
9
10
  name = "sqlite/posix"
10
11
  version = Parameter("3.51.1", help="sqlite version.")
@@ -15,16 +16,10 @@ class SQLitePosix(autotools.Autotools):
15
16
  "--{shared[enable,disable]}-shared",
16
17
  ]
17
18
 
18
- def publish(self, artifact, tools):
19
- super().publish(artifact, tools)
20
- with tools.cwd(self.srcdir):
21
- artifact.cxxinfo.incpaths.append("include")
22
- artifact.cxxinfo.libpaths.append("lib")
23
- artifact.cxxinfo.libraries.append("sqlite3")
24
-
25
19
 
26
20
  @attributes.common_metadata()
27
21
  @attributes.requires("requires_git")
22
+ @cxxinfo.publish(libraries=["sqlite3"])
28
23
  class SQLiteWin32(Task):
29
24
  name = "sqlite/win32"
30
25
  version = Parameter("3.51.1", help="sqlite version.")
@@ -61,9 +56,6 @@ Cflags: -I${{includedir}}
61
56
  artifact.collect("sqlite3.exe", "bin/")
62
57
  artifact.collect("sqlite*.h", "include/")
63
58
  artifact.collect("sqlite3.pc", "lib/pkgconfig/")
64
- artifact.cxxinfo.incpaths.append("include")
65
- artifact.cxxinfo.libpaths.append("lib")
66
- artifact.cxxinfo.libraries.append("sqlite3")
67
59
  artifact.environ.CMAKE_PREFIX_PATH.append(".")
68
60
 
69
61
 
jolt/pkgs/ssl.py CHANGED
@@ -5,7 +5,7 @@ from jolt.tasks import TaskRegistry
5
5
 
6
6
  class VirtualSsl(Alias):
7
7
  name = "virtual/ssl"
8
- shared = BooleanParameter(True, help="Use shared libraries.")
8
+ shared = BooleanParameter(False, help="Use shared libraries.")
9
9
  requires = ["openssl:shared={shared}"]
10
10
 
11
11
 
jolt/pkgs/xz.py CHANGED
@@ -1,5 +1,5 @@
1
1
  from jolt import attributes, BooleanParameter, Parameter
2
- from jolt.plugins import git, cmake
2
+ from jolt.plugins import cxxinfo, git, cmake
3
3
  from jolt.tasks import TaskRegistry
4
4
 
5
5
 
@@ -7,6 +7,7 @@ from jolt.tasks import TaskRegistry
7
7
  @cmake.requires()
8
8
  @cmake.use_ninja()
9
9
  @cmake.options("options_pic_{pic[on,off]}")
10
+ @cxxinfo.publish(libraries=["lzma"])
10
11
  class Xz(cmake.CMake):
11
12
  name = "xz"
12
13
  version = Parameter("5.8.2", help="xz version.")
@@ -19,11 +20,5 @@ class Xz(cmake.CMake):
19
20
  "CMAKE_POSITION_INDEPENDENT_CODE=ON",
20
21
  ]
21
22
 
22
- def publish(self, artifact, tools):
23
- super().publish(artifact, tools)
24
- artifact.cxxinfo.incpaths.append("include")
25
- artifact.cxxinfo.libpaths.append("lib")
26
- artifact.cxxinfo.libraries.append("lzma")
27
-
28
23
 
29
24
  TaskRegistry.get().add_task_class(Xz)
jolt/pkgs/yamlcpp.py CHANGED
@@ -1,6 +1,6 @@
1
1
  from jolt import attributes, BooleanParameter, Parameter
2
2
  from jolt.pkgs import cmake
3
- from jolt.plugins import git, cmake, pkgconfig
3
+ from jolt.plugins import cxxinfo, git, cmake, pkgconfig
4
4
  from jolt.tasks import TaskRegistry
5
5
 
6
6
 
@@ -8,6 +8,7 @@ from jolt.tasks import TaskRegistry
8
8
  @attributes.system
9
9
  @cmake.requires()
10
10
  @cmake.use_ninja()
11
+ @cxxinfo.publish(libraries=["yaml-cpp"])
11
12
  class YamlCPP(cmake.CMake):
12
13
  name = "yaml-cpp"
13
14
  version = Parameter("bbf8bdb", help="yaml-cpp version.")
@@ -20,11 +21,5 @@ class YamlCPP(cmake.CMake):
20
21
  "YAML_BUILD_TOOLS=OFF",
21
22
  ]
22
23
 
23
- def publish(self, artifact, tools):
24
- super().publish(artifact, tools)
25
- artifact.cxxinfo.incpaths.append("include")
26
- artifact.cxxinfo.libpaths.append("lib")
27
- artifact.cxxinfo.libraries.append("yaml-cpp")
28
-
29
24
 
30
25
  TaskRegistry.get().add_task_class(YamlCPP)
jolt/pkgs/zeromq.py CHANGED
@@ -1,12 +1,13 @@
1
1
  from jolt import attributes, BooleanParameter, Parameter
2
2
  from jolt.pkgs import openssl
3
- from jolt.plugins import cmake, git
3
+ from jolt.plugins import cmake, cxxinfo, git
4
4
  from jolt.tasks import TaskRegistry
5
5
 
6
6
 
7
7
  @attributes.requires("requires_git")
8
8
  @cmake.requires()
9
9
  @cmake.use_ninja()
10
+ @cxxinfo.publish(libraries=["zmq"])
10
11
  class Libzmq(cmake.CMake):
11
12
  name = "libzmq"
12
13
  version = Parameter("4.3.5", help="ZeroMQ version.")
@@ -19,17 +20,12 @@ class Libzmq(cmake.CMake):
19
20
  "CMAKE_POLICY_VERSION_MINIMUM=3.5",
20
21
  ]
21
22
 
22
- def publish(self, artifact, tools):
23
- super().publish(artifact, tools)
24
- artifact.cxxinfo.incpaths.append("include")
25
- artifact.cxxinfo.libpaths.append("lib")
26
- artifact.cxxinfo.libraries.append("zmq")
27
-
28
23
 
29
24
  @attributes.requires("requires_git")
30
25
  @attributes.requires("requires_libzmq")
31
26
  @cmake.requires()
32
27
  @cmake.use_ninja()
28
+ @cxxinfo.publish()
33
29
  class Cppzmq(cmake.CMake):
34
30
  name = "cppzmq"
35
31
  version = Parameter("4.11.0", help="cppzmq version.")
@@ -38,10 +34,6 @@ class Cppzmq(cmake.CMake):
38
34
  srcdir = "{git[cppzmq]}"
39
35
  options = ["CPPZMQ_BUILD_TESTS=OFF"]
40
36
 
41
- def publish(self, artifact, tools):
42
- super().publish(artifact, tools)
43
- artifact.cxxinfo.incpaths.append("include")
44
-
45
37
 
46
38
  TaskRegistry.get().add_task_class(Libzmq)
47
39
  TaskRegistry.get().add_task_class(Cppzmq)