Skip to content

Commit c4fef8e

Browse files
authored
build proper documentation (#115)
* build proper documentation * patch duplicated needs names in persistency
1 parent ed02885 commit c4fef8e

12 files changed

Lines changed: 171 additions & 39 deletions

BUILD

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,21 @@ load("@score_docs_as_code//:docs.bzl", "docs")
1515

1616
docs(
1717
data = [
18-
"@score_platform//:needs_json",
19-
#"@score_persistency//:needs_json", # cannot be included, as it does not contain any needs?
20-
#"@score_orchestrator//:needs_json", # some issue about score_toolchains_qnx?
21-
#"@score_communication//:needs_json", # no docs yet?
18+
# Software components
19+
"@score_persistency//:needs_json",
20+
"@score_orchestrator//:needs_json",
21+
"@score_kyron//:needs_json",
22+
"@score_baselibs//:needs_json",
23+
"@score_baselibs_rust//:needs_json",
24+
# "@score_communication//:needs_json", # no docs_sources
25+
# "@score_lifecycle_health//:needs_json", # unreadable images - relative paths issue
26+
# "@score_logging//:needs_json", # duplicated labels
27+
"@score_logging//:needs_json",
2228
# "@score_feo//:needs_json",
23-
"@score_docs_as_code//:needs_json",
29+
# Tools
30+
"@score_platform//:needs_json",
2431
"@score_process//:needs_json",
32+
"@score_docs_as_code//:needs_json",
2533
],
2634
source_dir = "docs",
2735
)

bazel_common/score_modules_target_sw.MODULE.bazel

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ git_override(
4848
module_name = "score_persistency",
4949
remote = "https://github.com/eclipse-score/persistency.git",
5050
commit = "9692dadab51c677183262e8870c5425ab1797c4f",
51+
patches = [
52+
"//patches/persistency:fix-duplicated-needs-name.patch",
53+
],
54+
patch_strip = 1,
5155
)
5256

5357
bazel_dep(name = "score_orchestrator")

bazel_common/score_modules_tooling.MODULE.bazel

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ bazel_dep(name = "score_docs_as_code")
5656
single_version_override(
5757
module_name = "score_docs_as_code",
5858
version = "3.0.1",
59+
patches = [
60+
"//patches/docs-as-code:fix-extra-properties.patch",
61+
],
62+
patch_strip = 1,
5963
)
6064

6165
bazel_dep(name = "score_process")

docs/index.rst

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,38 @@ Reference Integration Documentation
1717

1818
Newest Release Notes: :need:`doc__score_v05_beta_release_note`
1919

20-
Verification Reports Summaries
21-
------------------------------
2220

2321
.. toctree::
24-
verification/verification
22+
:caption: Software Components
23+
:titlesonly:
24+
:maxdepth: 1
25+
26+
27+
_collections/score_persistency/docs/index
28+
_collections/score_orchestrator/docs/index
29+
_collections/score_kyron/docs/index
30+
_collections/score_baselibs/docs/index
31+
_collections/score_baselibs_rust/docs/index
32+
_collections/score_logging/docs/index
33+
34+
.. toctree::
35+
:caption: Process, Methods, and Tools
36+
:titlesonly:
37+
:maxdepth: 1
2538

26-
.. if-collection:: score_platform
39+
_collections/score_platform/docs/index
40+
_collections/score_process/process/index
41+
_collections/score_docs_as_code/docs/index
2742

28-
.. toctree::
29-
:maxdepth: 1
30-
:titlesonly:
31-
:caption: Platform and Modules
43+
.. toctree::
44+
:caption: Code Quality
45+
:titlesonly:
46+
:glob:
3247

33-
S-CORE Platform <_collections/score_platform/docs/index>
34-
place_holder/persistency
35-
place_holder/orchestrator
36-
place_holder/communication
48+
verification/verification
3749

38-
.. toctree::
39-
:maxdepth: 1
40-
:titlesonly:
41-
:caption: Process, Methods, and Tools
50+
.. toctree::
51+
:hidden:
52+
:glob:
4253

43-
_collections/score_process/process/index
44-
_collections/score_docs_as_code/docs/index
54+
verification/*

docs/place_holder/communication.rst

Lines changed: 0 additions & 5 deletions
This file was deleted.

docs/place_holder/orchestrator.rst

Lines changed: 0 additions & 5 deletions
This file was deleted.

docs/place_holder/persistency.rst

Lines changed: 0 additions & 5 deletions
This file was deleted.

known_good.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@
5555
"score_persistency": {
5656
"repo": "https://github.com/eclipse-score/persistency.git",
5757
"hash": "9692dadab51c677183262e8870c5425ab1797c4f",
58+
"bazel_patches": [
59+
"//patches/persistency:fix-duplicated-needs-name.patch"
60+
],
5861
"metadata": {
5962
"code_root_path": "//src/...",
6063
"exclude_test_targets": [
@@ -138,7 +141,10 @@
138141
},
139142
"score_docs_as_code": {
140143
"repo": "https://github.com/eclipse-score/docs-as-code.git",
141-
"version": "3.0.1"
144+
"version": "3.0.1",
145+
"bazel_patches": [
146+
"//patches/docs-as-code:fix-extra-properties.patch"
147+
]
142148
},
143149
"score_process": {
144150
"repo": "https://github.com/eclipse-score/process_description.git",

patches/docs-as-code/BUILD

Whitespace-only changes.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
diff --git a/src/extensions/score_source_code_linker/testlink.py b/src/extensions/score_source_code_linker/testlink.py
2+
index 50066fe3..51311f3e 100644
3+
--- a/src/extensions/score_source_code_linker/testlink.py
4+
+++ b/src/extensions/score_source_code_linker/testlink.py
5+
@@ -93,7 +93,17 @@ class DataOfTestCase:
6+
7+
@classmethod
8+
def from_dict(cls, data: dict[str, Any]): # type-ignore
9+
- return cls(**data) # type-ignore
10+
+ return cls(
11+
+ name=data.get("name", ""),
12+
+ file=data.get("file", ""),
13+
+ line=data.get("line", ""),
14+
+ result=data.get("result", ""),
15+
+ TestType=data.get("TestType", ""),
16+
+ DerivationTechnique=data.get("DerivationTechnique", ""),
17+
+ result_text=data.get("result_text", ""),
18+
+ PartiallyVerifies=data.get("PartiallyVerifies", ""),
19+
+ FullyVerifies=data.get("FullyVerifies", ""),
20+
+ )
21+
22+
@classmethod
23+
def clean_text(cls, text: str):

0 commit comments

Comments
 (0)