Skip to content

Commit 0eed12f

Browse files
Scott DixonScott Dixon
authored andcommitted
issue #108 progress
improving some coverage, cleaning up a few sonarlint issues, and steering vscode users to clangd.
1 parent 6755811 commit 0eed12f

26 files changed

Lines changed: 216 additions & 352 deletions

.github/workflows/cetlvast.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -190,23 +190,6 @@ jobs:
190190
- name: SonarQube Scan
191191
uses: SonarSource/sonarqube-scan-action@v5.3.0
192192
if: ${{ env.SONAR_TOKEN != '' }}
193-
with:
194-
args: >
195-
-Dsonar.organization=opencyphal
196-
-Dsonar.projectKey=OpenCyphal_CETL
197-
-Dsonar.projectName=CETLVaSt
198-
-Dsonar.verbose=true
199-
-Dsonar.cfamily.compile-commands=cetlvast/build/compile_commands.json
200-
-Dsonar.cfamily.cobertura.reportPaths=cetlvast/build/suites/unittest/coverage.xml
201-
-Dsonar.testExecutionReportPaths=cetlvast/build/suites/unittest/unittest-sonarqube.xml
202-
-Dsonar.sources="include,cetlvast/suites/unittest/sonar.cpp"
203-
-Dsonar.tests="cetlvast/suites/unittest"
204-
-Dsonar.test.inclusions="**/test_*.cpp"
205-
-Dsonar.cfamily.ignoreHeaderComments=false
206-
-Dsonar.coverage.exclusions="cetlvast/**/*,**/sonar.cpp"
207-
-Dsonar.cpd.exclusions="cetlvast/**/*,**/sonar.cpp"
208-
-Dsonar.cfamily.reportingCppStandardOverride=c++14
209-
210193
deploy-docs:
211194
if: >
212195
(github.event_name == 'release' && !github.event.release.prerelease) ||

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,6 @@ Vagrantfile
5050
cmake-build-*/
5151

5252
*.gcov
53+
54+
# clangd
55+
.cache

.vscode/extensions.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"xaver.clang-format",
88
"vadimcn.vscode-lldb",
99
"matepek.vscode-catch2-test-adapter",
10-
"ms-vscode.hexeditor",
11-
"Jme797.prettier-vscode-extension"
10+
"sonarsource.sonarlint-vscode",
11+
"llvm-vs-code-extensions.vscode-clangd"
1212
]
1313
}

.vscode/settings.json

Lines changed: 4 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
"cmake.configureOnEdit": false,
44
"cmake.sourceDirectory": "${workspaceFolder}/cetlvast",
55
"cmake.buildBeforeRun": true,
6+
"C_Cpp.intelliSenseEngine": "disabled",
7+
"C_Cpp.autoAddFileAssociations": false,
68
"editor.wordWrapColumn": 120,
79
"files.insertFinalNewline": true,
810
"files.trimFinalNewlines": true,
@@ -30,7 +32,7 @@
3032
"pattern": "${workspaceFolder}/cetlvast/build/suites/benchmark/**/benchmark_*"
3133
}
3234
],
33-
"sonarlint.pathToCompileCommands": "${workspaceFolder}/build/compile_commands.json",
35+
"sonarlint.pathToCompileCommands": "${workspaceFolder}/cetlvast/build/compile_commands.json",
3436
"sonarlint.connectedMode.project": {
3537
"connectionId": "opencyphal",
3638
"projectKey": "OpenCyphal_CETL"
@@ -56,110 +58,6 @@
5658
},
5759
"files.associations": {
5860
"*.in": "cmake",
59-
"Config": "perl",
60-
"memory_resource": "cpp",
61-
"any": "cpp",
62-
"array": "cpp",
63-
"atomic": "cpp",
64-
"bit": "cpp",
65-
"*.tcc": "cpp",
66-
"bitset": "cpp",
67-
"cctype": "cpp",
68-
"chrono": "cpp",
69-
"clocale": "cpp",
70-
"cmath": "cpp",
71-
"codecvt": "cpp",
72-
"compare": "cpp",
73-
"concepts": "cpp",
74-
"condition_variable": "cpp",
75-
"cstdarg": "cpp",
76-
"cstddef": "cpp",
77-
"cstdint": "cpp",
78-
"cstdio": "cpp",
79-
"cstdlib": "cpp",
80-
"cstring": "cpp",
81-
"ctime": "cpp",
82-
"cwchar": "cpp",
83-
"cwctype": "cpp",
84-
"deque": "cpp",
85-
"forward_list": "cpp",
86-
"list": "cpp",
87-
"map": "cpp",
88-
"set": "cpp",
89-
"string": "cpp",
90-
"unordered_map": "cpp",
91-
"unordered_set": "cpp",
92-
"vector": "cpp",
93-
"exception": "cpp",
94-
"algorithm": "cpp",
95-
"functional": "cpp",
96-
"iterator": "cpp",
97-
"memory": "cpp",
98-
"numeric": "cpp",
99-
"optional": "cpp",
100-
"random": "cpp",
101-
"ratio": "cpp",
102-
"string_view": "cpp",
103-
"system_error": "cpp",
104-
"tuple": "cpp",
105-
"type_traits": "cpp",
106-
"utility": "cpp",
107-
"fstream": "cpp",
108-
"future": "cpp",
109-
"initializer_list": "cpp",
110-
"iomanip": "cpp",
111-
"iosfwd": "cpp",
112-
"iostream": "cpp",
113-
"istream": "cpp",
114-
"limits": "cpp",
115-
"mutex": "cpp",
116-
"new": "cpp",
117-
"numbers": "cpp",
118-
"ostream": "cpp",
119-
"regex": "cpp",
120-
"semaphore": "cpp",
121-
"shared_mutex": "cpp",
122-
"span": "cpp",
123-
"sstream": "cpp",
124-
"stdexcept": "cpp",
125-
"stop_token": "cpp",
126-
"streambuf": "cpp",
127-
"thread": "cpp",
128-
"cinttypes": "cpp",
129-
"typeinfo": "cpp",
130-
"variant": "cpp",
131-
"__bit_reference": "cpp",
132-
"__bits": "cpp",
133-
"__config": "cpp",
134-
"__debug": "cpp",
135-
"__errc": "cpp",
136-
"__hash_table": "cpp",
137-
"__locale": "cpp",
138-
"__mutex_base": "cpp",
139-
"__node_handle": "cpp",
140-
"__split_buffer": "cpp",
141-
"__threading_support": "cpp",
142-
"__tree": "cpp",
143-
"__tuple": "cpp",
144-
"__verbose_abort": "cpp",
145-
"ios": "cpp",
146-
"locale": "cpp",
147-
"queue": "cpp",
148-
"version": "cpp",
149-
"cassert": "cpp",
150-
"__memory": "cpp",
151-
"__nullptr": "cpp",
152-
"__string": "cpp",
153-
"ranges": "cpp",
154-
"complex": "cpp",
155-
"stack": "cpp",
156-
"strstream": "cpp",
157-
"typeindex": "cpp",
158-
"charconv": "cpp",
159-
"csignal": "cpp",
160-
"format": "cpp",
161-
"execution": "cpp",
162-
"filesystem": "cpp",
163-
"print": "cpp"
61+
"*.tcc": "cpp"
16462
}
16563
}

