spl-core 7.8.0rc1__py3-none-any.whl → 7.10.0__py3-none-any.whl

spl_core/__init__.py

@@ -1 +1 @@
-__version__ = "7.8.0-rc.1"
+__version__ = "7.10.0"

spl_core/common.cmake

@@ -10,31 +10,81 @@ macro(_spl_get_absolute_path out in)
     endif()
 endmacro()
 
+# SPL_ADD_COMPONENT
+#
+# Arguments:
+#
+# component_path - the path to the component's directory
+# [target_executable] - (optional) name of the target executable. This is the second argument of the macro.
+#
+# Needs to know:
+#
+# component_path - because it must call add_subdirectory to the component's directory
+# target_executable
+#   - required to determine the build directory for the component (one can not call add_subdirectory
+#     for the same component multiple times with the same build directory)
+#   - must be set to the "global" scope because it is required in spl_create_component to append it to the component name.
+#     spl_create_component gets to decide the component name and will make it "global" for this macro to read it back.
+#
 macro(spl_add_component component_path)
-    message(DEBUG "spl_add_component: component_path=${component_path}")
-    _spl_slash_to_underscore(component_name ${component_path})
-    add_subdirectory(${CMAKE_SOURCE_DIR}/${component_path})
+    set(target_executable "${ARGV1}")
+    message(DEBUG "spl_add_component: component_path=${component_path}, target_executable=${target_executable}")
 
-    if(TARGET ${component_name})
+    # Set global variables for spl_create_component
+    unset(GLOBAL__SPL_ADD_COMPONENT__TARGET_EXECUTABLE)
+    if("${target_executable}" STREQUAL "")
+        set(target_executable ${LINK_TARGET_NAME})
+        add_subdirectory(${CMAKE_SOURCE_DIR}/${component_path})
+    else()
+        set(GLOBAL__SPL_ADD_COMPONENT__TARGET_EXECUTABLE "${target_executable}")
+        add_subdirectory(${CMAKE_SOURCE_DIR}/${component_path} "${CMAKE_BINARY_DIR}/${target_executable}/${component_path}")
+    endif()
+    # Add the newly created component to the linked libraries
+    if(TARGET ${GLOBAL__SPL_CREATE_COMPONENT__NEW_COMPONENT_NAME})
         if(BUILD_KIT STREQUAL prod)
-            target_link_libraries(${LINK_TARGET_NAME} ${component_name})
+            target_link_libraries(${target_executable} ${GLOBAL__SPL_CREATE_COMPONENT__NEW_COMPONENT_NAME})
         endif()
     endif()
 endmacro()
 
+# SPL_ADD_NAMED_COMPONENT
+#
+# Arguments:
+#
+# component_name - the name of the component. (!) This macro expects that a CMake variable with this name holds the component path.
+#                  This means that ${${component_name}} is the component path.
+# [target_executable] - (optional) name of the target executable.
+#
+# Needs to know:
+#
+# component_path - because it must call add_subdirectory to the component's directory
+# target_executable
+#   - required to determine the build directory for the component (one can not call add_subdirectory
+#     for the same component multiple times without specifying the build directory)
+#   - must be set to the "global" scope because it is required in spl_create_component to append it to the component name
+#
 macro(spl_add_named_component component_name)
-    message(DEBUG "spl_add_named_component: component_name=${component_name}")
+    set(target_executable "${ARGV1}")
     set(component_path ${${component_name}})
+    if(NOT IS_ABSOLUTE ${component_path})
+        set(component_path ${CMAKE_SOURCE_DIR}/${component_path})
+    endif()
+    message(DEBUG "spl_add_named_component: component_name=${component_name}, component_path=${component_path}, target_executable=${target_executable}")
 
-    if(IS_ABSOLUTE ${component_path})
+    # Set global variables for spl_create_component
+    unset(GLOBAL__SPL_ADD_COMPONENT__TARGET_EXECUTABLE)
+    if("${target_executable}" STREQUAL "")
+        set(target_executable ${LINK_TARGET_NAME})
         add_subdirectory(${component_path})
     else()
