spl-core 4.1.2__tar.gz → 4.3.0__tar.gz

{spl_core-4.1.2 → spl_core-4.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spl-core
-Version: 4.1.2
+Version: 4.3.0
 Summary: Software Product Line Support for CMake
 Home-page: https://github.com/avengineers/spl-core
 License: MIT
@@ -17,10 +17,22 @@ 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: py-app-dev (>=2.1.0,<3.0.0)
+Requires-Dist: sphinx (>=7.3.5,<8.0.0)
+Requires-Dist: sphinx-copybutton (>=0.5.2,<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: sphinxcontrib-plantuml (>=0.29,<0.30)
+Requires-Dist: typer[all] (>=0.12.3,<0.13.0)
 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
@@ -55,7 +67,7 @@ _SPL Core_ is our CMake module to support multiple projects as variants of one S
 With the integrated project creator you can create a new SPL workspace, e.g.:
 
 ```powershell
-pipenv run python src/project_creator/creator.py workspace --name MyProject --variant FLV1/SYS1 --out_dir C:\dev
+pipenv run python src/project_creator/creator.py workspace --name MyProject --variant MyVariant --out_dir C:\dev
 ```
 
 Note: one can use the `--variant` argument several times to create a project with multiple variants.

{spl_core-4.1.2 → spl_core-4.3.0}/README.md

@@ -26,7 +26,7 @@ _SPL Core_ is our CMake module to support multiple projects as variants of one S
 With the integrated project creator you can create a new SPL workspace, e.g.:
 
 ```powershell
-pipenv run python src/project_creator/creator.py workspace --name MyProject --variant FLV1/SYS1 --out_dir C:\dev
+pipenv run python src/project_creator/creator.py workspace --name MyProject --variant MyVariant --out_dir C:\dev
 ```
 
 Note: one can use the `--variant` argument several times to create a project with multiple variants.

{spl_core-4.1.2 → spl_core-4.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "spl-core"
-version = "4.1.2"
+version = "4.3.0"
 description = "Software Product Line Support for CMake"
 authors = ["Avengineers <karsten.guenther@kamg.de>"]
 license = "MIT"
@@ -18,6 +18,9 @@ packages = [
     { include = "spl_core", from = "src" },
 ]
 
+[tool.poetry.scripts]
+please = "spl_core.main:main"
+
 [tool.poetry.urls]
 "Bug Tracker" = "https://github.com/avengineers/spl-core/issues"
 "Changelog" = "https://github.com/avengineers/spl-core/blob/develop/CHANGELOG.md"
@@ -29,6 +32,18 @@ cookiecutter = {version="==2.1.1"}
 gcovr = "*"
 hammocking = "*"
 kconfiglib = "*"
+typer = {extras = ["all"], version = "^0.12.3"}
+doxysphinx = "^3.3.7"
+sphinx = "^7.3.5"
+sphinx-rtd-theme = "^2.0.0"
+sphinxcontrib-mermaid = "^0.9.2"
+sphinx-needs = "^2.0.0"
+sphinx-test-reports = "^1.0.2"
+sphinx-rtd-size = "^0.2.0"
+sphinxcontrib-datatemplates = "^0.11.0"
+sphinxcontrib-plantuml = "^0.29"
+sphinx-copybutton = "^0.5.2"
+sphinx-new-tab-link = "^0.4.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.0"
@@ -43,17 +58,6 @@ mashumaro = "*"
 loguru = "*"
 m2r = "*"
 flake8 = "*"
-sphinx = "*"
-sphinx-rtd-theme = "*"
-sphinxcontrib-mermaid = "*"
-sphinx-needs = "*"
-sphinx-test-reports = "*"
-doxysphinx = "*"
-sphinx-rtd-size = "*"
-sphinxcontrib-datatemplates = "*"
-sphinxcontrib-plantuml = "*"
-sphinx-copybutton = "*"
-sphinx-new-tab-link = "*"
 pipenv = "*"
 pypeline-runner = "^0.2.1"
 
@@ -62,11 +66,7 @@ optional = true
 
 [tool.poetry.group.docs.dependencies]
 myst-parser = ">=0.16"
-sphinx = ">=4.0"
-sphinxcontrib-mermaid = "^0.8.1"
 mlx-traceability = "^10.0.0"
-sphinx-copybutton = "^0.5.2"
-sphinx-new-tab-link = "^0.2.2"
 sphinx-book-theme = "^1.1.2"
 sphinx-design = "^0.5.0"
 
@@ -95,7 +95,7 @@ match = "(?!develop$)"
 prerelease = true
 
 [tool.pytest.ini_options]
-addopts = " --verbose --capture=tee-sys --junitxml=out/test-report.xml"
+addopts = " -vv --capture=tee-sys --junitxml=out/test-report.xml"
 pythonpath = ["src", "tests"]
 testpaths = ["tests"]
 junit_logging = "all"
@@ -139,7 +139,8 @@ lint.select = [
     "RUF", # ruff specific
 ]
 exclude = [
-    "bootstrap.py"
+    "bootstrap.py",
+    "src/spl_core/kickstart/templates/project/conf.py"
 ]
 
 [tool.ruff.lint.per-file-ignores]

spl_core-4.3.0/src/spl_core/__init__.py

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

spl_core-4.3.0/src/spl_core/__run.py

@@ -0,0 +1,12 @@
+"""
+Used to run spl-core from the command line when run from this repository.
+
+This is required because the spl-core Python module is not visible when running from the repository.
+"""
+
+import runpy
+import sys
+from pathlib import Path
+
+sys.path.insert(0, Path(__file__).parent.parent.absolute().as_posix())
+runpy.run_module("spl_core.main", run_name="__main__")

{spl_core-4.1.2 → spl_core-4.3.0}/src/spl_core/common/command_line_executor.py

@@ -30,7 +30,9 @@ class CommandLineExecutor:
         command = " ".join([cmd] if isinstance(cmd, str) else cmd)
         output = ""
         try:
-            print(f"Running command: {command}")
+            print("=" * 120)
+            print(f"= Running command: {command}")
+            print("=" * 120)
             with subprocess.Popen(
                 command,
                 cwd=str(self.current_working_directory or Path.cwd()),

spl_core-4.3.0/src/spl_core/kickstart/create.py

@@ -0,0 +1,66 @@
+import shutil
+from pathlib import Path
+from typing import List, Optional, Union
+
+from py_app_dev.core.exceptions import UserNotificationException
+from py_app_dev.core.logging import logger
+
+
+class ProjectBuilder:
+    def __init__(self, project_dir: Path, input_dir: Optional[Path] = None) -> None:
+        self.project_dir = project_dir
+        self.input_dir = input_dir if input_dir else Path(__file__).parent.joinpath("templates")
+
+        self.dirs: List[Path] = []
+        self.check_target_directory_flag = True
+
+    def with_disable_target_directory_check(self) -> "ProjectBuilder":
+        self.check_target_directory_flag = False
+        return self
+
+    def with_dir(self, dir: Union[Path, str]) -> "ProjectBuilder":
+        self.dirs.append(self.resolve_file_path(dir))
+        return self
+
+    def resolve_file_paths(self, files: List[Path | str]) -> List[Path]:
+        return [self.resolve_file_path(file) for file in files]
+
+    def resolve_file_path(self, file: Union[Path, str]) -> Path:
+        return self.input_dir.joinpath(file) if isinstance(file, str) else file
+
+    @staticmethod
+    def _check_target_directory(project_dir: Path) -> None:
+        if project_dir.is_dir() and any(project_dir.iterdir()):
+            raise UserNotificationException(f"Project directory '{project_dir}' is not empty. Use --force to override.")
+
+    def build(self) -> None:
+        if self.check_target_directory_flag:
+            self._check_target_directory(self.project_dir)
+        for dir in self.dirs:
+            shutil.copytree(dir, self.project_dir, dirs_exist_ok=True)
+
+
+class KickstartProject:
+    """Kickstart a new project in the given directory.
+
+    Args:
+        project_dir (Path): The directory where the project should be created.
+        force (bool, optional): If True, the project directory will be overridden if it is not empty. Defaults to False.
+        no_application (bool, optional): If True, the project will not contain variants and components.
+    """
+
+    def __init__(self, project_dir: Path, force: bool = False, no_application: bool = False) -> None:
+        self.logger = logger.bind()
+        self.project_dir = project_dir
+        self.force = force
+        self.no_application = no_application
+
+    def run(self) -> None:
+        self.logger.info(f"Kickstart new project in '{self.project_dir.absolute().as_posix()}'")
+        project_builder = ProjectBuilder(self.project_dir)
+        if self.force:
+            project_builder.with_disable_target_directory_check()
+        project_builder.with_dir("project")
+        if not self.no_application:
+            project_builder.with_dir("application")
+        project_builder.build()

spl_core-4.3.0/src/spl_core/kickstart/templates/application/.vscode/cmake-variants.json

@@ -0,0 +1,20 @@
+{
+  "variant": {
+    "choices": {"EnglishVariant": {
+        "buildType": "EnglishVariant",
+        "long": "select to build variant 'EnglishVariant'",
+        "settings": {
+          "VARIANT": "EnglishVariant"
+        },
+        "short": "EnglishVariant"
+      }, "GermanVariant": {
+        "buildType": "GermanVariant",
+        "long": "select to build variant 'GermanVariant'",
+        "settings": {
+          "VARIANT": "GermanVariant"
+        },
+        "short": "GermanVariant"
+      }},
+    "default": "EnglishVariant"
+  }
+}

{spl_core-4.1.2/src/spl_core/project_creator/templates/project/{{cookiecutter.name}} → spl_core-4.3.0/src/spl_core/kickstart/templates/application}/KConfig

@@ -17,7 +17,7 @@ menu "Linking"
 endmenu
 
 menu "Feature Model"
-    config USE_COMPONENT
-        bool "Enable features of component"
+    config LANG_DE
+        bool "German language selection"
         default n
 endmenu

spl_core-4.3.0/src/spl_core/kickstart/templates/application/src/greeter/CMakeLists.txt

@@ -0,0 +1,3 @@
+spl_add_source(src/greeter.c)
+spl_add_test_source(test/test_greeter.cc)
+spl_create_component(LONG_NAME "Greeter")

spl_core-4.3.0/src/spl_core/kickstart/templates/application/src/greeter/doc/index.rst

@@ -0,0 +1,26 @@
+Software Detailed Design
+========================
+
+.. figure:: _images/screenshot.png
+
+.. mermaid::
+
+   graph TD
+      A[Start] --> B{Language}
+      B -->|DE| C[Hallo Welt]
+      B -->|EN| D[Hello World]
+      C --> E[End]
+      D --> E
+
+Requirements
+------------
+
+.. spec:: Say Hello
+   :id: SWDD_GREETER-001
+   :integrity: QM
+
+{% if config.LANG_DE %}
+   It shall greet the user with ``Hallo Welt``.
+{% else %}
+   It shall greet the user with ``Hello World``.
+{% endif %}

spl_core-4.3.0/src/spl_core/kickstart/templates/application/src/greeter/src/greeter.c

@@ -0,0 +1,24 @@
+/**
+ * @file greeter.c
+ * @brief Greeter implementation.
+ */
+
+
+#include "greeter.h"
+#include "autoconf.h"
+
+/*!
+* @rst
+*
+* .. impl:: Select the greeting message
+*    :id: SWIMPL_GREETER-001
+*    :implements: SWDD_GREETER-001
+* @endrst
+*/
+const char* get_greeting() {
+    #if defined(CONFIG_LANG_DE) && CONFIG_LANG_DE == 1
+        return "Hallo, Welt!";
+    #else
+        return "Hello, world!";
+    #endif
+}

spl_core-4.3.0/src/spl_core/kickstart/templates/application/src/greeter/src/greeter.h

@@ -0,0 +1,6 @@
+#ifndef GREETER_H
+#define GREETER_H
+
+extern const char* get_greeting();
+
+#endif // GREETER_H

spl_core-4.3.0/src/spl_core/kickstart/templates/application/src/greeter/test/test_greeter.cc

@@ -0,0 +1,27 @@
+/**
+ * @file
+ */
+#include <gtest/gtest.h>
+
+extern "C" {
+    #include "greeter.h"
+    #include "autoconf.h"
+}
+
+#if defined(CONFIG_LANG_DE) && CONFIG_LANG_DE == 1
+const char *greeting = "Hallo, Welt!";
+#else
+const char *greeting = "Hello, world!";
+#endif
+/*!
+* @rst
+*
+* .. test:: greeter.test_get_greeting
+*    :id: TS_GREETER-001
+*    :tests: SWDD_GREETER-001
+*
+* @endrst
+*/
+TEST(greeter, test_get_greeting) {
+    EXPECT_STREQ(greeting, get_greeting());
+}

spl_core-4.1.2/src/spl_core/project_creator/templates/project/{{cookiecutter.name}}/{% if cookiecutter.touch_components -%} components {%- endif %}/main/doc/index.rst → spl_core-4.3.0/src/spl_core/kickstart/templates/application/src/main/doc/index.rst

@@ -9,6 +9,10 @@ Introduction
 
 This is the documentation for the ``Main`` component.
 
-{% if config.USE_COMPONENT %}
-``USE_COMPONENT`` is enabled. Therefore ``Main`` shall call ``Component``.
+The application will say
+{% if config.LANG_DE %}
+``Hallo Welt``
+{% else %}
+``Hello World``
 {% endif %}
+.

spl_core-4.3.0/src/spl_core/kickstart/templates/application/src/main/src/main.c

@@ -0,0 +1,13 @@
+/**
+ * @file main.c
+ * @brief Main file for the greeter application.
+ */
+
+#include <stdio.h>
+#include "greeter.h"
+
+int main(int argc, char *argv[])
+{
+    printf("%s\n", get_greeting());
+    return 0;
+}

spl_core-4.3.0/src/spl_core/kickstart/templates/application/test/EnglishVariant/test__EnglishVariant.py

@@ -0,0 +1,16 @@
+from pathlib import Path
+from typing import List
+
+from spl_core.test_utils.base_variant_test_runner import BaseVariantTestRunner
+
+
+class Test_EnglishVariant(BaseVariantTestRunner):
+    @property
+    def component_paths(self) -> List[Path]:
+        return [
+            Path("src/greeter"),
+        ]
+
+    @property
+    def expected_build_artifacts(self) -> List[Path]:
+        return [Path("my_main.exe"), Path("compile_commands.json")]

spl_core-4.3.0/src/spl_core/kickstart/templates/application/test/German/test__GermanVariant.py

@@ -0,0 +1,16 @@
+from pathlib import Path
+from typing import List
+
+from spl_core.test_utils.base_variant_test_runner import BaseVariantTestRunner
+
+
+class Test_GermanVariant(BaseVariantTestRunner):
+    @property
+    def component_paths(self) -> List[Path]:
+        return [
+            Path("src/greeter"),
+        ]
+
+    @property
+    def expected_build_artifacts(self) -> List[Path]:
+        return [Path("my_main.exe"), Path("compile_commands.json")]

spl_core-4.3.0/src/spl_core/kickstart/templates/application/variants/EnglishVariant/parts.cmake

@@ -0,0 +1,2 @@
+spl_add_component(src/main)
+spl_add_component(src/greeter)

spl_core-4.3.0/src/spl_core/kickstart/templates/application/variants/GermanVariant/config.cmake

@@ -0,0 +1 @@
+set(CMAKE_TOOLCHAIN_FILE tools/toolchains/clang/toolchain.cmake CACHE PATH "toolchain file")

spl_core-4.3.0/src/spl_core/kickstart/templates/application/variants/GermanVariant/config.txt

@@ -0,0 +1,13 @@
+
+#
+# Linking
+#
+CONFIG_LINKER_OUTPUT_FILE="my_main.exe"
+CONFIG_LINKER_BYPRODUCTS_EXTENSIONS="map"
+# end of Linking
+
+#
+# Feature Model
+#
+CONFIG_LANG_DE=y
+# end of Feature Model

spl_core-4.3.0/src/spl_core/kickstart/templates/application/variants/GermanVariant/parts.cmake

@@ -0,0 +1,2 @@
+spl_add_component(src/main)
+spl_add_component(src/greeter)

{spl_core-4.1.2/src/spl_core/project_creator/templates/project/{{cookiecutter.name}} → spl_core-4.3.0/src/spl_core/kickstart/templates/project}/.gitignore

@@ -1,3 +1,6 @@
+# Python virtual environment
+.venv
+
 # Binary output dir, not recommended to push binary results to Git.
 /build
 

spl_core-4.3.0/src/spl_core/kickstart/templates/project/.vscode/extensions.json

@@ -0,0 +1,20 @@
+{
+    "recommendations": [
+        "mhutchie.git-graph",
+        "ms-vscode.cmake-tools",
+        "twxs.cmake",
+        "ms-vscode.cpptools",
+        "ms-vscode.cpptools-themes",
+        "visualstudioexptteam.intellicode-api-usage-examples",
+        "visualstudioexptteam.vscodeintellicode",
+        "haugerbr.project-tasks",
+        "avengineers.show-link-list",
+        "ms-python.vscode-pylance",
+        "ms-python.python",
+        "donjayamanne.python-environment-manager",
+        "felipecaputo.git-project-manager",
+        "ms-vscode.powershell",
+        "waderyan.gitblame",
+        "sandcastle.vscode-open"
+    ]
+}

{spl_core-4.1.2/src/spl_core/project_creator/templates/project/{{cookiecutter.name}} → spl_core-4.3.0/src/spl_core/kickstart/templates/project}/.vscode/tasks.json

@@ -69,13 +69,25 @@
             "label": "Configure variant",
             "detail": "Feature configuration using KConfig",
             "type": "shell",
-            "command": "pipenv run guiconfig",
+            "command": ".venv/Scripts/poetry run guiconfig",
             "options": {
                 "env": {
                     "KCONFIG_CONFIG": "variants/${input:variant}/config.txt"
                 }
             },
             "problemMatcher": []
+        },
+        {
+            "label": "open report html",
+            "command": "${workspaceFolder}/build/${input:variant}/test/src/${input:component}/reports/html/index.html",
+            "type": "shell",
+            "presentation": {
+                "reveal": "always"
+            },
+            "group": {
+                "kind": "build",
+                "isDefault": false
+            }
         }
     ],
     "inputs": [
@@ -84,9 +96,17 @@
             "id": "variant",
             "description": "Which variant do you want to select?",
             "options": [
-{%- for variant in cookiecutter.variants.values() -%}
-                "{{ variant["flavor"] }}/{{ variant["subsystem"] }}",
-{%- endfor -%}
+                "EnglishVariant",
+                "GermanVariant"
+            ]
+        },
+        {
+            "type": "pickString",
+            "id": "component",
+            "description": "Which component do you want to select?",
+            "options": [
+                "greeter",
+                "main"
             ]
         }
     ]

{spl_core-4.1.2/src/spl_core/project_creator/templates/project/{{cookiecutter.name}} → spl_core-4.3.0/src/spl_core/kickstart/templates/project}/CMakeLists.txt

@@ -2,15 +2,23 @@
 cmake_minimum_required(VERSION 3.24.0)
 cmake_policy(VERSION 3.24)
 
+# configure the current variant to be build
 set(BUILD_KIT prod CACHE STRING "Target Group to build.")
 
 include(${CMAKE_SOURCE_DIR}/variants/${VARIANT}/config.cmake)
 
 if(BUILD_KIT STREQUAL prod)
     project(${VARIANT} C ASM)
+    set(VARIANT_ADDITIONAL_COMPILE_C_FLAGS -Dstatic_scope_file=static)
 else()
+    # In case of test the project is a C++ project due to GTest usage
     project(${VARIANT} C ASM CXX)
-    set(VARIANT_ADDITIONAL_COMPILE_C_FLAGS -Dstatic= -save-temps)
+
+    # define static to nothing on file scope to allow access to
+    # static variables and function in unit test cases.
+    # Furthermore store temporary files during compilation to
+    # get preprocessed files.
+    set(VARIANT_ADDITIONAL_COMPILE_C_FLAGS -Dstatic_scope_file= -save-temps)
 endif()
 
 # Fetch all external dependencies into modules directory

{spl_core-4.1.2/src/spl_core/project_creator/templates/project/{{cookiecutter.name}} → spl_core-4.3.0/src/spl_core/kickstart/templates/project}/build.ps1

@@ -15,6 +15,8 @@ https://go.microsoft.com/fwlink/?LinkID=135170
 param(
     [Parameter(Mandatory = $false, HelpMessage = 'Install all dependencies required to build. (Switch, default: false)')]
     [switch]$install = $false,
+    [Parameter(Mandatory = $false, HelpMessage = 'Build the target.')]
+    [switch]$build = $false,
     [Parameter(Mandatory = $false, HelpMessage = 'Clean build, wipe out all build artifacts. (Switch, default: false)')]
     [switch]$clean = $false,
     [Parameter(Mandatory = $false, HelpMessage = 'Build kit to be used. (String, default: "prod")')]
@@ -74,6 +76,38 @@ function Test-RunningInCIorTestEnvironment {
     return [Boolean]($Env:JENKINS_URL -or $Env:PYTEST_CURRENT_TEST -or $Env:GITHUB_ACTIONS)
 }
 
+# Consider CI environment variables (e.g. on Jenkins BRANCH_NAME and CHANGE_TARGET) to filter tests in release branch builds
+function Get-ReleaseBranchPytestFilter {
+    $ChangeId = $env:CHANGE_ID
+    $BranchName = $env:BRANCH_NAME
+    $ChangeTarget = $env:CHANGE_TARGET
+
+    $targetBranch = ''
+
+    if (-not $ChangeId -and $BranchName -and $BranchName.StartsWith("release/")) {
+        $targetBranch = $BranchName
+    }
+
+    if ($ChangeId -and $ChangeTarget -and $ChangeTarget.StartsWith("release/") ) {
+        $targetBranch = $ChangeTarget
+    }
+
+    $filter = ''
+    if ($targetBranch -and ($targetBranch -match 'release/([^/]+/[^/]+)(.*)')) {
+        $filter = $Matches[1]
+    }
+
+    return $filter
+}
+
+function Invoke-Bootstrap {
+    # Download bootstrap scripts from external repository
+    Invoke-RestMethod https://raw.githubusercontent.com/avengineers/bootstrap-installer/v1.5.0/install.ps1 | Invoke-Expression
+    # Execute bootstrap script
+    . .\.bootstrap\bootstrap.ps1
+}
+
+
 # Build with given parameters
 Function Invoke-Build {
     param (
@@ -110,9 +144,9 @@ Function Invoke-Build {
 
         # Filter pytest test cases
         $filterCmd = ''
-        # Consider environment variable BRANCH_NAME (e.g. on Jenkins) to filter tests in release branch builds
-        if ($Env:BRANCH_NAME -and ($Env:BRANCH_NAME -match 'release/([^/]+/[^/]+)(.*)')) {
-            $filterCmd = "-k " + $Matches[1]
+        $releaseBranchFilter = Get-ReleaseBranchPytestFilter
+        if ($releaseBranchFilter) {
+            $filterCmd = "-k '$releaseBranchFilter'"
         }
         # otherwise consider command line option '-filter' if given
         elseif ($filter) {
@@ -135,7 +169,7 @@ Function Invoke-Build {
             $dirs = Get-Childitem -Include config.cmake -Path variants -Recurse | Resolve-Path -Relative
             $variantsList = @()
             Foreach ($dir in $dirs) {
-                $variant = (get-item $dir).Directory.Parent.BaseName + "/" + (get-item $dir).Directory.BaseName
+                $variant = (get-item $dir).Directory.BaseName
                 $variantsList += $variant
             }
             $variantsSelected = @()
@@ -158,7 +192,7 @@ Function Invoke-Build {
         }
 
         # Select 'test' build kit based on target
-        if ($target.Contains("unittests") -or $target.Contains("reports")) {
+        if ($target.Contains("unittests") -or $target.Contains("reports") -or $target.Contains("docs")) {
             $buildKit = "test"
         }
 
@@ -211,21 +245,17 @@ Push-Location $PSScriptRoot
 Write-Output "Running in ${pwd}"
 
 try {
+    if (Test-RunningInCIorTestEnvironment -or $Env:USER_PATH_FIRST) {
+        Initialize-EnvPath
+    }
+
     if ($install) {
-        # Installation of Scoop, Python and pipenv via bootstrap
-        if (-Not (Test-Path -Path '.bootstrap')) {
-            New-Item -ItemType Directory '.bootstrap'
-        }
-        Invoke-RestMethod "https://raw.githubusercontent.com/avengineers/bootstrap/v1.3.0/bootstrap.ps1" -OutFile ".\.bootstrap\bootstrap.ps1"
-        Invoke-CommandLine ". .\.bootstrap\bootstrap.ps1" -Silent $true
-        Write-Output "For installation changes to take effect, please close and re-open your current shell."
+        # bootstrap environment
+        Invoke-Bootstrap
     }
-    else {
+
+    if ($build) {
         # Call build system
-        if (Test-RunningInCIorTestEnvironment -or $Env:USER_PATH_FIRST) {
-            Initialize-EnvPath
-        }
-        # Call CMake
         Invoke-Build `
             -target $target `
             -buildKit $buildKit `