spl-core 6.3.1__py3-none-any.whl → 6.4.1__py3-none-any.whl

spl_core/kconfig.cmake

@@ -0,0 +1,41 @@
+# Paths for KConfig output
+set(KCONFIG_OUT_DIR ${PROJECT_BINARY_DIR}/kconfig)
+set(AUTOCONF_H ${KCONFIG_OUT_DIR}/autoconf.h)
+set(AUTOCONF_JSON ${KCONFIG_OUT_DIR}/autoconf.json)
+set(AUTOCONF_CMAKE ${KCONFIG_OUT_DIR}/autoconf.cmake)
+set(KCONFIG_MODEL_FILE ${PROJECT_SOURCE_DIR}/KConfig)
+set(KCONFIG_CONFIG_FILE ${PROJECT_SOURCE_DIR}/variants/${VARIANT}/config.txt)
+
+if(EXISTS ${KCONFIG_MODEL_FILE})
+    set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${KCONFIG_MODEL_FILE})
+
+    if(EXISTS ${KCONFIG_CONFIG_FILE})
+        set(_KCONFIG_CONFIG_FILE_option --kconfig_config_file ${KCONFIG_CONFIG_FILE})
+        set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${KCONFIG_CONFIG_FILE})
+    else()
+        message(STATUS "No variant configuration found, using defaults.")
+    endif()
+
+    # TODO: kconfig.py should not update its outputs when the inputs did not change.
+    # So an incremental build with configure is not possible. autoconf.h gets updated
+    # every time (although the content did not change). Therefore stuff gets compiled.
+    execute_process(
+        WORKING_DIRECTORY ${SPL_CORE_ROOT_DIRECTORY} # TODO: is there a better way to let kconfig.py find other modules?
+        COMMAND python ${SPL_CORE_PYTHON_DIRECTORY}/kconfig/kconfig.py
+        --kconfig_model_file ${KCONFIG_MODEL_FILE} ${_KCONFIG_CONFIG_FILE_option}
+        --out_header_file ${AUTOCONF_H}
+        --out_json_file ${AUTOCONF_JSON}
+        --out_cmake_file ${AUTOCONF_CMAKE}
+        COMMAND_ECHO STDOUT
+        RESULT_VARIABLE ret
+    )
+
+    if(NOT "${ret}" STREQUAL "0")
+        message(FATAL_ERROR "KConfig failed with return code: ${ret}")
+    endif()
+
+    # Make the generated files location public
+    include_directories(${KCONFIG_OUT_DIR})
+else()
+    message(STATUS "No KConfig feature model file found, skipping KConfig.")
+endif()

spl_core/kickstart/templates/project/CMakeLists.txt

@@ -22,7 +22,7 @@ include(FetchContent)
 # Include spl-core
 if(DEFINED ENV{SPLCORE_PATH})
     message(WARNING "SPLCORE_PATH defined! Use fixed SPL-CORE version from: $ENV{SPLCORE_PATH}")
