spl-core 7.3.2__tar.gz → 7.4.0__tar.gz

{spl_core-7.3.2 → spl_core-7.4.0}/PKG-INFO

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

{spl_core-7.3.2 → spl_core-7.4.0}/pyproject.toml

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

spl_core-7.4.0/src/spl_core/__init__.py

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

{spl_core-7.3.2 → spl_core-7.4.0}/src/spl_core/common.cmake

@@ -192,10 +192,17 @@ macro(spl_create_component)
 \"has_reports\": \"\",
 \"reports_output_dir\": \"\"
 }")
-    if(SOURCES)
-        # Create the component library
+    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
+        (BUILD_KIT STREQUAL test AND TEST_SOURCES))
         add_library(${component_name} ${CREATE_COMPONENT_LIBRARY_TYPE} ${SOURCES})
+    else()
+        # Add header only component
+        set(_component_is_header_only TRUE)
+        add_library(${component_name} INTERFACE)
     endif()
+
     if(BUILD_KIT STREQUAL prod)
         if(SOURCES)
             # Define list of productive specific compile options for component's sources
@@ -213,7 +220,6 @@ macro(spl_create_component)
 
         set(_component_dir ${CMAKE_CURRENT_LIST_DIR})
         set(_component_doc_dir ${_component_dir}/doc)
-        set(_component_doc_file ${_component_doc_dir}/index.rst)
         set(_component_test_junit_xml ${CMAKE_CURRENT_BINARY_DIR}/junit.xml)
         set(_component_coverage_json ${CMAKE_CURRENT_BINARY_DIR}/coverage.json)
         set(_component_docs_out_dir ${CMAKE_CURRENT_BINARY_DIR}/docs)
@@ -223,7 +229,7 @@ macro(spl_create_component)
         set(_sphinx_source_dir ${PROJECT_SOURCE_DIR})
 
         # Create component docs target if there is an index.rst file in the component's doc directory
-        if(EXISTS ${_component_doc_file})
+        if(EXISTS ${_component_doc_dir}/index.rst OR EXISTS ${_component_doc_dir}/index.md)
             file(RELATIVE_PATH _rel_component_docs_out_dir ${_sphinx_source_dir} ${_component_docs_out_dir})
             string(JSON _component_info SET "${_component_info}" docs_output_dir "\"${_rel_component_docs_out_dir}\"")
             string(JSON _component_info SET "${_component_info}" has_docs "\"True\"")
@@ -355,7 +361,7 @@ Code Coverage
             # Collect all component sphinx include pattern to be used in the variant targets (docs, reports)
             list(APPEND COMPONENTS_SPHINX_INCLUDE_PATTERNS "${_rel_component_doc_dir}/**" "${_rel_component_docs_out_dir}/**" "${_rel_component_reports_out_dir}/**")
             set(COMPONENTS_SPHINX_INCLUDE_PATTERNS ${COMPONENTS_SPHINX_INCLUDE_PATTERNS} PARENT_SCOPE)
-        endif(EXISTS ${_component_doc_file})
+        endif(EXISTS ${_component_doc_dir}/index.rst OR EXISTS ${_component_doc_dir}/index.md)
     endif(BUILD_KIT STREQUAL prod)
 
     # Implicitly add default include directories to provided interfaces
@@ -376,10 +382,18 @@ 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)
-            target_include_directories(${component_name} PUBLIC ${interfaceDir})
+            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)
-            target_link_libraries(${component_name} PUBLIC ${component})
+            if(_component_is_header_only)
+                target_link_libraries(${component_name} INTERFACE ${component})
+            else()
+                target_link_libraries(${component_name} PUBLIC ${component})
+            endif()
         endforeach()
     endif()
 

{spl_core-7.3.2 → spl_core-7.4.0}/src/spl_core/kickstart/templates/project/build.ps1

@@ -261,7 +261,7 @@ function Get-User-Menu-Selection {
 
 function Invoke-Bootstrap {
     # Download bootstrap scripts from external repository
-    Invoke-RestMethod -Uri https://raw.githubusercontent.com/avengineers/bootstrap-installer/v1.17.0/install.ps1 | Invoke-Expression
+    Invoke-RestMethod -Uri https://raw.githubusercontent.com/avengineers/bootstrap-installer/v1.17.1/install.ps1 | Invoke-Expression
     # Execute bootstrap script
     . .\.bootstrap\bootstrap.ps1
 }

{spl_core-7.3.2 → spl_core-7.4.0}/src/spl_core/test_utils/base_variant_test_runner.py

@@ -81,7 +81,7 @@ class BaseVariantTestRunner(ABC):
     @pytest.mark.reports
     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
+        assert 0 == spl_build.execute(target="reports")  # noqa: S101
         for artifact in self.expected_variant_report_artifacts:
             self.assert_artifact_exists(dir=spl_build.build_dir, artifact=artifact)
         for component in self.component_paths:

spl_core-7.3.2/src/spl_core/__init__.py

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