spl-core 7.0.0__py3-none-any.whl → 7.1.0__py3-none-any.whl

spl_core/__init__.py

@@ -1 +1 @@
-__version__ = "7.0.0"
+__version__ = "7.1.0"

spl_core/common.cmake

@@ -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/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/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/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-7.0.0.dist-info → spl_core-7.1.0.dist-info}/METADATA

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

{spl_core-7.0.0.dist-info → spl_core-7.1.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
-spl_core/__init__.py,sha256=VgMOOqsYbyb60I1RmlZpqwqQ0C0IyT3R0c8_xX4pRGM,22
+spl_core/__init__.py,sha256=vrQk6cOG_uk0gOqN4qh7NRCxezXfvhv9tT7bwYHyTck,22
 spl_core/__run.py,sha256=DphnN7_Bjiw_mOOztsHxTDHS8snz1g2MMWAaJpZxPKM,361
 spl_core/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spl_core/common/command_line_executor.py,sha256=GHIMpNiMD_eP44vq7L_HiC08aKt7lgW_wn_omU6REwQ,2217
 spl_core/common/path.py,sha256=sDujd3n4XP1XGjHc7ImXEdjihO6A8BOIDbKCf7HgQ0Y,462
-spl_core/common.cmake,sha256=ti57PmtZM2-7c1J8u7kyL-mFSyySlipG6-evO5iwH2o,32457
+spl_core/common.cmake,sha256=ZVGny3AdQaJxTh9GFuRV6eR79wzNPVw5CHFV9uAY0EU,32734
 spl_core/conan.cmake,sha256=i1AuyN-e8cczX7TI1nl6e3Y8N-EP-QXPVY7LG6NUyJY,41958
 spl_core/config/KConfig,sha256=atlUwl0kPIdoGjbOI2PoaCQ2wgao7-mblZKn3dXUCxI,1755
 spl_core/gcov_maid/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -57,11 +57,11 @@ spl_core/kickstart/templates/project/scoopfile.json,sha256=DcfZ8jYf9hmPHM-AWwnPK
 spl_core/kickstart/templates/project/tools/toolchains/clang/toolchain.cmake,sha256=fDD-eb6DeqmAYkCbILL2V5PLnCPRdTu1Tpg0WfDC_dE,713
 spl_core/kickstart/templates/project/tools/toolchains/gcc/toolchain.cmake,sha256=AmLzPyhTgfc_Dsre4AlsvSOkVGW6VswWvrEnUL8JLhA,183
 spl_core/main.py,sha256=_hL4j155WZMXog_755bgAH1PeUwvTdJZvVdVw9EWhvo,1225
-spl_core/spl.cmake,sha256=uG1tnDba1Tgjj1ql5rgIRJFkfi9CY9IHoYLePWklYxw,4524
-spl_core/test_utils/base_variant_test_runner.py,sha256=jW9mRbSI0rSFLh-lOwkj7oJgyk2xm07Dw63vhJmnE3s,3312
-spl_core/test_utils/spl_build.py,sha256=TtYFTY94Fa9eXdtY9NavrCulx-NEONRm81GSLHGB_yQ,5599
-spl_core-7.0.0.dist-info/LICENSE,sha256=UjjA0o8f5tT3wVm7qodTLAhPWLl6kgVyn9FPAd1VeYY,1099
-spl_core-7.0.0.dist-info/METADATA,sha256=PkPU9AH72pbvPoL2jBTkzjlUOD9SdvbvYV7xwuiltsY,5160
-spl_core-7.0.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-spl_core-7.0.0.dist-info/entry_points.txt,sha256=18_sdVY93N1GVBiAHxQ_F9ZM-bBvOmVMOMn7PNe2EqU,45
-spl_core-7.0.0.dist-info/RECORD,,
+spl_core/spl.cmake,sha256=42gb79k9nNklSdlx9F-yr-DDkGGxB56FnAnX35thvco,4541
+spl_core/test_utils/base_variant_test_runner.py,sha256=E5EtAX5qTLQbofIZ9eZoCx2SNd1CTm1HtEKqEn014fA,3493
+spl_core/test_utils/spl_build.py,sha256=OO7rIZpBb7EP87D39NeTK4XH17x3xNfwRI5YHPBvGgY,6041
+spl_core-7.1.0.dist-info/LICENSE,sha256=UjjA0o8f5tT3wVm7qodTLAhPWLl6kgVyn9FPAd1VeYY,1099
+spl_core-7.1.0.dist-info/METADATA,sha256=LPWI5Z_zUkSgeqPPbUCWp8am-IeXg4pcCdlCuLP2C04,5160
+spl_core-7.1.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+spl_core-7.1.0.dist-info/entry_points.txt,sha256=18_sdVY93N1GVBiAHxQ_F9ZM-bBvOmVMOMn7PNe2EqU,45
+spl_core-7.1.0.dist-info/RECORD,,

{spl_core-7.0.0.dist-info → spl_core-7.1.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.1
+Generator: poetry-core 2.1.2
 Root-Is-Purelib: true
 Tag: py3-none-any