Skip to content

Commit

Permalink
Fix folder path for diag client lib
Browse files Browse the repository at this point in the history
  • Loading branch information
Iandiehard committed Mar 15, 2024
1 parent 1b1dab2 commit 39bd2ed
Show file tree
Hide file tree
Showing 44 changed files with 92 additions and 110 deletions.
2 changes: 2 additions & 0 deletions build_with_clang_14.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ cmake -B build/$BUILD_DIR -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_WITH_DLT:BOOL=O

echo "********************** Start Building **************************************"
cmake --build build/$BUILD_DIR --config $BUILD_TYPE

cmake --install build/$BUILD_DIR
40 changes: 10 additions & 30 deletions diag-client-lib/appl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,38 +14,18 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
# find needed packages
find_package(Threads REQUIRED)

# out headers
file(GLOB OUT_HDRS "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
# main sources
file(GLOB MAIN_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
file(GLOB MAIN_COMMON_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/src/common/*.cpp")
file(GLOB MAIN_DCM_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/src/dcm/*.cpp")
file(GLOB MAIN_DCM_CONNECTION_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/src/dcm/connection/*.cpp")
file(GLOB MAIN_DCM_CONVERSION_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/src/dcm/conversation/*.cpp")
file(GLOB MAIN_DCM_ERROR_DOMAIN_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/src/dcm/error_domain/*.cpp")
file(GLOB MAIN_DCM_CONFIGPARSER_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/src/dcm/config_parser/*.cpp")
file(GLOB MAIN_DCM_SERVICE "${CMAKE_CURRENT_SOURCE_DIR}/src/dcm/service/*.cpp")

set(LIB_MAIN_SRCS
${MAIN_SRCS}
${MAIN_COMMON_SRCS}
${MAIN_DCM_SRCS}
${MAIN_DCM_CONNECTION_SRCS}
${MAIN_DCM_CONVERSION_SRCS}
${MAIN_DCM_ERROR_DOMAIN_SRCS}
${MAIN_DCM_TIMER_SRCS}
${MAIN_DCM_CONFIGPARSER_SRCS}
${MAIN_DCM_SERVICE}
)
file(GLOB_RECURSE HEADERS CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")

add_library(${PROJECT_NAME}
${LIB_MAIN_SRCS}
${HEADERS}
${SOURCES}
)

# include directories
target_include_directories(${PROJECT_NAME} PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
#Link include directory
target_include_directories(${PROJECT_NAME}
PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
PRIVATE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>"
)

# link all static libraries
Expand All @@ -71,6 +51,6 @@ install(TARGETS ${PROJECT_NAME}
)

# install include files
install(FILES ${OUT_HDRS}
DESTINATION include/${PROJECT_NAME}
install(FILES ${HEADERS}
DESTINATION ${PROJECT_NAME}/
)
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
#include <memory>
#include <string_view>

#include "include/diagnostic_client_conversation.h"
#include "include/diagnostic_client_result.h"
#include "include/diagnostic_client_vehicle_info_message_type.h"
#include "diag-client/diagnostic_client_conversation.h"
#include "diag-client/diagnostic_client_result.h"
#include "diag-client/diagnostic_client_vehicle_info_message_type.h"

namespace diag {
namespace client {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

#include <cstdint>

#include "diagnostic_client_uds_message_type.h"
#include "include/diagnostic_client_result.h"
#include "diag-client/diagnostic_client_result.h"
#include "diag-client/diagnostic_client_uds_message_type.h"

namespace diag {
namespace client {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 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/.
*/
#include "src/common/diagnostic_manager.h"
#include "diag-client/common/diagnostic_manager.h"

namespace diag {
namespace client {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
#include <mutex>

#include "core/include/result.h"
#include "include/diagnostic_client.h"
#include "include/diagnostic_client_uds_message_type.h"
#include "include/diagnostic_client_vehicle_info_message_type.h"
#include "diag-client/diagnostic_client.h"
#include "diag-client/diagnostic_client_uds_message_type.h"
#include "diag-client/diagnostic_client_vehicle_info_message_type.h"

namespace diag {
namespace client {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
/* includes */
#include "src/dcm/config_parser/config_parser_type.h"
#include "diag-client/dcm/config_parser/config_parser_type.h"

namespace diag {
namespace client {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

#include "src/dcm/connection/uds_transport_protocol_manager.h"
#include "diag-client/dcm/connection/uds_transport_protocol_manager.h"

#include "doip_transport_protocol_handler.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
#define DIAGNOSTIC_CLIENT_LIB_APPL_SRC_DCM_CONVERSATION_CONVERSATION_H

#include "core/include/result.h"
#include "include/diagnostic_client.h"
#include "include/diagnostic_client_conversation.h"
#include "include/diagnostic_client_vehicle_info_message_type.h"
#include "diag-client/diagnostic_client.h"
#include "diag-client/diagnostic_client_conversation.h"
#include "diag-client/diagnostic_client_vehicle_info_message_type.h"
#include "uds_transport/connection.h"

namespace diag {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
/* includes */
#include "src/dcm/conversation/conversation_manager.h"
#include "diag-client/dcm/conversation/conversation_manager.h"

#include "core/include/variant_helper.h"
#include "src/common/logger.h"
#include "src/dcm/conversation/dm_conversation.h"
#include "diag-client/dcm/conversation/dm_conversation.h"
#include "diag-client/common/logger.h"

namespace diag {
namespace client {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
#include <string_view>
#include <variant>

#include "src/dcm/config_parser/config_parser_type.h"
#include "src/dcm/connection/uds_transport_protocol_manager.h"
#include "src/dcm/conversation/conversation.h"
#include "src/dcm/conversation/dm_conversation_type.h"
#include "src/dcm/conversation/vd_conversation.h"
#include "src/dcm/conversation/vd_conversation_type.h"
#include "diag-client/dcm/conversation/conversation.h"
#include "diag-client/dcm/conversation/dm_conversation_type.h"
#include "diag-client/dcm/config_parser/config_parser_type.h"
#include "diag-client/dcm/connection/uds_transport_protocol_manager.h"
#include "diag-client/dcm/conversation/vd_conversation.h"
#include "diag-client/dcm/conversation/vd_conversation_type.h"

namespace diag {
namespace client {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

#include "src/dcm/conversation/dm_conversation.h"
#include "diag-client/dcm/conversation/dm_conversation.h"

#include "src/common/logger.h"
#include "src/dcm/service/dm_uds_message.h"
#include "diag-client/common/logger.h"
#include "diag-client/dcm/service/dm_uds_message.h"
#include "uds_transport/conversation_handler.h"

namespace diag {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
/* includes */
#include <string_view>

#include "include/diagnostic_client_conversation.h"
#include "src/dcm/conversation/conversation.h"
#include "src/dcm/conversation/dm_conversation_state_impl.h"
#include "src/dcm/conversation/dm_conversation_type.h"
#include "diag-client/dcm/conversation/conversation.h"
#include "diag-client/dcm/conversation/dm_conversation_state_impl.h"
#include "diag-client/dcm/conversation/dm_conversation_type.h"
#include "diag-client/diagnostic_client_conversation.h"
#include "uds_transport/connection.h"
#include "uds_transport/protocol_types.h"
#include "utility/sync_timer.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 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/.
*/
#include "src/dcm/conversation/dm_conversation_state_impl.h"
#include "diag-client/dcm/conversation/dm_conversation_state_impl.h"

namespace diag {
namespace client {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

#include "src/dcm/conversation/vd_conversation.h"
#include "diag-client/dcm/conversation/vd_conversation.h"

#include <sstream>
#include <string>
#include <utility>

#include "src/common/logger.h"
#include "src/dcm/service/vd_message.h"
#include "diag-client/common/logger.h"
#include "diag-client/dcm/service/vd_message.h"

namespace diag {
namespace client {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
#include <mutex>
#include <string_view>

#include "diag-client/dcm/conversation/conversation.h"
#include "core/include/result.h"
#include "include/diagnostic_client.h"
#include "include/diagnostic_client_uds_message_type.h"
#include "include/diagnostic_client_vehicle_info_message_type.h"
#include "src/dcm/conversation/conversation.h"
#include "src/dcm/conversation/vd_conversation_type.h"
#include "diag-client/diagnostic_client.h"
#include "diag-client/diagnostic_client_uds_message_type.h"
#include "diag-client/diagnostic_client_vehicle_info_message_type.h"
#include "uds_transport/connection.h"
#include "uds_transport/conversation_handler.h"
#include "uds_transport/protocol_types.h"
#include "diag-client/dcm/conversation/vd_conversation_type.h"

namespace diag {
namespace client {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
/* includes */
#include "src/dcm/dcm_client.h"
#include "dcm_client.h"

#include <optional>

#include "src/common/logger.h"
#include "diag-client/common/logger.h"

namespace diag {
namespace client {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
#include <string_view>

#include "core/include/result.h"
#include "src/common/diagnostic_manager.h"
#include "src/dcm/config_parser/config_parser_type.h"
#include "src/dcm/connection/uds_transport_protocol_manager.h"
#include "src/dcm/conversation/conversation_manager.h"
#include "diag-client/common/diagnostic_manager.h"
#include "diag-client/dcm/config_parser/config_parser_type.h"
#include "diag-client/dcm/connection/uds_transport_protocol_manager.h"
#include "diag-client/dcm/conversation/conversation_manager.h"

namespace diag {
namespace client {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/* includes */
#include "src/dcm/error_domain/dm_error_domain.h"
#include "dm_error_domain.h"

#include "core/include/error_domain.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 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/.
*/
#include "src/dcm/service/dm_uds_message.h"
#include "dm_uds_message.h"

namespace diag {
namespace client {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#ifndef DIAGNOSTIC_CLIENT_LIB_APPL_SRC_DCM_SERVICE_DM_UDS_MESSAGE_H
#define DIAGNOSTIC_CLIENT_LIB_APPL_SRC_DCM_SERVICE_DM_UDS_MESSAGE_H
/* includes */
#include "include/diagnostic_client_uds_message_type.h"
#include "include/diagnostic_client_vehicle_info_message_type.h"
#include "diag-client/diagnostic_client_uds_message_type.h"
#include "diag-client/diagnostic_client_vehicle_info_message_type.h"
#include "uds_transport/uds_message.h"

namespace diag {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 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/.
*/
#include "src/dcm/service/vd_message.h"
#include "diag-client/dcm/service/vd_message.h"

#include <sstream>
#include <string_view>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#ifndef DIAGNOSTIC_CLIENT_LIB_APPL_SRC_DCM_SERVICE_VD_MESSAGE_H
#define DIAGNOSTIC_CLIENT_LIB_APPL_SRC_DCM_SERVICE_VD_MESSAGE_H
/* includes */
#include "include/diagnostic_client_uds_message_type.h"
#include "include/diagnostic_client_vehicle_info_message_type.h"
#include "diag-client/diagnostic_client_uds_message_type.h"
#include "diag-client/diagnostic_client_vehicle_info_message_type.h"
#include "uds_transport/uds_message.h"

namespace diag {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 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/.
*/
#include "include/diagnostic_client.h"
#include "diag-client/diagnostic_client.h"

#include <pthread.h>

Expand All @@ -15,10 +15,10 @@

#include "boost-support/parser/json_parser.h"
#include "core/include/result.h"
#include "src/common/diagnostic_manager.h"
#include "src/common/logger.h"
#include "src/dcm/dcm_client.h"
#include "src/dcm/error_domain/dm_error_domain.h"
#include "diag-client/common/diagnostic_manager.h"
#include "diag-client/common/logger.h"
#include "diag-client/dcm/dcm_client.h"
#include "diag-client/dcm/error_domain/dm_error_domain.h"

namespace diag {
namespace client {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
* 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/.
*/
#include "include/diagnostic_client_conversation.h"
#include "diag-client/diagnostic_client_conversation.h"

#include <memory>

#include "src/dcm/conversation/conversation.h"
#include "src/dcm/dcm_client.h"
#include "diag-client/dcm/conversation/conversation.h"
#include "diag-client/dcm/dcm_client.h"

namespace diag {
namespace client {
Expand Down
6 changes: 3 additions & 3 deletions examples/example_1/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
#include "uds_message.h"

// includes from diag-client library
#include "include/create_diagnostic_client.h"
#include "include/diagnostic_client.h"
#include "include/diagnostic_client_uds_message_type.h"
#include "diag-client/create_diagnostic_client.h"
#include "diag-client/diagnostic_client.h"
#include "diag-client/diagnostic_client_uds_message_type.h"

/*
* Main Entry point of diag client example
Expand Down
4 changes: 2 additions & 2 deletions examples/example_1/src/uds_message.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

#include <string_view>
// includes from diag-client library
#include "include/create_diagnostic_client.h"
#include "include/diagnostic_client_uds_message_type.h"
#include "diag-client/create_diagnostic_client.h"
#include "diag-client/diagnostic_client_uds_message_type.h"

class UdsMessage : public diag::client::uds_message::UdsMessage {
public:
Expand Down
Loading

0 comments on commit 39bd2ed

Please sign in to comment.