spl-core 7.1.1rc1__py3-none-any.whl → 7.2.1__py3-none-any.whl

spl_core/__init__.py

@@ -1 +1 @@
-__version__ = "7.1.1-rc.1"
+__version__ = "7.2.1"

spl_core/common.cmake

@@ -505,30 +505,18 @@ function(_spl_coverage_create_overall_report)
     endif(_SPL_COVERAGE_CREATE_OVERALL_REPORT_IS_NECESSARY)
 endfunction(_spl_coverage_create_overall_report)
 
-macro(_spl_add_test_suite COMPONENT_NAME PROD_SRC TEST_SOURCES)
-    _spl_set_coverage_create_overall_report_is_necessary()
-
-    set(exe_name ${COMPONENT_NAME}_test)
-    set(PROD_PARTIAL_LINK prod_partial_${COMPONENT_NAME}.obj)
-    set(MOCK_SRC mockup_${COMPONENT_NAME}.cc)
-
-    add_executable(${exe_name}
-        ${TEST_SOURCES}
-        ${MOCK_SRC}
-    )
-
-    # Create the component library
-    add_library(${COMPONENT_NAME} OBJECT ${SOURCES})
+macro(_spl_set_test_compile_and_link_options compilerId compilerVersion)
+    if(NOT ${compilerId} STREQUAL "GNU")
+        message(FATAL_ERROR "Unsupported compiler: ${compilerId} ${compilerVersion}")
+    endif()
 
     # Define list of test specific compile options for all sources
     # -ggdb: Produce debugging information to be able to set breakpoints.
     # -save-temps: save temporary files like preprocessed ones for debugging purposes
     set(TEST_COMPILE_OPTIONS -ggdb -save-temps)
 
-    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 -fcondition-coverage ${TEST_COMPILE_OPTIONS})
+    set(COMPONENT_TEST_COMPILE_OPTIONS --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
@@ -542,14 +530,43 @@ macro(_spl_add_test_suite COMPONENT_NAME PROD_SRC TEST_SOURCES)
         static_scope_file=
     )
 
-    target_compile_definitions(${exe_name} PRIVATE ${TEST_COMPILE_DEFINITIONS})
+    set(TEST_LINK_OPTIONS -ggdb --coverage)
 
-    target_compile_definitions(${COMPONENT_NAME} PRIVATE ${TEST_COMPILE_DEFINITIONS})
+    if(${compilerVersion} VERSION_GREATER_EQUAL 14.2)
+        # -fcondition-coverage: generate coverage data for conditionals
+        list(APPEND COMPONENT_TEST_COMPILE_OPTIONS -fcondition-coverage)
+        list(APPEND TEST_LINK_OPTIONS -fcondition-coverage)
+        message(STATUS "Condition coverage is enabled.")
+    else()
+        message(STATUS "Condition coverage is not supported by this compiler version.")
+    endif()
+endmacro(_spl_set_test_compile_and_link_options)
+
+macro(_spl_add_test_suite COMPONENT_NAME PROD_SRC TEST_SOURCES)
+    _spl_set_coverage_create_overall_report_is_necessary()
+
+    set(exe_name ${COMPONENT_NAME}_test)
+    set(PROD_PARTIAL_LINK prod_partial_${COMPONENT_NAME}.obj)
+    set(MOCK_SRC mockup_${COMPONENT_NAME}.cc)
 
