Skip to content

Commit 3905bf5

Browse files
anthonypayne-GManthonypayne-GM
committed
lib: someip-c: Added in vsomeip 3.5.1 source
Added the vsomeip 3.5.1 source to libsomeip-c library. Updated CMake file to remove the remote fetch and instead build the vsomeip source in sub-directory. Signed-off-by: Anthony Payne <[email protected]>
1 parent 6763dde commit 3905bf5

File tree

1,038 files changed

+150241
-7
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,038 files changed

+150241
-7
lines changed

‎lib/libsomeip-c/CMakeLists.txt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
project(someipc CXX)
22

3-
include(FetchContent)
4-
FetchContent_Declare(
5-
vsomeip3
6-
GIT_REPOSITORY https://github.com/COVESA/vsomeip
7-
GIT_TAG 0b83e24d16e1611958194e9b727136522f46556b # 3.5.1
8-
)
9-
FetchContent_MakeAvailable(vsomeip3)
3+
add_subdirectory(vsomeip-3.5.1)
104

115
find_package(vsomeip3 REQUIRED)
126

‎lib/libsomeip-c/vsomeip-3.5.1/.github/ISSUE_TEMPLATE/bug-report.yaml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: Bug Report
2+
description: Create a report to help us improve
3+
title: "[BUG]: <title>"
4+
labels: bug
5+
body:
6+
- type: input
7+
id: version
8+
attributes:
9+
label: vSomeip Version
10+
placeholder: "v3.4.10"
11+
description: "*or hash of the latest commit used"
12+
validations:
13+
required: true
14+
- type: input
15+
id: boost
16+
attributes:
17+
label: Boost Version
18+
placeholder: "1.71"
19+
validations:
20+
required: true
21+
- type: input
22+
id: environment
23+
attributes:
24+
label: Environment
25+
placeholder: "Windows 11, Ubuntu 22.04, Embedded Linux, QNX, ..."
26+
description: "*or compiler used"
27+
validations:
28+
required: true
29+
- type: textarea
30+
id: description
31+
attributes:
32+
label: Describe the bug
33+
description: A clear and concise description of what the bug is.
34+
validations:
35+
required: true
36+
- type: textarea
37+
id: reproduction
38+
attributes:
39+
label: Reproduction Steps
40+
description: Steps to reproduce the behavior
41+
validations:
42+
required: false
43+
- type: textarea
44+
id: expected
45+
attributes:
46+
label: Expected behaviour
47+
description: A clear and concise description of what you expected to happen
48+
validations:
49+
required: false
50+
- type: textarea
51+
id: screenshots
52+
attributes:
53+
label: Logs and Screenshots
54+
description: If applicable, add logs and screenshots to help explain your problem.
55+
validations:
56+
required: false

‎lib/libsomeip-c/vsomeip-3.5.1/.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
blank_issues_enabled: false

‎lib/libsomeip-c/vsomeip-3.5.1/.github/workflows/c-cpp.yml

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: C/C++ CI
2+
3+
on:
4+
push:
5+
branches: [master]
6+
pull_request:
7+
branches: [master]
8+
9+
jobs:
10+
build_on_ubuntu_boost_183_gcc_x86:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Ubuntu - Install boost 1.83.0 with gcc and x86
14+
uses: MarkusJx/[email protected]
15+
id: ubuntu-gcc-1_83-x86
16+
with:
17+
boost_version: 1.83.0
18+
platform_version: 20.04
19+
boost_install_dir: /home/runner
20+
toolset: gcc
21+
arch: x86
22+
cache: true
23+
24+
- uses: actions/checkout@v4
25+
26+
- name: install dependencies
27+
run: |
28+
sudo apt-get update -qq
29+
sudo apt-get install -y googletest asciidoc source-highlight doxygen graphviz libbenchmark-dev
30+
31+
- name: Run CMake config
32+
run: cmake -Bbuild -DBOOST_ROOT=/home/runner/boost/boost/ -DGTEST_ROOT=/usr/src/googletest
33+
34+
- name: Build CMake
35+
run: cmake --build build --target build_tests
36+
37+
- name: Run Unit tests
38+
run: ctest --test-dir build --tests-regex '^unit_' --verbose
39+
40+
- name: Run BenchMark tests
41+
run: env -C build test/benchmark_tests/benchmark_tests_bin
42+
43+
- uses: actions/upload-artifact@v4
44+
with:
45+
name: vsomeip
46+
path: "${{ runner.workspace }}/install/**/*"
47+
48+
build_on_windows_boost_183_gcc_x86:
49+
runs-on: windows-latest
50+
steps:
51+
- name: Windows - Install boost 1.83.0 with gcc and x86
52+
uses: MarkusJx/[email protected]
53+
id: windows-gcc-1_83-x86
54+
with:
55+
boost_version: 1.83.0
56+
platform: windows
57+
boost_install_dir: C:\runner
58+
toolset: msvc
59+
arch: x86
60+
cache: true
61+
62+
- uses: actions/checkout@v4
63+
64+
- name: Run CMake
65+
run: cmake -Bbuild -D BOOST_ROOT=C:\runner\boost/boost\ .
66+
67+
- name: Build CMake
68+
run: cmake --build build