.vscode/words-cetl.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
arity
1+
arity
22
AUTOSAR
33
builddir
44
cetl
55
cetlpf
66
cetlvast
7+
cfamily
78
COMPILETEST_PRECHECK
89
copydoc
910
ctest
@@ -32,6 +33,7 @@ NOLINT
3233
NOLINTBEGIN
3334
NOLINTEND
3435
NOLINTNEXTLINE
36+
NOSONAR
3537
NOTFOUND
3638
opencyphal
3739
Pavel

cetlvast/CMakeLists.txt

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -206,12 +206,16 @@ else()
206206
)
207207
endif()
208208

209-
add_custom_target(
210-
docs
211-
DEPENDS
212-
lint
213-
generate_CETL_docs
214-
)
209+
if(DEFINED Doxygen_FOUND)
210+
if(${Doxygen_FOUND})
211+
add_custom_target(
212+
docs
213+
DEPENDS
214+
lint
215+
generate_CETL_docs
216+
)
217+
endif()
218+
endif()
215219

216220
add_custom_target(
217221
build

cetlvast/cmake/modules/ExternalDependenciesGitHub.cmake.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313

1414
set(GIT_TAG_benchmark "v1.9.1")
1515
set(GIT_TAG_googletest "v1.16.0")
16-
set(GIT_TAG_o1heap "aa3c253923db36eee7d73a4a5e30884a5fe7a6eb")
16+
set(GIT_TAG_o1heap "2.2.0")

cetlvast/cmake/modules/FindSonarScanner.cmake

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

cetlvast/cmake/modules/Findclangformat.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ function(enable_clang_format_check_for_directory)
5656
cmake_path(APPEND ARG_DIRECTORY "${ARG_GLOB_PATTERN}" OUTPUT_VARIABLE LOCAL_GLOB_PATTERN_WITH_PATH)
5757

5858
if (ARG_ADD_TO_ALL)
59-
set(LOCAL_ALL "ALL")
59+
set(LOCAL_ALL "ALL")
6060
else()
61-
set(LOCAL_ALL "")
61+
set(LOCAL_ALL "")
6262
endif()
6363

6464
file(GLOB_RECURSE LOCAL_SOURCE_FILES

cetlvast/cmake/modules/ProjectLibrary.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
# Function: add_project_library
1212
#
13-
# Add and install a library. This method combines all the most common setup for libcyphal library definitions
13+
# Add and install a library. This method combines all the most common setup for cetlvast library definitions
1414
# including defining install rules. Additional properties, dependencies, etc can be added after this function
1515
# using the library target named by the `NAME` argument you passed in.
1616
#

0 commit comments

Comments
 (0)