-    include($ENV{SPLCORE_PATH}/cmake/spl.cmake)
+    include($ENV{SPLCORE_PATH}/spl.cmake)
 else()
     # Fetch spl-core
     FetchContent_Declare(

spl_core/spl.cmake

@@ -0,0 +1,116 @@
+# Define the SPL Core root directory to be used to refer to files
+# relative to the SPL Core installation directory.
+set(SPL_CORE_ROOT_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
+set(SPL_CORE_CMAKE_DIRECTORY ${SPL_CORE_ROOT_DIRECTORY})
+set(SPL_CORE_PYTHON_DIRECTORY ${SPL_CORE_ROOT_DIRECTORY})
+
+# Always create a compile_commands.json file for C/C++ intellisense / CMake Tools extension
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+# The link target needs a name. This is not the name of the executable.
+set(LINK_TARGET_NAME link)
+
+# The variant's name is used to determine the base name of the created binaries.
+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)
+
+foreach(ENVVAR IN LISTS ENVVARS)
+    set(ENV{${ENVVAR}} "${${ENVVAR}}")
+endforeach()
+
+# Include common CMake functions and macros
+include(${SPL_CORE_CMAKE_DIRECTORY}/common.cmake)
+
+# Include and run KConfig
+include(${SPL_CORE_CMAKE_DIRECTORY}/kconfig.cmake)
+
+if(EXISTS ${AUTOCONF_CMAKE})
+    include(${AUTOCONF_CMAKE})
+endif(EXISTS ${AUTOCONF_CMAKE})
+
+if(BUILD_KIT STREQUAL prod)
+    # set default link target output name and extension
+    if(LINKER_OUTPUT_FILE)
+        get_filename_component(LINK_FILE_BASENAME ${LINKER_OUTPUT_FILE} NAME_WE)
+        get_filename_component(LINK_FILE_EXTENSION ${LINKER_OUTPUT_FILE} EXT)
+
+        # add variant specific linker script if defined
+        if(VARIANT_LINKER_FILE)
+            list(APPEND LINK_TARGET_DEPENDS ${VARIANT_LINKER_FILE})
+        endif(VARIANT_LINKER_FILE)
+
+        # create executable
+        add_executable(${LINK_TARGET_NAME} ${LINK_TARGET_DEPENDS})
+        target_compile_options(${LINK_TARGET_NAME} PRIVATE ${VARIANT_ADDITIONAL_LINK_FLAGS})
+        set_target_properties(${LINK_TARGET_NAME} PROPERTIES
+            OUTPUT_NAME ${LINK_FILE_BASENAME}
+            SUFFIX ${LINK_FILE_EXTENSION}
+            LINK_DEPENDS "${LINK_TARGET_DEPENDS}"
+        )
+
+        if(LINKER_BYPRODUCTS_EXTENSIONS)
+            # combine basename and byproduct extension
+            string(REPLACE "," ";" LINKER_BYPRODUCTS "${LINKER_BYPRODUCTS_EXTENSIONS}")
+            list(TRANSFORM LINKER_BYPRODUCTS PREPEND ${LINK_FILE_BASENAME}.)
+        endif(LINKER_BYPRODUCTS_EXTENSIONS)
+
+        if(LINKER_BYPRODUCT_HEX)
+            list(APPEND LINKER_BYPRODUCTS ${LINKER_BYPRODUCT_HEX})
+        endif(LINKER_BYPRODUCT_HEX)
+
+        if(LINKER_BYPRODUCT_MAP)
+            list(APPEND LINKER_BYPRODUCTS ${LINKER_BYPRODUCT_MAP})
+        endif(LINKER_BYPRODUCT_MAP)
+
+        if(LINKER_BYPRODUCT_MDF)
+            list(APPEND LINKER_BYPRODUCTS ${LINKER_BYPRODUCT_MDF})
+        endif(LINKER_BYPRODUCT_MDF)
+
+        if(LINKER_BYPRODUCT_OTHERS)
+            string(REPLACE "," ";" LINKER_BYPRODUCTS_TMP "${LINKER_BYPRODUCT_OTHERS}")
+            list(APPEND LINKER_BYPRODUCTS ${LINKER_BYPRODUCTS_TMP})
+        endif(LINKER_BYPRODUCT_OTHERS)
+
+        if(LINKER_BYPRODUCTS)
+            add_custom_target(
+                linker_byproducts ALL
+                COMMAND ${CMAKE_COMMAND} -E true
+                DEPENDS ${LINKER_OUTPUT_FILE}
+                BYPRODUCTS ${LINKER_BYPRODUCTS}
+            )
+        endif(LINKER_BYPRODUCTS)
+    endif(LINKER_OUTPUT_FILE)
+elseif(BUILD_KIT STREQUAL test)
+    _spl_get_google_test()
+    include(CTest)
+    list(APPEND CMAKE_CTEST_ARGUMENTS "--output-on-failure")
+
+    add_custom_target(coverage)
+else()
+    message(FATAL_ERROR "Invalid BUILD_KIT selected!")
+endif(BUILD_KIT STREQUAL prod)
+
+# # Things to be done at the very end of configure phase as if they would be at bottom of CMakelists.txt
+cmake_language(DEFER DIRECTORY ${CMAKE_SOURCE_DIR} CALL _spl_hook_end_of_configure())
+
+function(_spl_hook_end_of_configure)
+    if(BUILD_KIT STREQUAL test)
+        _spl_coverage_create_overall_report()
+        _spl_create_docs_target()
+        _spl_create_reports_target()
+    endif(BUILD_KIT STREQUAL test)
+    _spl_create_build_info_file()
+endfunction(_spl_hook_end_of_configure)
+
+# # This is one possibility to open guiconfig of kconfiglib. VSCode task is the preferred solution
+set(_CONFIGURATION_TARGET configuration.stamp)
+add_custom_command(
+    OUTPUT ${_CONFIGURATION_TARGET}
+    COMMAND set "KCONFIG_CONFIG=${CMAKE_SOURCE_DIR}/variants/${VARIANT}/config.txt" && cd ${CMAKE_SOURCE_DIR} && guiconfig
+)
+
+add_custom_target(configuration DEPENDS ${_CONFIGURATION_TARGET})

{spl_core-6.3.1.dist-info → spl_core-6.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: spl-core
-Version: 6.3.1
+Version: 6.4.1
 Summary: Software Product Line Support for CMake
 License: MIT
 Author: Avengineers
@@ -16,26 +16,26 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Software Development :: Libraries
 Requires-Dist: cookiecutter (==2.1.1)
-Requires-Dist: doxysphinx (>=3.3.7,<4.0.0)
-Requires-Dist: gcovr
-Requires-Dist: hammocking
-Requires-Dist: kconfiglib
-Requires-Dist: mlx-traceability (>=10.0.0,<11.0.0)
+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: kconfiglib (>=14.1,<15.0)
+Requires-Dist: mlx-traceability (>=10.0,<11.0)
 Requires-Dist: myst-parser (>=0.16)
 Requires-Dist: py-app-dev (>=2.1,<3.0)
-Requires-Dist: sphinx (>=7.3.5,<8.0.0)
-Requires-Dist: sphinx-book-theme (>=1.1.2,<2.0.0)
-Requires-Dist: sphinx-copybutton (>=0.5.2,<0.6.0)
-Requires-Dist: sphinx-design (>=0.5.0,<0.6.0)
-Requires-Dist: sphinx-needs (>=2.0.0,<3.0.0)
-Requires-Dist: sphinx-new-tab-link (>=0.4.0,<0.5.0)
-Requires-Dist: sphinx-rtd-size (>=0.2.0,<0.3.0)
-Requires-Dist: sphinx-rtd-theme (>=2.0.0,<3.0.0)
-Requires-Dist: sphinx-test-reports (>=1.0.2,<2.0.0)
-Requires-Dist: sphinxcontrib-datatemplates (>=0.11.0,<0.12.0)
-Requires-Dist: sphinxcontrib-mermaid (>=0.9.2,<0.10.0)
+Requires-Dist: sphinx (>=7.3,<8.0)
+Requires-Dist: sphinx-book-theme (>=1.1,<2.0)
+Requires-Dist: sphinx-copybutton (>=0.5,<0.6)
+Requires-Dist: sphinx-design (>=0.5,<0.6)
+Requires-Dist: sphinx-needs (>=2.0,<3.0)
+Requires-Dist: sphinx-new-tab-link (>=0.4,<0.5)
+Requires-Dist: sphinx-rtd-size (>=0.2,<0.3)
+Requires-Dist: sphinx-rtd-theme (>=2.0,<3.0)
+Requires-Dist: sphinx-test-reports (>=1.0,<2.0)
+Requires-Dist: sphinxcontrib-datatemplates (>=0.11,<0.12)
+Requires-Dist: sphinxcontrib-mermaid (>=0.9,<0.10)
 Requires-Dist: sphinxcontrib-plantuml (>=0.29,<0.30)
-Requires-Dist: typer (>=0.12.3,<0.13.0)
+Requires-Dist: typer (>=0,<1)
 Project-URL: Bug Tracker, https://github.com/avengineers/spl-core/issues
 Project-URL: Changelog, https://github.com/avengineers/spl-core/blob/develop/CHANGELOG.md
 Project-URL: Documentation, https://spl-core.readthedocs.io

{spl_core-6.3.1.dist-info → spl_core-6.4.1.dist-info}/RECORD

@@ -1,12 +1,15 @@
-spl_core/__init__.py,sha256=pM7gHyeWFY4GDFAxcDi8cHwCw8YNk6zQN8QWLwNdwI4,22
+spl_core/__init__.py,sha256=GH_YrEsDwB0Ju5p-I4jYcuvVAMkFfVBYw2mMejqPF1Y,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=SGDojoED4jazy_Y8C2lo31F1oYNChbTYbRk0UkGWOcc,32415
+spl_core/conan.cmake,sha256=i1AuyN-e8cczX7TI1nl6e3Y8N-EP-QXPVY7LG6NUyJY,41958
 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/kconfig/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spl_core/kconfig/kconfig.py,sha256=JLBSUvPnc5dEZNWHeuMTFgP9iBgtzEV6tnrhE4-5oCg,9795
+spl_core/kconfig.cmake,sha256=5S8MeW9RAl1jZHxSUzZFmbPaaCI5EPbfwyQErl0auvs,1845
 spl_core/kickstart/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spl_core/kickstart/create.py,sha256=Lv7-3nb71HKmclHBSCliLKiFdmAIOBl1VTvA39YboLQ,2741
 spl_core/kickstart/templates/application/.vscode/cmake-variants.json,sha256=sF_dsbdrDwhfIo5EfGzvIgMZZcz5Z5k4Al0qrS8j7AY,553
@@ -33,7 +36,7 @@ spl_core/kickstart/templates/project/.vscode/extensions.json,sha256=49RYati_P9i3
 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/tasks.json,sha256=fPaiY-vpI-3wMK0dpc3LZma4-YYyaI_xc6uQrEUf6sw,3434
-spl_core/kickstart/templates/project/CMakeLists.txt,sha256=uVrk_6B83NMUet3DcCG1bl26P6nUND1tRDCBP02kusI,1460
+spl_core/kickstart/templates/project/CMakeLists.txt,sha256=xLLmYujryWwBrIZTONzR88qSFx0VmgPGkt5xPszsMXA,1454
 spl_core/kickstart/templates/project/README.md,sha256=k-P_SycFIRnRmjjUoAiDrRF8Gg1Te-qErAX-pgtYuqg,310
 spl_core/kickstart/templates/project/build.bat,sha256=HlOqePYRoHTrp7v6oQ551dXI-qCymGCG0gQ9Au6bpos,73
 spl_core/kickstart/templates/project/build.ps1,sha256=oQSCxUoleJSkBSRW3nTqg_23eANh9mfjlJPgTfH21Ak,11057
@@ -53,10 +56,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-6.3.1.dist-info/LICENSE,sha256=UjjA0o8f5tT3wVm7qodTLAhPWLl6kgVyn9FPAd1VeYY,1099
-spl_core-6.3.1.dist-info/METADATA,sha256=7XyjdcqBHf6d26tLVU2eMwEPC8EPA8eiG9K52HHC56o,5177
-spl_core-6.3.1.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-spl_core-6.3.1.dist-info/entry_points.txt,sha256=18_sdVY93N1GVBiAHxQ_F9ZM-bBvOmVMOMn7PNe2EqU,45
-spl_core-6.3.1.dist-info/RECORD,,
+spl_core-6.4.1.dist-info/LICENSE,sha256=UjjA0o8f5tT3wVm7qodTLAhPWLl6kgVyn9FPAd1VeYY,1099
+spl_core-6.4.1.dist-info/METADATA,sha256=Pe5R0z9o9SuogZt1CaP8M9gGKbaadxdkHYhX2wosZ8M,5160
+spl_core-6.4.1.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+spl_core-6.4.1.dist-info/entry_points.txt,sha256=18_sdVY93N1GVBiAHxQ_F9ZM-bBvOmVMOMn7PNe2EqU,45
+spl_core-6.4.1.dist-info/RECORD,,

{spl_core-6.3.1.dist-info → spl_core-6.4.1.dist-info}/WHEEL

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