-    target_link_options(${exe_name}
-        PRIVATE -ggdb --coverage -fcondition-coverage
+    _spl_set_test_compile_and_link_options(${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION})
+
+    add_executable(${exe_name}
+        ${TEST_SOURCES}
+        ${MOCK_SRC}
     )
 
+    target_compile_options(${exe_name} PRIVATE ${TEST_COMPILE_OPTIONS})
+    target_compile_definitions(${exe_name} PRIVATE ${TEST_COMPILE_DEFINITIONS})
+    target_link_options(${exe_name} PRIVATE ${TEST_LINK_OPTIONS})
+
+    # Create the component library for its productive sources
+    add_library(${COMPONENT_NAME} OBJECT ${SOURCES})
+
+    target_compile_options(${COMPONENT_NAME} PRIVATE ${COMPONENT_TEST_COMPILE_OPTIONS})
+
+    target_compile_definitions(${COMPONENT_NAME} PRIVATE ${TEST_COMPILE_DEFINITIONS})
+
     add_custom_command(
         OUTPUT ${PROD_PARTIAL_LINK}
         COMMAND ${CMAKE_CXX_COMPILER} -r -nostdlib -o ${PROD_PARTIAL_LINK} $<TARGET_OBJECTS:${COMPONENT_NAME}>
@@ -626,7 +643,7 @@ macro(_spl_add_test_suite COMPONENT_NAME PROD_SRC TEST_SOURCES)
     )
 
     gtest_discover_tests(${exe_name})
-endmacro()
+endmacro(_spl_add_test_suite)
 
 macro(spl_add_conan_requires requirement)
     list(APPEND CONAN__REQUIRES ${requirement})
@@ -684,13 +701,13 @@ macro(spl_run_conan)
 endmacro(spl_run_conan)
 
 macro(_spl_set_ninja_wrapper_as_cmake_make)
-    # if BUILD_TYPE is not empty, NINJA_WRAPPER should be placed in the build directory with build type
-
-    if(BUILD_TYPE)
-        set(NINJA_WRAPPER ${CMAKE_SOURCE_DIR}/build/${VARIANT}/${BUILD_KIT}/${BUILD_TYPE}/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/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/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/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 BUILD_TYPE 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-7.1.1rc1.dist-info → spl_core-7.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: spl-core
-Version: 7.1.1rc1
+Version: 7.2.1
 Summary: Software Product Line Support for CMake
 License: MIT
 Author: Avengineers
@@ -18,7 +18,7 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Dist: cookiecutter (==2.1.1)
 Requires-Dist: doxysphinx (>=3.3,<4.0)
 Requires-Dist: gcovr (>=8.3,<9.0)
-Requires-Dist: hammocking (>=0.4.1,<0.5.0)
+Requires-Dist: hammocking (>=0.5,<0.6)
 Requires-Dist: kconfiglib (>=14.1,<15.0)
 Requires-Dist: mlx-traceability (>=10.0,<11.0)
 Requires-Dist: myst-parser (>=0.16)

{spl_core-7.1.1rc1.dist-info → spl_core-7.2.1.dist-info}/RECORD

@@ -1,13 +1,13 @@
-spl_core/__init__.py,sha256=zjofqj5FFM5hVea8cl5H1RFofrW0yh8i0p1RHDAu68c,27
+spl_core/__init__.py,sha256=5HkC96OIlIn2QaEoaF1aGy7IrAcyzQSiHxoFr7pNa8s,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=TDfYEZoon39z4-tddVTqmWZTCwDoVFvwm_Yz9e997as,32717
+spl_core/common.cmake,sha256=6Ug5U2sbkoFwurfETARq6vFFmiJw3IHithJHbxJvfWQ,33638
 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
-spl_core/gcov_maid/gcov_maid.py,sha256=5rPIeL9daQDm5ad9xzaIhlDf_0H5g6r2zHo8WN8T4-8,1455
+spl_core/gcov_maid/gcov_maid.py,sha256=EYhpQnv9u4T--9O9Ox2F4JcAqum26GKV5ZP7SJYG4ic,1427
 spl_core/kconfig/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spl_core/kconfig/kconfig.py,sha256=JLBSUvPnc5dEZNWHeuMTFgP9iBgtzEV6tnrhE4-5oCg,9795
 spl_core/kconfig.cmake,sha256=5S8MeW9RAl1jZHxSUzZFmbPaaCI5EPbfwyQErl0auvs,1845
@@ -35,7 +35,7 @@ spl_core/kickstart/templates/project/.gitignore,sha256=Ibd6YbqO2UPfauJzrdgY7z4ar
 spl_core/kickstart/templates/project/.vscode/cmake-kits.json,sha256=oLn_-InkXE3Th6OL5hlSxBZsx2dBaKShrHZVcyAcfFU,269
 spl_core/kickstart/templates/project/.vscode/extensions.json,sha256=49RYati_P9i3zdiKuaTIkNQnA1uH1eIUd6DusIa9TT0,624
 spl_core/kickstart/templates/project/.vscode/launch.json,sha256=30-tsNapUNNIvVDohdIf4SEnHrHh8qbWuTjLJjsMcEY,1103
-spl_core/kickstart/templates/project/.vscode/settings.json,sha256=w2zAkNk4P0eZC5zDxiG7jKy35Jl37TyVDg38lXjq3hw,1369
+spl_core/kickstart/templates/project/.vscode/settings.json,sha256=84PASkysrQEcl9NZNJrYvWH-KqOd9HnAbTj0Hpa1SQM,1319
 spl_core/kickstart/templates/project/.vscode/tasks.json,sha256=fPaiY-vpI-3wMK0dpc3LZma4-YYyaI_xc6uQrEUf6sw,3434
 spl_core/kickstart/templates/project/CMakeLists.txt,sha256=xLLmYujryWwBrIZTONzR88qSFx0VmgPGkt5xPszsMXA,1454
 spl_core/kickstart/templates/project/README.md,sha256=k-P_SycFIRnRmjjUoAiDrRF8Gg1Te-qErAX-pgtYuqg,310
@@ -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=W8h-Zj-N302qxMrRG8MhoEkJ0io92bWGp4Y5r8LBQnc,4535
+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.1rc1.dist-info/LICENSE,sha256=UjjA0o8f5tT3wVm7qodTLAhPWLl6kgVyn9FPAd1VeYY,1099
-spl_core-7.1.1rc1.dist-info/METADATA,sha256=aEXZb7gAqkXVy6Jy-lWThPmNRIhPrEWp9vlrNkbFaFc,5163
-spl_core-7.1.1rc1.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-spl_core-7.1.1rc1.dist-info/entry_points.txt,sha256=18_sdVY93N1GVBiAHxQ_F9ZM-bBvOmVMOMn7PNe2EqU,45
-spl_core-7.1.1rc1.dist-info/RECORD,,
+spl_core-7.2.1.dist-info/LICENSE,sha256=UjjA0o8f5tT3wVm7qodTLAhPWLl6kgVyn9FPAd1VeYY,1099
+spl_core-7.2.1.dist-info/METADATA,sha256=VKULb736PWzT_rzMduaDb0HanWd48VmUyLxPO9zLQGM,5156
+spl_core-7.2.1.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+spl_core-7.2.1.dist-info/entry_points.txt,sha256=18_sdVY93N1GVBiAHxQ_F9ZM-bBvOmVMOMn7PNe2EqU,45
+spl_core-7.2.1.dist-info/RECORD,,