Skip to content

Commit 89720d3

Browse files
lutzbichlerlutzbichler
committed
capicxx-core-runtime 3.2.0
1 parent 99ebf34 commit 89720d3

Some content is hidden

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

50 files changed

+685
-514
lines changed

‎Android.bp‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
capi_srcs = [
2+
"src/CommonAPI/**/*.cpp"
3+
]
4+
5+
cc_defaults {
6+
name: "capi_defaults",
7+
cppflags: [
8+
"-std=c++11",
9+
"-Wall",
10+
"-Wextra",
11+
"-Wformat",
12+
"-Wformat-security",
13+
"-Wconversion",
14+
"-Wno-attributes",
15+
"-fexceptions",
16+
"-fstrict-aliasing",
17+
"-fstack-protector",
18+
"-fasynchronous-unwind-tables",
19+
"-fno-omit-frame-pointer",
20+
"-Werror",
21+
"-fvisibility=hidden",
22+
"-DCOMMONAPI_INTERNAL_COMPILATION"
23+
]
24+
}
25+
26+
cc_library_shared {
27+
name: "libCommonAPI",
28+
vendor: true,
29+
srcs: capi_srcs,
30+
defaults: [
31+
"capi_defaults"
32+
],
33+
local_include_dirs: [
34+
"include"
35+
],
36+
export_include_dirs: ["include"],
37+
rtti: true
38+
}

‎CHANGES‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Changes
22
=======
33

4+
v3.2.0
5+
- Support ABI compatible changes (additional attributes, broadcast and methods added to the end of
6+
the interface specification)
7+
48
v3.1.12.6
59
- Fix race condition leading to event delivery after unsubscription
610

‎CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2013-2017 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
1+
# Copyright (C) 2013-2020 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
22
# This Source Code Form is subject to the terms of the Mozilla Public
33
# License, v. 2.0. If a copy of the MPL was not distributed with this
44
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -9,8 +9,8 @@ PROJECT(libcommonapi)
99

1010
# version of CommonAPI
1111
SET( LIBCOMMONAPI_MAJOR_VERSION 3 )
12-
SET( LIBCOMMONAPI_MINOR_VERSION 1 )
13-
SET( LIBCOMMONAPI_PATCH_VERSION 12 )
12+
SET( LIBCOMMONAPI_MINOR_VERSION 2 )
13+
SET( LIBCOMMONAPI_PATCH_VERSION 0 )
1414

1515
message(STATUS "Project name: ${PROJECT_NAME}")
1616

@@ -102,14 +102,14 @@ IF(MSVC)
102102
add_definitions(-DCOMMONAPI_INTERNAL_COMPILATION -DCOMMONAPI_DLL_COMPILATION)
103103
add_compile_options(/EHsc /wd4996)
104104
ELSE ()
105-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector -fasynchronous-unwind-tables -fno-omit-frame-pointer -Werror -DCOMMONAPI_INTERNAL_COMPILATION")
105+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector -fasynchronous-unwind-tables -fno-omit-frame-pointer -Werror -DCOMMONAPI_INTERNAL_COMPILATION -fvisibility=hidden")
106106
ENDIF(MSVC)
107107

108108
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCOMMONAPI_LOGLEVEL=COMMONAPI_LOGLEVEL_${MAX_LOG_LEVEL}")
109-
109+
110110
FIND_PACKAGE(PkgConfig)
111111
pkg_check_modules(DLT "automotive-dlt >= 2.11")
112-
IF(DLT_FOUND)
112+
IF(DLT_FOUND)
113113
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_DLT")
114114
ENDIF(DLT_FOUND)
115115

‎README.md‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
### CommonAPI C++ Core Runtime
22

33
##### Copyright
4-
Copyright (C) 2016-2017, Bayerische Motoren Werke Aktiengesellschaft (BMW AG).
5-
Copyright (C) 2016-2017, GENIVI Alliance, Inc.
4+
Copyright (C) 2016-2020, Bayerische Motoren Werke Aktiengesellschaft (BMW AG).
5+
Copyright (C) 2016-2020, GENIVI Alliance, Inc.
66

77
This file is part of GENIVI Project IPC Common API C++.
88
Contributions are licensed to the GENIVI Alliance under one or more Contribution License Agreements or MPL 2.0.
@@ -33,3 +33,16 @@ You can change the installation directory by the CMake variable _CMAKE_INSTALL_P
3333

3434
For further build instructions (build for windows, build documentation, tests etc.) please refer to the CommonAPI tutorial.
3535