‎lib/libsomeip-c/vsomeip-3.5.1/.gitignore

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/CMakeFiles
2+
/build*/*
3+
/examples/hello_world/build
4+
/.idea/
5+
/.vscode/
6+
/.settings
7+
/.project
8+
/.cproject
9+
/doc
10+
/daemon/CMakeFiles
11+
/examples/CMakeFiles
12+
/implementation/configuration/include/internal.hpp
13+
/test/unit_tests/security_policy_manager_impl_tests/policy_manager_impl_unit_test_macro.hpp
14+
/tools/CMakeFiles
15+
/Testing
16+
/logs
17+
!build_qnx/*

‎lib/libsomeip-c/vsomeip-3.5.1/.pre-commit-config.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
fail_fast: false
2+
repos:
3+
- repo: https://github.com/pocc/pre-commit-hooks
4+
rev: v1.3.5
5+
hooks:
6+
- id: clang-format
7+
args: [-i]

‎lib/libsomeip-c/vsomeip-3.5.1/.tests-whitelist

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# This file contains a list of test identifiers that are known to be flaky or non-critical.
2+
# Tests listed here are allowed to fail without causing the overall test job to fail.
3+
4+
# client_id_tests
5+
client_id_test_utility
6+
client_id_test_utility_masked_511
7+
client_id_test_utility_masked_4095
8+
client_id_test_utility_masked_127
9+
client_id_test_utility_discontinuous_masked_511
10+
11+
# initial_event_tests
12+
initial_event_test_diff_client_ids_diff_ports_udp
13+
initial_event_test_diff_client_ids_diff_ports_tcp
14+
initial_event_test_diff_client_ids_diff_ports_both_tcp_and_udp
15+
initial_event_test_diff_client_ids_same_ports_udp
16+
initial_event_test_diff_client_ids_same_ports_tcp
17+
initial_event_test_diff_client_ids_same_ports_both_tcp_and_udp
18+
initial_event_test_diff_client_ids_partial_same_ports_both_tcp_and_udp
19+
initial_event_test_diff_client_ids_diff_ports_same_service_id_udp
20+
initial_event_test_multiple_events_diff_client_ids_diff_ports_udp
21+
initial_event_test_multiple_events_diff_client_ids_diff_ports_tcp
22+
initial_event_test_multiple_events_diff_client_ids_diff_ports_udp_and_tcp
23+
initial_event_test_multiple_events_diff_client_ids_same_ports_udp
24+
initial_event_test_multiple_events_diff_client_ids_same_ports_tcp
25+
initial_event_test_multiple_events_diff_client_ids_same_ports_both_tcp_and_udp
26+
initial_event_test_multiple_events_diff_client_ids_partial_same_ports_both_tcp_and_udp
27+
initial_event_test_multiple_events_diff_client_ids_diff_ports_same_service_id_udp
28+
initial_event_test_multiple_events_subscribe_on_availability_diff_client_ids_diff_ports_udp
29+
initial_event_test_multiple_events_subscribe_on_availability_diff_client_ids_diff_ports_tcp
30+
initial_event_test_multiple_events_subscribe_on_availability_diff_client_ids_diff_ports_udp_and_tcp
31+
initial_event_test_multiple_events_subscribe_on_availability_diff_client_ids_same_ports_udp
32+
initial_event_test_multiple_events_subscribe_on_availability_diff_client_ids_same_ports_tcp
33+
initial_event_test_multiple_events_subscribe_on_availability_diff_client_ids_same_ports_both_tcp_and_udp
34+
initial_event_test_multiple_events_subscribe_on_availability_diff_client_ids_partial_same_ports_both_tcp_and_udp
35+
initial_event_test_multiple_events_subscribe_on_availability_diff_client_ids_diff_ports_same_service_id_udp
36+
initial_event_test_multiple_events_diff_client_ids_diff_ports_partial_subscription_udp
37+
initial_event_test_multiple_events_diff_client_ids_diff_ports_partial_subscription_tcp
38+
initial_event_test_multiple_events_diff_client_ids_diff_ports_partial_subscription_udp_and_tcp
39+
initial_event_test_diff_client_ids_diff_ports_client_subscribes_twice

‎lib/libsomeip-c/vsomeip-3.5.1/AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Bayerische Motoren Werke Aktiengesellschaft (BMW AG)

‎lib/libsomeip-c/vsomeip-3.5.1/Android.bp

Lines changed: 187 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,187 @@
1+
libvsomeip_srcs = [
2+
"implementation/endpoints/**/*.cpp",
3+
"implementation/logger/**/*.cpp",
4+
"implementation/tracing/**/*.cpp",
5+
"implementation/message/**/*.cpp",
6+
"implementation/routing/**/*.cpp",
7+
"implementation/runtime/**/*.cpp",
8+
"implementation/utility/**/*.cpp",
9+
"implementation/plugin/**/*.cpp",
10+
"implementation/protocol/**/*.cpp",
11+
"implementation/security/**/*.cpp",
12+
]
13+
14+
libvsomeip_compat_srcs = [
15+
"implementation/compat/message/src/*.cpp",
16+
"implementation/compat/runtime/src/*.cpp",
17+
]
18+
19+
libvsomeip_cfg_srcs = [
20+
"implementation/configuration/src/*.cpp",
21+
]
22+
23+
libvsomeip_e2e_srcs = [
24+
"implementation/e2e_protection/src/*.cpp",
25+
]
26+
27+
libvsomeip_sd_srcs = [
28+
"implementation/service_discovery/src/*.cpp",
29+
]
30+
31+
cc_defaults {
32+
name: "vsomeip_defaults",
33+
cpp_std: "c++17",
34+
35+
cppflags: [
36+
"-fexceptions",
37+
"-Wno-non-virtual-dtor",
38+
"-Wno-unused-const-variable",
39+
"-Wno-unused-parameter",
40+
"-Wno-unused-private-field",
41+
"-Wno-unused-lambda-capture",
42+
"-Wno-unused-variable",
43+
"-Wno-unused-local-typedef",
44+
"-Wno-sign-compare",
45+
"-Wno-format",
46+
"-Wno-header-guard",
47+
"-Wno-overloaded-virtual",
48+
"-Wno-implicit-fallthrough",
49+
"-Wno-error",
50+
"-Wno-shorten-64-to-32",
51+
"-D_GTHREAD_USE_MUTEX_INIT_FUNC",
52+
"-D_GTHREAD_USE_RECURSIVE_MUTEX_INIT_FUNC",
53+
]
54+
}
55+
56+
cc_defaults {
57+
name: "vsomeip_lib_defaults",
58+
59+
cflags: [
60+
"-DVSOMEIP_BOOST_VERSION=107100",
61+
"-DVSOMEIP_INTERNAL_SUPPRESS_DEPRECATED",
62+
],
63+
64+
local_include_dirs: [
65+
"interface"
66+
]
67+
}
68+
69+
cc_library_shared {
70+
name: "libvsomeip3",
71+
vendor: true,
72+
73+
srcs: libvsomeip_srcs,
74+
75+
defaults: [
76+
"vsomeip_defaults",
77+
"vsomeip_lib_defaults"
78+
],
79+
80+
cflags: [
81+
"-DWITHOUT_SYSTEMD",
82+
"-DVSOMEIP_VERSION=\"3.5.1\"",
83+
"-DVSOMEIP_COMPAT_VERSION=\"3.5.1\"",
84+
"-DVSOMEIP_BASE_PATH=\"/vendor/run/someip/\"",
85+
"-DUSE_DLT",
86+
],
87+
88+
ldflags: [
89+
"-Wl,-wrap,socket",
90+
"-Wl,-wrap,accept",
91+
"-Wl,-wrap,open"
92+
],
93+
94+
rtti: true,
95+
96+
export_include_dirs: [
97+
"interface"
98+
],
99+
100+
shared_libs: [
101+
"libboost_system",
102+
"libboost_thread",
103+
"libboost_filesystem",
104+
"liblog",
105+
"libutils"
106+
]
107+
}
108+
109+
cc_library_shared {
110+
name: "libvsomeip_cfg",
111+
vendor: true,
112+
113+
srcs: libvsomeip_cfg_srcs,
114+
115+
defaults: [
116+
"vsomeip_defaults",
117+
"vsomeip_lib_defaults"
118+
],
119+
120+
rtti: true,
121+
122+
shared_libs: [
123+
"libvsomeip3",
124+
"libboost_system",
125+
"libboost_filesystem"
126+
]
127+
}
128+
129+
cc_library_shared {
130+
name: "libvsomeip_e2e",
131+
vendor: true,
132+
133+
srcs: libvsomeip_e2e_srcs,
134+
135+
defaults: [
136+
"vsomeip_defaults",
137+
"vsomeip_lib_defaults"
138+
],
139+
140+
rtti: true,
141+
142+
shared_libs: [
143+
"libvsomeip3"
144+
]
145+
}
146+
147+
cc_library_shared {
148+
name: "libvsomeip_sd",
149+
vendor: true,
150+
151+
srcs: libvsomeip_sd_srcs,
152+
153+
defaults: [
154+
"vsomeip_defaults",
155+
"vsomeip_lib_defaults"
156+
],
157+
158+
rtti: true,
159+
160+
shared_libs: [
161+
"libvsomeip3",
162+
"libboost_system"
163+
]
164+
}
165+
166+
cc_library_shared {
167+
name: "libvsomeip",
168+
vendor: true,
169+
170+
srcs: libvsomeip_compat_srcs,
171+
172+
defaults: [
173+
"vsomeip_defaults",
174+
"vsomeip_lib_defaults"
175+
],
176+
177+
rtti: true,
178+
179+
export_include_dirs: [
180+
"interface"
181+
],
182+
183+
shared_libs: [
184+
"libvsomeip3",
185+
"libboost_system"
186+
]
187+
}

0 commit comments

Comments
 (0)