spl-core 6.5.0__tar.gz → 7.1.0__tar.gz

{spl_core-6.5.0 → spl_core-7.1.0}/PKG-INFO

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

{spl_core-6.5.0 → spl_core-7.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "spl-core"
-version = "6.5.0"
+version = "7.1.0"
 description = "Software Product Line Support for CMake"
 authors = ["Avengineers <karsten.guenther@kamg.de>"]
 license = "MIT"

spl_core-7.1.0/src/spl_core/__init__.py

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

{spl_core-6.5.0 → spl_core-7.1.0}/src/spl_core/common.cmake

@@ -528,7 +528,7 @@ macro(_spl_add_test_suite COMPONENT_NAME PROD_SRC TEST_SOURCES)
     target_compile_options(${exe_name} PRIVATE ${TEST_COMPILE_OPTIONS})
 
     # Coverage data is only generated for the component's sources
-    target_compile_options(${COMPONENT_NAME} PRIVATE --coverage ${TEST_COMPILE_OPTIONS})
+    target_compile_options(${COMPONENT_NAME} PRIVATE --coverage -fcondition-coverage ${TEST_COMPILE_OPTIONS})
 
     # Define list of test specific compile options for all sources
     # SPLE_UNIT_TESTING: add possibility to configure the code for unit testing
@@ -547,7 +547,7 @@ macro(_spl_add_test_suite COMPONENT_NAME PROD_SRC TEST_SOURCES)
     target_compile_definitions(${COMPONENT_NAME} PRIVATE ${TEST_COMPILE_DEFINITIONS})
 
     target_link_options(${exe_name}
-        PRIVATE -ggdb --coverage
+        PRIVATE -ggdb --coverage -fcondition-coverage
     )
 
     add_custom_command(
@@ -684,7 +684,12 @@ macro(spl_run_conan)
 endmacro(spl_run_conan)
 
 macro(_spl_set_ninja_wrapper_as_cmake_make)
-    set(NINJA_WRAPPER ${CMAKE_SOURCE_DIR}/build/${VARIANT}/${BUILD_KIT}/ninja_wrapper.bat)
+    # 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()
     file(WRITE ${NINJA_WRAPPER}
         "@echo off
 @call %~dp0%/activate_run.bat

{spl_core-6.5.0 → spl_core-7.1.0}/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 BINARY_BASENAME CMAKE_SOURCE_DIR)
+list(APPEND ENVVARS FLAVOR SUBSYSTEM VARIANT BUILD_KIT CMAKE_BUILD_TYPE BINARY_BASENAME CMAKE_SOURCE_DIR)
 
 foreach(ENVVAR IN LISTS ENVVARS)
     set(ENV{${ENVVAR}} "${${ENVVAR}}")

{spl_core-6.5.0 → spl_core-7.1.0}/src/spl_core/test_utils/base_variant_test_runner.py

@@ -1,7 +1,7 @@
 import re
 from abc import ABC, abstractmethod
 from pathlib import Path
-from typing import List
+from typing import List, Optional
 
 import pytest
 
@@ -60,8 +60,8 @@ class BaseVariantTestRunner(ABC):
             assert Path.joinpath(dir, artifact).exists(), f"Artifact {Path.joinpath(dir, artifact)} does not exist"  # noqa: S101
 
     @pytest.mark.build
-    def test_build(self) -> None:
-        spl_build: SplBuild = SplBuild(variant=self.variant, build_kit="prod")
+    def test_build(self, build_type: Optional[str] = None) -> None:
+        spl_build: SplBuild = SplBuild(variant=self.variant, build_kit="prod", build_type=build_type)
         assert 0 == spl_build.execute(target="all")  # noqa: S101
         for artifact in self.expected_build_artifacts:
             self.assert_artifact_exists(dir=spl_build.build_dir, artifact=artifact)
@@ -72,15 +72,15 @@ class BaseVariantTestRunner(ABC):
             spl_build.create_artifacts_json(self.expected_archive_artifacts)
 
     @pytest.mark.unittests
-    def test_unittests(self) -> None:
-        spl_build: SplBuild = SplBuild(variant=self.variant, build_kit="test")
+    def test_unittests(self, build_type: Optional[str] = None) -> None:
+        spl_build: SplBuild = SplBuild(variant=self.variant, build_kit="test", build_type=build_type)
         assert 0 == spl_build.execute(target="unittests")  # noqa: S101
         for artifact in self.expected_test_artifacts:
             self.assert_artifact_exists(dir=spl_build.build_dir, artifact=artifact)
 
     @pytest.mark.reports
-    def test_reports(self) -> None:
-        spl_build: SplBuild = SplBuild(variant=self.variant, build_kit="test")
+    def test_reports(self, build_type: Optional[str] = None) -> None:
+        spl_build: SplBuild = SplBuild(variant=self.variant, build_kit="test", build_type=build_type)
         assert 0 == spl_build.execute(target="all")  # noqa: S101
         for artifact in self.expected_variant_report_artifacts:
             self.assert_artifact_exists(dir=spl_build.build_dir, artifact=artifact)

{spl_core-6.5.0 → spl_core-7.1.0}/src/spl_core/test_utils/spl_build.py

@@ -41,17 +41,19 @@ class ArtifactsCollection:
 class SplBuild:
     """Class for building an SPL repository."""
 
-    def __init__(self, variant: str, build_kit: str):
+    def __init__(self, variant: str, build_kit: str, build_type: Optional[str] = None) -> None:
         """
         Initialize a SplBuild instance.
 
         Args:
             variant (str): The build variant.
             build_kit (str): The build kit.
+            build_type (str, optional): The build type. Defaults to None.
 
         """
         self.variant = variant
         self.build_kit = build_kit
+        self.build_type = build_type
 
     @property
     def build_dir(self) -> Path:
@@ -62,6 +64,8 @@ class SplBuild:
             Path: The build directory path.
 
         """
+        if self.build_type:
+            return Path(f"build/{self.variant}/{self.build_kit}/{self.build_type}")
         return Path(f"build/{self.variant}/{self.build_kit}")
 
     @time_it()
@@ -91,6 +95,8 @@ class SplBuild:
                 target,
                 "-reconfigure",
             ]
+            if self.build_type:
+                cmd.extend(["-buildType", self.build_type])
             cmd.extend(additional_args)
             result = CommandLineExecutor().execute(cmd)
             return_code = result.returncode
@@ -155,6 +161,8 @@ class SplBuild:
             "build_kit": self.build_kit,
             "artifacts": [str(artifact.archive_path.as_posix()) for artifact in artifacts_collection.archive_artifacts],
         }
+        if self.build_type:
+            json_content["build_type"] = self.build_type
         json_path = self.build_dir / "artifacts.json"
 
         json_path.write_text(json.dumps(json_content, indent=4))

spl_core-6.5.0/src/spl_core/__init__.py

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