-        add_subdirectory(${CMAKE_SOURCE_DIR}/${component_path})
+        set(GLOBAL__SPL_ADD_COMPONENT__TARGET_EXECUTABLE "${target_executable}")
+        add_subdirectory(${component_path} "${CMAKE_BINARY_DIR}/${target_executable}/${component_name}")
     endif()
 
-    if(TARGET ${component_name})
+    # Add the newly created component to the linked libraries
+    if(TARGET ${GLOBAL__SPL_CREATE_COMPONENT__NEW_COMPONENT_NAME})
         if(BUILD_KIT STREQUAL prod)
-            target_link_libraries(${LINK_TARGET_NAME} ${component_name})
+            target_link_libraries(${target_executable} ${GLOBAL__SPL_CREATE_COMPONENT__NEW_COMPONENT_NAME})
         endif()
     endif()
 endmacro()
@@ -121,6 +171,20 @@ macro(_spl_get_google_test)
     enable_testing()
 endmacro(_spl_get_google_test)
 
+# SPL_CREATE_COMPONENT
+#
+# Arguments (they are all optional):
+#
+# NAME        - Use this as component name instead of define it from the component path.
+# LONG_NAME   - A longer name of the component to be used in reports.
+# LIBRARY_TYPE - The type of library to create (e.g., STATIC, SHARED, OBJECT)
+#
+# Needs to know:
+# - target_executable - global variable set by the spl_add_component macros to make sure different component
+#                       names are used for different executables
+#
+# The component name will be made "global" such that the spl_add_compoent macro can add it to the executable
+#
 macro(spl_create_component)
     cmake_parse_arguments(CREATE_COMPONENT "" "NAME;LONG_NAME;LIBRARY_TYPE" "" ${ARGN})
 
@@ -132,11 +196,22 @@ macro(spl_create_component)
     # Determine the unique component name based on the relative path of the component
     file(RELATIVE_PATH component_path ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_LIST_DIR})
 
+    unset(GLOBAL__SPL_CREATE_COMPONENT__NEW_COMPONENT_NAME)
     if(NOT CREATE_COMPONENT_NAME)
+        # The component relative path to the project root dictates the component name
         _spl_slash_to_underscore(component_name ${component_path})
     else()
+        # Explicit name provided - use it as-is
         set(component_name ${CREATE_COMPONENT_NAME})
     endif()
+    # If there is a custom target executable, prefix the component name
+    if(GLOBAL__SPL_ADD_COMPONENT__TARGET_EXECUTABLE)
+        set(component_name ${GLOBAL__SPL_ADD_COMPONENT__TARGET_EXECUTABLE}_${component_name})
+    endif()
+    # Make the component name public
+    set(GLOBAL__SPL_CREATE_COMPONENT__NEW_COMPONENT_NAME ${component_name} PARENT_SCOPE)
+
+    message(DEBUG "spl_create_component: component_name=${component_name}")
 
     # Collect all productive sources for later usage (e.g., in an extension)
     list(APPEND PROD_SOURCES ${SOURCES})
@@ -193,8 +268,9 @@ macro(spl_create_component)
 \"reports_output_dir\": \"\"
 }")
     set(_component_is_header_only FALSE)
+
     # If prod and sources or test and test_sources define library. Else make it an interface and set the flag
