spl-core 7.2.0__tar.gz → 7.2.2__tar.gz

{spl_core-7.2.0 → spl_core-7.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: spl-core
-Version: 7.2.0
+Version: 7.2.2
 Summary: Software Product Line Support for CMake
 License: MIT
 Author: Avengineers

{spl_core-7.2.0 → spl_core-7.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "spl-core"
-version = "7.2.0"
+version = "7.2.2"
 description = "Software Product Line Support for CMake"
 authors = ["Avengineers <karsten.guenther@kamg.de>"]
 license = "MIT"
@@ -50,7 +50,6 @@ sphinx-design = "^0.5"
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.0"
 pytest-cov = "^4.0"
-black = "^23.1.0"
 pre-commit = "^3.1.1"
 ruff = "^0.5"
 jinja2 = "*"

spl_core-7.2.2/src/spl_core/__init__.py

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

{spl_core-7.2.0 → spl_core-7.2.2}/src/spl_core/common.cmake

@@ -701,13 +701,7 @@ macro(spl_run_conan)
 endmacro(spl_run_conan)
 
 macro(_spl_set_ninja_wrapper_as_cmake_make)
-    # if CMAKE_BUILD_TYPE is not empty, NINJA_WRAPPER should be placed in the build directory with build type
-    if(CMAKE_BUILD_TYPE)
-        set(NINJA_WRAPPER ${CMAKE_SOURCE_DIR}/build/${VARIANT}/${BUILD_KIT}/${CMAKE_BUILD_TYPE}/ninja_wrapper.bat)
-    else()
-        set(NINJA_WRAPPER ${CMAKE_SOURCE_DIR}/build/${VARIANT}/${BUILD_KIT}/ninja_wrapper.bat)
-    endif()
-
+    set (NINJA_WRAPPER ${CMAKE_CURRENT_BINARY_DIR}/ninja_wrapper.bat)
     file(WRITE ${NINJA_WRAPPER}
         "@echo off
 @call %~dp0%/activate_run.bat

{spl_core-7.2.0 → spl_core-7.2.2}/src/spl_core/gcov_maid/gcov_maid.py

@@ -4,12 +4,8 @@ from pathlib import Path
 
 def main() -> None:
     parser = argparse.ArgumentParser(description="Script with command line options")
-    parser.add_argument(
-        "--working-dir", help="Working directory", required=True
-    )  # Make the option mandatory
-    parser.add_argument(
-        "--wipe-all-gcda", action="store_true", help="Wipe all gcda files recursively"
-    )
+    parser.add_argument("--working-dir", help="Working directory", required=True)  # Make the option mandatory
+    parser.add_argument("--wipe-all-gcda", action="store_true", help="Wipe all gcda files recursively")
     parser.add_argument(
         "--wipe-orphaned-gcno",
         action="store_true",

{spl_core-7.2.0 → spl_core-7.2.2}/src/spl_core/kickstart/templates/project/.vscode/settings.json

@@ -1,45 +1,45 @@
-{
-    "python.testing.pytestEnabled": true,
-    "python.testing.pytestArgs": [
-        "test"
-    ],
-    "python.testing.unittestEnabled": false,
-    "python.analysis.extraPaths": [
-        "test"
-    ],
-    "cmake.configureOnOpen": false,
-    "cmake.buildDirectory": "${workspaceFolder}/build/${variant:variant}/${buildKit}",
-    "cmake.configureSettings": {
-        "BUILD_KIT": "${buildKit}",
-        "CMAKE_MESSAGE_LOG_LEVEL": "STATUS"
-    },
-    "cmake.generator": "Ninja",
-    "cmake.debugConfig": {
-        "MIMode": "gdb",
-        "miDebuggerPath": "gdb",
-        "stopAtEntry": true
-    },
-    "cmake.configureOnEdit": false,
-    "cmake.buildBeforeRun": false,
-    "cmake.environment": {
-        "PIPENV_VERBOSITY": "-1",
-        "PIPENV_VENV_IN_PROJECT": "1"
-    },
-    "cmake.buildToolArgs": [],
-    "git.ignoreLimitWarning": true,
-    "C_Cpp.errorSquiggles": "enabled",
-    "C_Cpp.default.cStandard": "gnu17",
-    "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
-    "C_Cpp.formatting": "vcFormat",
-    "files.associations": {
-        "*.h": "c",
-        "*.c": "c",
-        "Jenkinsfile": "groovy",
-        "*.py": "python"
-    },
-    "git.repositoryScanMaxDepth": 3,
-    "git-graph.maxDepthOfRepoSearch": 3,
-    "[python]": {
-        "editor.defaultFormatter": "ms-python.black-formatter"
-    }
-}
+{
+    "python.testing.pytestEnabled": true,
+    "python.testing.pytestArgs": [
+        "test"
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.analysis.extraPaths": [
+        "test"
+    ],
+    "cmake.configureOnOpen": false,
+    "cmake.buildDirectory": "${workspaceFolder}/build/${variant:variant}/${buildKit}",
+    "cmake.configureSettings": {
+        "BUILD_KIT": "${buildKit}",
+        "CMAKE_MESSAGE_LOG_LEVEL": "STATUS"
+    },
+    "cmake.generator": "Ninja",
+    "cmake.debugConfig": {
+        "MIMode": "gdb",
+        "miDebuggerPath": "gdb",
+        "stopAtEntry": true
+    },
+    "cmake.configureOnEdit": false,
+    "cmake.buildBeforeRun": false,
+    "cmake.environment": {
+        "PIPENV_VERBOSITY": "-1",
+        "PIPENV_VENV_IN_PROJECT": "1"
+    },
+    "cmake.buildToolArgs": [],
+    "git.ignoreLimitWarning": true,
+    "C_Cpp.errorSquiggles": "enabled",
+    "C_Cpp.default.cStandard": "gnu17",
+    "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
+    "C_Cpp.formatting": "vcFormat",
+    "files.associations": {
+        "*.h": "c",
+        "*.c": "c",
+        "Jenkinsfile": "groovy",
+        "*.py": "python"
+    },
+    "git.repositoryScanMaxDepth": 3,
+    "git-graph.maxDepthOfRepoSearch": 3,
+    "[python]": {
+        "editor.defaultFormatter": "charliermarsh.ruff"
+    }
+}

{spl_core-7.2.0 → spl_core-7.2.2}/src/spl_core/spl.cmake

@@ -16,7 +16,7 @@ string(REPLACE "/" "_" BINARY_BASENAME ${VARIANT})
 # Set SPL relevant variables as environment variables.
 # Can easily be extended in CMakeLists.txt of project.
 # Also used for KConfig variable expansion.
-list(APPEND ENVVARS FLAVOR SUBSYSTEM VARIANT BUILD_KIT CMAKE_BUILD_TYPE BINARY_BASENAME CMAKE_SOURCE_DIR)
+list(APPEND ENVVARS FLAVOR SUBSYSTEM VARIANT BUILD_KIT BUILD_TYPE BINARY_BASENAME CMAKE_SOURCE_DIR)
 
 foreach(ENVVAR IN LISTS ENVVARS)
     set(ENV{${ENVVAR}} "${${ENVVAR}}")

spl_core-7.2.0/src/spl_core/__init__.py

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