Skip to content

Commit

Permalink
capicxx-core-tools 3.2.14 (#59)
Browse files Browse the repository at this point in the history
* capicxx-core-tools 3.2.14

- Update README.md with correct github.io link
- Fixed build of the examples with installed DBus
- Enable Modify generation TypeColl without name
- Fix several issues in the CommonAPI-Examples
- Fix compilation error for word "client"
- Revert Modify generation TypeColl without name
- Reduce load models in validation
- Impl changes in generator for Keywords
- Enable Modify generation TypeColl without name
- Fix typedef InterfaceType declaration
- Revert Modify generation TypeColl without name"
- Increase heap memory
- Fix reserved identifier error
- Modify generation TypeColl without name
- Enumeration/Enumerator with same name
- Increase maximum heap memory size
- Accept enumeration/enumerator with same name
- Update dependencies
- Accept duplicate arg names for method in/out
- Create a CommonAPI Example for the E2E functionality
- Update Generator to change the Parameter name "info"
- Modify generation of TypeCollections without name
- Accept Methods with Parameters with the same name
- Accept duplicate argument names for method in and out
- Accept an Interface with a method with the same name
- Fix "com.google.inject" dependencies
- Extend DTCombined with variant test case
- Restore correct include path for AttributeCacheExtension in Example 02 Attributes
- Adapt README to current generator name.
- Check whether an accessor exists before using it.

* Fix of Copyright field in README file

* Remove "GLIPCI" from verification test

---------

Co-authored-by: Diana Pinto <Diana.IB.Pinto@ctw.bmwgroup.com>
  • Loading branch information
dibpinto and Diana Pinto authored Oct 23, 2023
1 parent 7bf7b23 commit 4f12264
Show file tree
Hide file tree
Showing 80 changed files with 1,671 additions and 151 deletions.
53 changes: 53 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,5 +1,58 @@
Changes
=======
v3.2.14
- Update README.md with correct github.io link
- Fixed build of the examples with installed DBus

v3.2.13
- Enable Modify generation TypeColl without name
- Fix several issues in the CommonAPI-Examples

v3.2.12
- Fix compilation error for word "client"
- Revert Modify generation TypeColl without name

v3.2.11
- Reduce load models in validation
- Impl changes in generator for Keywords
- Enable Modify generation TypeColl without name

v3.2.10
- Fix typedef InterfaceType declaration
- Revert Modify generation TypeColl without name"

v3.2.9
- Increase heap memory
- Fix reserved identifier error
- Modify generation TypeColl without name
- Enumeration/Enumerator with same name

v3.2.8
- Increase maximum heap memory size
- Accept enumeration/enumerator with same name
- Update dependencies
- Accept duplicate arg names for method in/out
- Create a CommonAPI Example for the E2E functionality

v3.2.7
- Update Generator to change the Parameter name "info"

v3.2.6
- Modify generation of TypeCollections without name
- Accept Methods with Parameters with the same name
- Accept duplicate argument names for method in and out

v3.2.5
- Accept an Interface with a method with the same name

v3.2.4
- Fix "com.google.inject" dependencies
- Extend DTCombined with variant test case

v3.2.2
- Restore correct include path for AttributeCacheExtension in Example 02 Attributes
- Adapt README to current generator name.
- Check whether an accessor exists before using it.

v3.2.0
- Adapted to CommonAPI 3.2.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ define org.genivi.commonapi.someip.deployment for provider as Service {
instance commonapi.examples.E01HelloWorld {
InstanceId = "commonapi.examples.HelloWorld"

SomeIpInstanceID = 22136
SomeIpInstanceID = 4660

SomeIpUnicastAddress = "192.168.0.2"
SomeIpReliableUnicastPort = 30499
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#include <iostream>
#include <string>
#include <thread>

#ifndef _WIN32
#include <unistd.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
// file, You can obtain one at http://mozilla.org/MPL/2.0/.

#include <iostream>
#include <thread>

#ifndef _WIN32
#include <unistd.h>
Expand Down
1 change: 1 addition & 0 deletions CommonAPI-Examples/E03Methods/src/E03MethodsClient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
// file, You can obtain one at http://mozilla.org/MPL/2.0/.

#include <iostream>
#include <thread>

#ifndef _WIN32
#include <unistd.h>
Expand Down
1 change: 1 addition & 0 deletions CommonAPI-Examples/E04PhoneBook/src/E04PhoneBookClient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

#include <map>
#include <iostream>
#include <thread>

#include <CommonAPI/CommonAPI.hpp>
#include <commonapi/examples/E04PhoneBook.hpp>
Expand Down
1 change: 1 addition & 0 deletions CommonAPI-Examples/E05Manager/src/E05ManagerClient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#endif

#include <iostream>
#include <thread>

#include <CommonAPI/CommonAPI.hpp>
#include <v1/commonapi/examples/E05ManagerProxy.hpp>
Expand Down
1 change: 1 addition & 0 deletions CommonAPI-Examples/E06Unions/src/E06UnionsClient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <unistd.h>
#endif
#include <iostream>
#include <thread>

#include <CommonAPI/CommonAPI.hpp>

Expand Down
1 change: 1 addition & 0 deletions CommonAPI-Examples/E07Mainloop/src/E07MainloopClient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#endif

#include <sstream>
#include <thread>

#include <glib.h>
#include <gio/gio.h>
Expand Down
2 changes: 2 additions & 0 deletions CommonAPI-Examples/E08CrcProtection/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
build
src-gen
118 changes: 118 additions & 0 deletions CommonAPI-Examples/E08CrcProtection/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
# Copyright (C) 2022 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

cmake_minimum_required(VERSION 2.8)

set(PRJ_NAME E08CrcProtection)

set(CMAKE_VERBOSE_MAKEFILE on)

OPTION(USE_FILE "Set to OFF to disable file logging" OFF )
message(STATUS "USE_FILE is set to value: ${USE_FILE}")

OPTION(USE_CONSOLE "Set to OFF to disable console logging" OFF )
message(STATUS "USE_CONSOLE is set to value: ${USE_CONSOLE}")

IF(USE_FILE)
add_definitions(-DUSE_FILE)
ENDIF(USE_FILE)
IF(USE_CONSOLE)
add_definitions(-DUSE_CONSOLE)
ENDIF(USE_CONSOLE)

SET(MAX_LOG_LEVEL "DEBUG" CACHE STRING "maximum log level")
message(STATUS "MAX_LOG_LEVEL is set to value: ${MAX_LOG_LEVEL}")
add_definitions(-DCOMMONAPI_LOGLEVEL=COMMONAPI_LOGLEVEL_${MAX_LOG_LEVEL})

if (MSVC)
# Visual C++ is not always sure whether he is really C++
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS /EHsc /wd\\\"4503\\\"")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS /wd\\\"4503\\\"")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O0 -std=c++11 -pthread -D_GLIBCXX_USE_NANOSLEEP")
endif()

message(STATUS "Compiler options: ${CMAKE_CXX_FLAGS}")

if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Debug" CACHE STRING
"Choose the type of build, options are: Debug Release." FORCE)
endif(NOT CMAKE_BUILD_TYPE)
message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")