-    if ((BUILD_KIT STREQUAL prod AND SOURCES) OR
+    if((BUILD_KIT STREQUAL prod AND SOURCES) OR
         (BUILD_KIT STREQUAL test AND TEST_SOURCES))
         add_library(${component_name} ${CREATE_COMPONENT_LIBRARY_TYPE} ${SOURCES})
     else()
@@ -367,6 +443,7 @@ Code Coverage
     # Implicitly add default include directories to provided interfaces
     list(APPEND PROVIDED_INTERFACES ${CMAKE_CURRENT_LIST_DIR}/src)
     list(APPEND PROVIDED_INTERFACES ${CMAKE_CURRENT_BINARY_DIR})
+
     # Get rid of duplicates, in case the default directories where explicitly defined
     list(REMOVE_DUPLICATES PROVIDED_INTERFACES)
 
@@ -382,12 +459,13 @@ Code Coverage
     # Define the target public interfaces to be used instead of the global include directories.
     if(TARGET ${component_name})
         foreach(interfaceDir IN LISTS PROVIDED_INTERFACES)
-            if (_component_is_header_only)
+            if(_component_is_header_only)
                 target_include_directories(${component_name} INTERFACE ${interfaceDir})
             else()
                 target_include_directories(${component_name} PUBLIC ${interfaceDir})
             endif()
         endforeach()
+
         foreach(component IN LISTS REQUIRED_INTERFACES)
             if(_component_is_header_only)
                 target_link_libraries(${component_name} INTERFACE ${component})
@@ -620,7 +698,7 @@ macro(_spl_add_test_suite COMPONENT_NAME PROD_SRC TEST_SOURCES)
         OUTPUT ${MOCK_SRC}
         BYPRODUCTS mockup_${component_name}.h
         WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
-        COMMAND python -m hammocking --suffix _${COMPONENT_NAME} --sources ${PROD_SRC} --plink ${CMAKE_CURRENT_BINARY_DIR}/${PROD_PARTIAL_LINK} --outdir ${CMAKE_CURRENT_BINARY_DIR} "$<$<BOOL:${component_inc_dirs}>:-I$<JOIN:${component_inc_dirs},;-I>>" "$<$<BOOL:${component_comp_defs}>:-D$<JOIN:${component_comp_defs},;-D>>" -x c
+        COMMAND python -m hammocking --suffix _${COMPONENT_NAME} --sources ${PROD_SRC} --plink ${CMAKE_CURRENT_BINARY_DIR}/${PROD_PARTIAL_LINK} --outdir ${CMAKE_CURRENT_BINARY_DIR} "$<$<BOOL:${component_inc_dirs}>:-I$<JOIN:${component_inc_dirs},;-I>>" "$<$<BOOL:${component_comp_defs}>:-D$<JOIN:${component_comp_defs},;-D>>" ${COMPILER_SPECIFIC_INCLUDES} -x c
         COMMAND_EXPAND_LISTS
         VERBATIM
         DEPENDS
@@ -740,7 +818,7 @@ macro(spl_run_conan)
 endmacro(spl_run_conan)
 
 macro(_spl_set_ninja_wrapper_as_cmake_make)
-    set (NINJA_WRAPPER ${CMAKE_CURRENT_BINARY_DIR}/ninja_wrapper.bat)
+    set(NINJA_WRAPPER ${CMAKE_CURRENT_BINARY_DIR}/ninja_wrapper.bat)
     file(WRITE ${NINJA_WRAPPER}
         "@echo off
 @call %~dp0%/activate_run.bat

spl_core/kickstart/templates/project/tools/toolchains/clang/toolchain.cmake

@@ -1,3 +1,11 @@
 set(CMAKE_C_COMPILER clang CACHE STRING "C Compiler")
 set(CMAKE_CXX_COMPILER clang++ CACHE STRING "CXX Compiler")
 set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER} CACHE STRING "ASM Compiler")
+
+unset(CMAKE_C_COMPILER_FOUND_PATH)
+find_program(CMAKE_C_COMPILER_FOUND_PATH ${CMAKE_C_COMPILER})
+get_filename_component(CMAKE_C_COMPILER_FOUND_PATH ${CMAKE_C_COMPILER_FOUND_PATH} DIRECTORY)
+# CMAKE_C_COMPILER_FOUND_PATH is the path to the 'bin' directory
+set(COMPILER_SPECIFIC_INCLUDES
+    -I${CMAKE_C_COMPILER_FOUND_PATH}/../x86_64-w64-mingw32/include
+)

spl_core/kickstart/templates/project/tools/toolchains/gcc/toolchain.cmake

@@ -1,3 +1,11 @@
 set(CMAKE_C_COMPILER gcc CACHE STRING "C Compiler")
 set(CMAKE_CXX_COMPILER g++ CACHE STRING "CXX Compiler")
 set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER} CACHE STRING "ASM Compiler")