36+
##### Build Instructions for Android
37+
38+
In general for building the Android source tree the instructions found on the pages from the Android Open Source Project (AOSP) apply (https://source.android.com/setup/build/requirements).
39+
40+
To integrate the CommonAPI Core Runtime library into the build process, the source code together with the Android.bp file has to be inserted into the Android source tree (by simply copying or by fetching with a custom platform manifest).
41+
When building the Android source tree, the Android.bp file is automatically found and considered by the build system.
42+
43+
In order that the CommonAPI Core Runtime library is also included in the Android image, the library has to be added to the PRODUCT_PACKAGES variable in one of a device/target specific makefile:
44+
45+
```
46+
PRODUCT_PACKAGES += \
47+
libCommonAPI
48+
```

‎docx/01_mainpage.dox‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* \copyright
33
*
4-
* Copyright (C) 2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
4+
* Copyright (C) 2015-2020 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
55
*
66
* This file is part of GENIVI project IPC CommonAPI C++.
77
*

‎include/CommonAPI/Address.hpp‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
// Copyright (C) 2015-2017 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
1+
// Copyright (C) 2015-2020 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
22
// This Source Code Form is subject to the terms of the Mozilla Public
33
// License, v. 2.0. If a copy of the MPL was not distributed with this
44
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
55

6+
#if !defined (COMMONAPI_INTERNAL_COMPILATION)
7+
#error "Only <CommonAPI/CommonAPI.hpp> can be included directly, this file may disappear or change contents."
8+
#endif
9+
610
#ifndef COMMONAPI_ADDRESS_HPP_
711
#define COMMONAPI_ADDRESS_HPP_
812

@@ -21,7 +25,9 @@ class Address {
2125
const std::string &_interface,
2226
const std::string &_instance);
2327
COMMONAPI_EXPORT Address(const Address &_source);
24-
COMMONAPI_EXPORT virtual ~Address();
28+
COMMONAPI_EXPORT virtual ~Address() = default;
29+
30+
COMMONAPI_EXPORT Address &operator=(const Address &_other);
2531

2632
COMMONAPI_EXPORT bool operator==(const Address &_other) const;
2733
COMMONAPI_EXPORT bool operator!=(const Address &_other) const;

‎include/CommonAPI/Attribute.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
// Copyright (C) 2013-2017 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
1+
// Copyright (C) 2013-2020 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
22
// This Source Code Form is subject to the terms of the Mozilla Public
33
// License, v. 2.0. If a copy of the MPL was not distributed with this
44
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
55

66
#if !defined (COMMONAPI_INTERNAL_COMPILATION)
7-
#error "Only <CommonAPI/CommonAPI.h> can be included directly, this file may disappear or change contents."
7+
#error "Only <CommonAPI/CommonAPI.hpp> can be included directly, this file may disappear or change contents."
88
#endif
99

1010
#ifndef COMMONAPI_ATTRIBUTE_HPP_

‎include/CommonAPI/AttributeExtension.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (C) 2013-2017 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
1+
// Copyright (C) 2013-2020 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
22
// This Source Code Form is subject to the terms of the Mozilla Public
33
// License, v. 2.0. If a copy of the MPL was not distributed with this
44
// file, You can obtain one at http://mozilla.org/MPL/2.0/.

‎include/CommonAPI/ByteBuffer.hpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
// Copyright (C) 2013-2017 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
1+
// Copyright (C) 2013-2020 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
22
// This Source Code Form is subject to the terms of the Mozilla Public
33
// License, v. 2.0. If a copy of the MPL was not distributed with this
44
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
55

6+
#if !defined (COMMONAPI_INTERNAL_COMPILATION)
7+
#error "Only <CommonAPI/CommonAPI.hpp> can be included directly, this file may disappear or change contents."
8+
#endif
9+
610
#ifndef COMMONAPI_BYTE_BUFFER_HPP_
711
#define COMMONAPI_BYTE_BUFFER_HPP_
812

‎include/CommonAPI/CallInfo.hpp‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,31 @@
1-
// Copyright (C) 2015-2017 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
1+
// Copyright (C) 2015-2020 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
22
// This Source Code Form is subject to the terms of the Mozilla Public
33
// License, v. 2.0. If a copy of the MPL was not distributed with this
44
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
55

6+
#if !defined (COMMONAPI_INTERNAL_COMPILATION)
7+
#error "Only <CommonAPI/CommonAPI.hpp> can be included directly, this file may disappear or change contents."
8+
#endif
9+
610
#ifndef COMMONAPI_CALLINFO_HPP_
711
#define COMMONAPI_CALLINFO_HPP_
812

913
#include <CommonAPI/Config.hpp>
1014
#include <CommonAPI/Types.hpp>
15+
#include <string>
1116

1217
namespace CommonAPI {
1318

1419
struct COMMONAPI_EXPORT CallInfo {
15-
CallInfo()
16-
: timeout_(DEFAULT_SEND_TIMEOUT_MS), sender_(0) {
17-
}
18-
CallInfo(Timeout_t _timeout)
19-
: timeout_(_timeout), sender_(0) {
20-
}
21-
CallInfo(Timeout_t _timeout, Sender_t _sender)
22-
: timeout_(_timeout), sender_(_sender) {
23-
}
24-
CallInfo(const CallInfo &_other)
25-
: timeout_(_other.timeout_), sender_(_other.sender_) {
26-
}
20+
CallInfo();
21+
CallInfo(Timeout_t _timeout);
22+
CallInfo(const CallInfo &_other);
23+
CallInfo(Timeout_t _timeout, Sender_t _sender);
2724

2825
Timeout_t timeout_;
2926
Sender_t sender_;
3027
};
3128

3229
} // namespace CommonAPI
3330

34-
#endif // COMMONAPI_ADDRESS_HPP_
31+
#endif // COMMONAPI_CALLINFO_HPP_

0 commit comments

Comments
 (0)