OPTION(USE_INSTALLED_COMMONAPI "Set to OFF to use the local (build tree) version of CommonAPI" ON)
message(STATUS "USE_INSTALLED_COMMONAPI is set to value: ${USE_INSTALLED_COMMONAPI}")

if ("${USE_INSTALLED_COMMONAPI}" STREQUAL "ON")
FIND_PACKAGE(CommonAPI 3.2.0 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
else()
FIND_PACKAGE(CommonAPI 3.2.0 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
endif()

message(STATUS "CommonAPI_CONSIDERED_CONFIGS: ${CommonAPI_CONSIDERED_CONFIGS}")
message(STATUS "COMMONAPI_INCLUDE_DIRS: ${COMMONAPI_INCLUDE_DIRS}")

# CommonAPI
include(FindPkgConfig)
###############################################################################

# SOME/IP
find_package (CommonAPI-SomeIP 3.2.0 REQUIRED)
find_package (vsomeip3 3.2.0 REQUIRED)

# Source Files
set(PRJ_SRC_PATH src)
set(PRJ_SRC_GEN_PATH src-gen)
set(PRJ_SRC_GEN_COMMONAPI_PATH ${PRJ_SRC_GEN_PATH}/core/v1/commonapi/examples)
set(PRJ_SRC_GEN_COMMONAPI_SOMEIP_PATH ${PRJ_SRC_GEN_PATH}/someip/v1/commonapi/examples)

set(PRJ_NAME_CLIENT ${PRJ_NAME}Client)
set(PRJ_NAME_SERVICE ${PRJ_NAME}Service)

# Application
FILE(GLOB PRJ_PROXY_GEN_SRCS ${PRJ_SRC_GEN_COMMONAPI_PATH}/*Proxy.cpp)
FILE(GLOB PRJ_STUB_GEN_SRCS ${PRJ_SRC_GEN_COMMONAPI_PATH}/*Stub*.cpp)
FILE(GLOB PRJ_STUB_IMPL_SRCS ${PRJ_SRC_COMMONAPI_PATH}/*Stub*.cpp)
set(PRJ_CLIENT_SRCS ${PRJ_SRC_PATH}/${PRJ_NAME_CLIENT}.cpp ${PRJ_PROXY_GEN_SRCS})
set(PRJ_SERVICE_SRCS ${PRJ_SRC_PATH}/${PRJ_NAME_SERVICE}.cpp ${PRJ_SRC_PATH}/${PRJ_NAME}StubImpl.cpp ${PRJ_STUB_GEN_SRCS} ${PRJ_STUB_IMPL_SRCS})

# Boost
find_package( Boost 1.54 COMPONENTS system thread log REQUIRED )
include_directories( ${Boost_INCLUDE_DIR} )

# SOME/IP library
FILE(GLOB PRJ_SOMEIP_LIB_SRCS ${PRJ_SRC_GEN_COMMONAPI_SOMEIP_PATH}/*cpp)

include_directories(
src-gen/core
src-gen/someip
${COMMONAPI_INCLUDE_DIRS}
${COMMONAPI_SOMEIP_INCLUDE_DIRS}
${VSOMEIP_INCLUDE_DIRS}
)

link_directories(
${COMMONAPI_LIBDIR}
${COMMONAPI_SOMEIP_CMAKE_DIR}/build
${Boost_LIBRARY_DIR}
)

if (MSVC)
set(LINK_LIBRARIES CommonAPI)
else()
set(LINK_LIBRARIES -Wl,--as-needed CommonAPI)
endif()

# Build Client
add_executable(${PRJ_NAME_CLIENT} ${PRJ_CLIENT_SRCS})
target_link_libraries(${PRJ_NAME_CLIENT} ${LINK_LIBRARIES} ${VSOMEIP_LIBRARIES})

# Build service
add_executable(${PRJ_NAME_SERVICE} ${PRJ_SERVICE_SRCS})
target_link_libraries(${PRJ_NAME_SERVICE} ${LINK_LIBRARIES} ${VSOMEIP_LIBRARIES})

# Build SOME/IP library
add_library (${PRJ_NAME}-someip SHARED ${PRJ_SOMEIP_LIB_SRCS})
target_link_libraries(${PRJ_NAME}-someip CommonAPI-SomeIP)
Loading

0 comments on commit 4f12264

Please sign in to comment.