+
+unset(CMAKE_C_COMPILER_FOUND_PATH)
+find_program(CMAKE_C_COMPILER_FOUND_PATH ${CMAKE_C_COMPILER})
+get_filename_component(CMAKE_C_COMPILER_FOUND_PATH ${CMAKE_C_COMPILER_FOUND_PATH} DIRECTORY)
+# CMAKE_C_COMPILER_FOUND_PATH is the path to the 'bin' directory
+set(COMPILER_SPECIFIC_INCLUDES
+    -I${CMAKE_C_COMPILER_FOUND_PATH}/../x86_64-w64-mingw32/include
+)

spl_core/steps/collect_pr_changes.py

@@ -1,3 +1,4 @@
+import json
 from dataclasses import dataclass
 from pathlib import Path
 from typing import List, Optional
@@ -34,14 +35,12 @@ class CollectPRChanges(PipelineStep):
                 changed_files = self._get_changed_files(ci_context.target_branch, ci_context.current_branch)
                 output_file = self.get_outputs()[0]
                 output_file.parent.mkdir(parents=True, exist_ok=True)
-                output_file.write_text(
-                    str(
-                        PR_Changes(
-                            ci_system=ci_context.ci_system.name, target_branch=ci_context.target_branch, current_branch=ci_context.current_branch, commit_id=self._get_commit_id(ci_context), changed_files=changed_files
-                        ).to_json()
-                    ),
-                    encoding="utf-8",
-                )
+                output_file.write_text(json.dumps(
+                    PR_Changes(
+                        ci_system=ci_context.ci_system.name, target_branch=ci_context.target_branch, current_branch=ci_context.current_branch, commit_id=self._get_commit_id(ci_context), changed_files=changed_files
+                    ).to_dict(),
+                    indent=2
+                ))
                 logger.info(f"PR changes saved to {output_file}")
 
     def _get_changed_files(self, target_branch: str, current_branch: str) -> List[str]:
@@ -89,7 +88,6 @@ class CollectPRChanges(PipelineStep):
                     logger.info("No CI context found.")
                     return ""
                 ci_context = ci_contexts[0]
-            logger.info(f"CI context: {ci_context}")
             if isinstance(ci_context, CIContext) and ci_context.is_pull_request:
                 result = SubprocessExecutor(["git", "rev-parse", f"origin/{ci_context.current_branch}"]).execute(handle_errors=False)
                 if result and result.returncode == 0:

{spl_core-7.8.0rc1.dist-info → spl_core-7.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: spl-core
-Version: 7.8.0rc1
+Version: 7.10.0
 Summary: Software Product Line Support for CMake
 License: MIT
 Author: Avengineers
@@ -23,7 +23,8 @@ 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: pypeline-semantic-release (>=0.4.1,<0.5.0)
+Requires-Dist: pypeline-runner (>=1,<=2)
+Requires-Dist: pypeline-semantic-release (>=0.4.1,<=0.5.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)

{spl_core-7.8.0rc1.dist-info → spl_core-7.10.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
-spl_core/__init__.py,sha256=GRRA8g5ffdV82Y5XdlAFf1TTG9dlmQbKuqrPmT3tho0,27
+spl_core/__init__.py,sha256=GHzDQ26ZrFjhBusV3W0P0PcmVjJ349q32G_UDe84Q6E,23
 spl_core/__run.py,sha256=DphnN7_Bjiw_mOOztsHxTDHS8snz1g2MMWAaJpZxPKM,361
 spl_core/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spl_core/common/path.py,sha256=sDujd3n4XP1XGjHc7ImXEdjihO6A8BOIDbKCf7HgQ0Y,462
-spl_core/common.cmake,sha256=sRWqQeK04iUpeM3beQZXIi5mpEQNyO751O-yBoFCrqk,35160
+spl_core/common.cmake,sha256=-0TFObmNaBx7_mXb4bUraOo4EX-lFJ2rmGKn79y9eVM,39160
 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
@@ -55,16 +55,16 @@ spl_core/kickstart/templates/project/pypeline.yaml,sha256=9Kz3D0-I5mVJ6UdG92BuQS
 spl_core/kickstart/templates/project/pyproject.toml,sha256=FicwBOwVlGi_0pwTC0_LTaKMgWoaXfMayjYTp4Qb48I,310
 spl_core/kickstart/templates/project/pytest.ini,sha256=Zh3jeEjZV_BqQoX7LB0cv6EtqDDogRCHsQdKHRQnq18,366
 spl_core/kickstart/templates/project/scoopfile.json,sha256=7qDThZwB1jBtiQl1uOZQ21-zKITBpQzt1S-uUfW1JFE,500
-spl_core/kickstart/templates/project/tools/toolchains/clang/toolchain.cmake,sha256=824enlZDMkJOZf77iHtbFIpUMi-AelLnTYLQWok5XtI,189
-spl_core/kickstart/templates/project/tools/toolchains/gcc/toolchain.cmake,sha256=AmLzPyhTgfc_Dsre4AlsvSOkVGW6VswWvrEnUL8JLhA,183
+spl_core/kickstart/templates/project/tools/toolchains/clang/toolchain.cmake,sha256=pqAUH3vlzT3qrSkm8Z5cTkk0YKuC44_ySxEvKPRQWjA,553
+spl_core/kickstart/templates/project/tools/toolchains/gcc/toolchain.cmake,sha256=3xKeNw1zjo5dSzu2v9WmFHJajOn64v7UukKNp6U5Dk8,547
 spl_core/main.py,sha256=_hL4j155WZMXog_755bgAH1PeUwvTdJZvVdVw9EWhvo,1225
 spl_core/spl.cmake,sha256=W8h-Zj-N302qxMrRG8MhoEkJ0io92bWGp4Y5r8LBQnc,4535
-spl_core/steps/collect_pr_changes.py,sha256=2izqHH9kG6ozBnh1HN2dX0C4o9dU2vvq9xCB8yYSYLY,4281
+spl_core/steps/collect_pr_changes.py,sha256=0zqjF55K3P8V3ZfCNQc33pYrCxhJJhBmAG4cVxVuy1U,4182
 spl_core/test_utils/archive_artifacts_collection.py,sha256=x7LH5dGIvssyhXsTFzB6rjgb5D2efKvHVpnjId3MNDk,5126
 spl_core/test_utils/base_variant_test_runner.py,sha256=Oq27lkJlpB_y-p2_8S23F5zjn1438HW148q-hQNz3EY,3795
 spl_core/test_utils/spl_build.py,sha256=bSM6hwhTH9aRryvUvtSPDfk_zoZuKEO5g3QXK4SIrco,8442
-spl_core-7.8.0rc1.dist-info/LICENSE,sha256=UjjA0o8f5tT3wVm7qodTLAhPWLl6kgVyn9FPAd1VeYY,1099
-spl_core-7.8.0rc1.dist-info/METADATA,sha256=Zrld_N3uhLTstu9K15tNlz4Hl9MeBF0OosW-DjPj3Ig,5218
-spl_core-7.8.0rc1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-spl_core-7.8.0rc1.dist-info/entry_points.txt,sha256=18_sdVY93N1GVBiAHxQ_F9ZM-bBvOmVMOMn7PNe2EqU,45
-spl_core-7.8.0rc1.dist-info/RECORD,,
+spl_core-7.10.0.dist-info/LICENSE,sha256=UjjA0o8f5tT3wVm7qodTLAhPWLl6kgVyn9FPAd1VeYY,1099
+spl_core-7.10.0.dist-info/METADATA,sha256=fxTSSCZ-7zsqJ2NjPPAnRHzZO5lSoucxEixSCsBVbQM,5258
+spl_core-7.10.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+spl_core-7.10.0.dist-info/entry_points.txt,sha256=18_sdVY93N1GVBiAHxQ_F9ZM-bBvOmVMOMn7PNe2EqU,45
+spl_core-7.10.0.dist-info/RECORD,,