jolt 0.9.430__tar.gz → 0.9.435__tar.gz

{jolt-0.9.430 → jolt-0.9.435}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jolt
-Version: 0.9.430
+Version: 0.9.435
 Summary: A task executor
 Home-page: https://github.com/srand/jolt
 Author: Robert Andersson

{jolt-0.9.430 → jolt-0.9.435}/jolt/pkgs/cli11.py

@@ -12,6 +12,7 @@ class CLI11(cmake.CMake):
     requires_src = ["fetch:alias=src,url=https://github.com/CLIUtils/CLI11/archive/refs/tags/v{version}.tar.gz"]
     srcdir = "{fetch[src]}/CLI11-{version}"
     options = [
+        "CLI11_BUILD_EXAMPLES=OFF",
         "CLI11_BUILD_TESTS=OFF",
     ]
 

{jolt-0.9.430 → jolt-0.9.435}/jolt/pkgs/zlib.py

@@ -25,12 +25,30 @@ class Zlib(cmake.CMake):
         artifact.cxxinfo.incpaths.append("include")
         artifact.cxxinfo.libpaths.append("lib")
         if self.system == "windows":
+            self.publish_windows(artifact, tools)
+        else:
+            self.publish_unix(artifact, tools)
+
+    def publish_unix(self, artifact, tools):
+        artifact.cxxinfo.libraries.append("z")
+        with tools.cwd(artifact.path, "lib"):
+            if self.shared:
+                for lib in tools.glob("*.a"):
+                    tools.unlink(lib)
+            else:
+                for lib in tools.glob("*.so*") + tools.glob("*.dylib*"):
+                    tools.unlink(lib)
+
+    def publish_windows(self, artifact, tools):
+        with tools.cwd(artifact.path, "lib"):
             if self.shared:
                 artifact.cxxinfo.libraries.append("zlib")
+                for lib in tools.glob("zlibstatic.*"):
+                    tools.unlink(lib)
             else:
                 artifact.cxxinfo.libraries.append("zlibstatic")
-        else:
-            artifact.cxxinfo.libraries.append("z")
+                for lib in tools.glob("zlib.*"):
+                    tools.unlink(lib)
 
 
 @attributes.requires("requires_git")

{jolt-0.9.430 → jolt-0.9.435}/jolt/plugins/cxxinfo.py

@@ -31,8 +31,8 @@ class CppInfo(ArtifactAttributeSet):
             return CppInfoListVariable(self._artifact, "asflags")
         if name == "cflags":
             return CppInfoListVariable(self._artifact, "cflags")
-        if name == "crt":
-            return CppInfoStringVariable(self._artifact, "crt")
+        if name == "msvcrt":
+            return CppInfoStringVariable(self._artifact, "msvcrt")
         if name == "cxxflags":
             return CppInfoListVariable(self._artifact, "cxxflags")
         if name == "incpaths":

{jolt-0.9.430 → jolt-0.9.435}/jolt/plugins/ninja.py

@@ -22,8 +22,8 @@ from jolt.error import raise_task_error_if
 from jolt.error import JoltError, JoltCommandError
 
 
-c_standard_default = 17
-cxx_standard_default = 17
+c_standard_default = None
+cxx_standard_default = None
 c_standards_list = [90, 99, 11, 17, 23]
 cxx_standards_list = [98, 11, 14, 17, 20, 23, 26]
 
@@ -1838,13 +1838,13 @@ class MSVCCRT(Variable):
 
     def _select_dep_flags(self, project, dep):
         crt = self._select_flag(dep.cxxinfo.asflags.items())
-        if hasattr(dep.cxxinfo, "crt"):
-            crt = self._combine(project, crt, self._select_flag([str(dep.cxxinfo.crt)]))
+        if hasattr(dep.cxxinfo, "msvcrt"):
+            crt = self._combine(project, crt, self._select_flag([str(dep.cxxinfo.msvcrt)]))
         crt = self._combine(project, crt, self._select_flag(dep.cxxinfo.cflags.items()))
         return self._combine(project, crt, self._select_flag(dep.cxxinfo.cxxflags.items()))
 
     def create(self, project, writer, deps, tools):
-        crt = self._select_flag(getattr(project, "crt", None))
+        crt = self._select_flag(getattr(project, "msvcrt", None))
         crt = self._combine(project, crt, self._select_flag(project._asflags()))
         crt = self._combine(project, crt, self._select_flag(project._cflags()))
         crt = self._combine(project, crt, self._select_flag(project._cxxflags()))
@@ -1854,7 +1854,7 @@ class MSVCCRT(Variable):
 
     @utils.cached.instance
     def get_influence(self, task):
-        return "CRT"
+        return "MSVC-CRT"
 
 
 MSVCCompiler = GNUCompiler
@@ -2008,7 +2008,7 @@ class CXXProject(Task):
 
     cstd = None
     """
-    C language standard to use (int). Default: 17
+    C language standard to use (int). Default: Compiler default
 
     If the chosen standard is not supported, the nearest supported standard is selected.
     """
@@ -2018,7 +2018,7 @@ class CXXProject(Task):
 
     cxxstd = None
     """
-    C++ language standard to use (int). Default: 17
+    C++ language standard to use (int). Default: Compiler default
 
     If the chosen standard is not supported, the nearest supported standard is selected.
     """

{jolt-0.9.430 → jolt-0.9.435}/jolt/tasks.py

@@ -1704,6 +1704,9 @@ class TaskBase(object):
                 "Required parameter '{0}' has not been set", key)
 
     def _verify_influence(self, deps, artifact, tools, sources=None):
+        if "configurationrepository" in self.name:
+            breakpoint()
+
         # Verify that any transformed sources are influencing
         sources = set(map(tools.expand_path, sources or []))
 
@@ -1720,29 +1723,29 @@ class TaskBase(object):
                 return not fs.is_relative_to(fname, rootpath)
             return _filter
 
+        # Ignore any files in build directories
+        sources = filter(_subpath_filter(tools.expand_path(tools.buildroot)), sources)
+
         for _, dep in deps.items():
             deptask = dep.task
             if isinstance(deptask, FileInfluence):
                 # Resource dependencies may cover the influence implicitly
                 deppath = self.tools.expand_path(str(deptask.path))
-                sources = set(filter(lambda d: not deptask.is_influenced_by(self, d), sources))
+                sources = filter(lambda d, dt=deptask: not dt.is_influenced_by(self, d), sources)
             else:
                 # Ignore any files in artifacts
                 deppath = self.tools.expand_path(dep.path)
-                sources = set(filter(_subpath_filter(deppath), sources))
-
-        # Ignore any files in build directories
-        sources = filter(_subpath_filter(tools.expand_path(tools.buildroot)), sources)
-        sources = set(sources)
+                sources = filter(_subpath_filter(deppath), sources)
 
         for ip in self.influence:
             if not isinstance(ip, FileInfluence):
                 continue
-            ok = [source for source in sources if ip.is_influenced_by(self, source)]
-            sources.difference_update(ok)
+            sources = {source for source in sources if not ip.is_influenced_by(self, source)}
+
         for source in sources:
             log.warning("Missing influence: {} ({})", source, self.name)
-        raise_task_error_if(sources, self, "Task is missing source influence")
+
+        raise_task_error_if(set(sources), self, "Task is missing source influence")
 
     def _get_export_objects(self):
         return self._exports

jolt-0.9.435/jolt/version.py

@@ -0,0 +1 @@
+__version__ = "0.9.435"

{jolt-0.9.430 → jolt-0.9.435}/jolt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jolt
-Version: 0.9.430
+Version: 0.9.435
 Summary: A task executor
 Home-page: https://github.com/srand/jolt
 Author: Robert Andersson

jolt-0.9.430/jolt/version.py

@@ -1 +0,0 @@
-__version__ = "0.9.430"