Skip to content

Commit 4350e55

Browse files
JanKomarekNXPJanKomarekNXP
committed
Update comments, copyrights and rename matrix_multiply_tcp_python
1 parent 628f9e3 commit 4350e55

File tree

33 files changed

+80
-29
lines changed

33 files changed

+80
-29
lines changed

‎CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2023-2024 NXP
2+
# Copyright 2024 NXP
33
#
44
# SPDX-License-Identifier: BSD-3-Clause
55
#
@@ -14,7 +14,7 @@ set(ERPC_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
1414
# Build erpc_c lib
1515
add_subdirectory(erpc_c)
1616

17-
# Include generate_erpc_files
17+
# Include function generate_erpc_files to be in global scope
1818
include(${ERPC_ROOT}/generate_erpc_files.cmake)
1919

2020
# Option for building eRPC project
@@ -23,15 +23,15 @@ option(BUILD_EXAMPLES "Build example executables" ON)
2323
option(BUILD_ERPCGEN "Build erpcgen" ON)
2424
option(ERPCGEN "Path to erpcgen executable")
2525

26-
# BUILD_TESTS and BUILD_EXAMPLES required erpcgen
26+
# BUILD_TESTS and BUILD_EXAMPLES require erpcgen
2727
if(BUILD_TESTS OR BUILD_EXAMPLES)
2828
if (ERPCGEN)
2929
if (NOT IS_ABSOLUTE ${ERPCGEN})
3030
set(ERPCGEN ${CMAKE_CURRENT_SOURCE_DIR}/${ERPCGEN})
3131
endif()
3232
else()
3333
if(NOT BUILD_ERPCGEN)
34-
message(FATAL_ERROR "No ERPCGEN specified and BUILD_ERPCGEN is disabled. Not able to generate erpc file!")
34+
message(FATAL_ERROR "No ERPCGEN specified and BUILD_ERPCGEN is disabled. Unable to generate erpc file!")
3535
endif()
3636

3737
set(ERPCGEN $<TARGET_FILE:erpcgen>)

‎erpc_c/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2023-2024 NXP
2+
# Copyright 2024 NXP
33
#
44
# SPDX-License-Identifier: BSD-3-Clause
55
#
@@ -46,7 +46,8 @@ set(ERPC_SOURCES
4646
${ERPC_DIR}/transports/erpc_tcp_transport.cpp
4747
${ERPC_DIR}/transports/erpc_serial_transport.cpp
4848

49-
# ${ERPC_DIR}/port/erpc_serial.cpp
49+
# TODO: Add serial transport support
50+
# ${ERPC_DIR}/port/erpc_serial.cpp
5051
)
5152

5253
# Create erpc library

‎erpcgen/CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
set(ERPCGEN_ROOT ${ERPC_ROOT}/erpcgen)
88

9-
# Paths to executable
10-
set(PYTHON_SCRIPT ${ERPCGEN_ROOT}/bin/txt_to_c.py)
9+
# Find executables
10+
find_program(PYTHON NAMES python python3 python36 DOC "Python executable location")
1111
find_program(FLEX NAMES flex win_flex.exe HINTS ${ERPCGEN_ROOT}/VisualStudio_v14)
1212
find_program(BISON NAMES bison win_bison.exe HINTS ${ERPCGEN_ROOT}/VisualStudio_v14)
1313

@@ -23,6 +23,9 @@ endif()
2323
set(YYFLAGS "-Wno-other")
2424
set(LLFLAGS "")
2525

26+
# Python text-to-c script
27+
set(PYTHON_SCRIPT ${ERPCGEN_ROOT}/bin/txt_to_c.py)
28+
2629
# erpcgen sources
2730
set(ERPCGEN_SOURCE
2831
${ERPCGEN_ROOT}/src/cpptemplate/cpptempl.cpp
@@ -68,6 +71,7 @@ set(ERPCGEN_INCLUDES
6871
set(ERPCGEN_TEMPLATE_DIR ${ERPCGEN_ROOT}/src/templates)
6972
set(ERPCGEN_TEMPLATE_OUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/src/templates)
7073

74+
# List of all templates
7175
set(ERPCGEN_TEMPLATE_NAMES
7276
c_common_header.template
7377
cpp_interface_header.template
@@ -107,7 +111,7 @@ foreach(template ${ERPCGEN_TEMPLATE_NAMES})
107111
add_custom_command(
108112
OUTPUT ${ERPCGEN_TEMPLATE_OUT_DIR}/${c_file}
109113
COMMAND ${CMAKE_COMMAND} -E make_directory ${ERPCGEN_TEMPLATE_OUT_DIR}
110-
COMMAND python ${PYTHON_SCRIPT} -o ${ERPCGEN_TEMPLATE_OUT_DIR}/${c_file}
114+
COMMAND ${PYTHON} ${PYTHON_SCRIPT} -o ${ERPCGEN_TEMPLATE_OUT_DIR}/${c_file}
111115
${ERPCGEN_TEMPLATE_DIR}/${template}
112116
DEPENDS ${ERPCGEN_TEMPLATE_DIR}/${template}
113117
COMMENT "Generating ${template} -> ${c_file}"

‎examples/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2023-2024 NXP
2+
# Copyright 2024 NXP
33
#
44
# SPDX-License-Identifier: BSD-3-Clause
55
#

‎examples/hello_world/c/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ generate_erpc_files(
4040
target_sources(client PRIVATE
4141
${CMAKE_CURRENT_SOURCE_DIR}/main_client.c
4242
${CMAKE_CURRENT_SOURCE_DIR}/erpc_error_handler.cpp
43+
4344
${ERPC_OUT_DIR}/c_hello_world_client.cpp
4445
${ERPC_OUT_DIR}/hello_world_client.cpp
4546
${ERPC_OUT_DIR}/hello_world_interface.cpp
@@ -48,6 +49,7 @@ target_sources(client PRIVATE
4849
target_sources(server PRIVATE
4950
${CMAKE_CURRENT_SOURCE_DIR}/main_server.c
5051
${CMAKE_CURRENT_SOURCE_DIR}/erpc_error_handler.cpp
52+
5153
${ERPC_OUT_DIR}/c_hello_world_server.cpp
5254
${ERPC_OUT_DIR}/hello_world_server.cpp
5355
${ERPC_OUT_DIR}/hello_world_interface.cpp
@@ -56,13 +58,15 @@ target_sources(server PRIVATE
5658
target_sources(client_cpp PRIVATE
5759
${CMAKE_CURRENT_SOURCE_DIR}/main_client.cpp
5860
${CMAKE_CURRENT_SOURCE_DIR}/erpc_error_handler.cpp
61+
5962
${ERPC_OUT_DIR}/hello_world_client.cpp
6063
${ERPC_OUT_DIR}/hello_world_interface.cpp
6164
)
6265

6366
target_sources(server_cpp PRIVATE
6467
${CMAKE_CURRENT_SOURCE_DIR}/main_server.cpp
6568
${CMAKE_CURRENT_SOURCE_DIR}/erpc_error_handler.cpp
69+
6670
${ERPC_OUT_DIR}/hello_world_server.cpp
6771
${ERPC_OUT_DIR}/hello_world_interface.cpp
6872
)

‎examples/matrix_multiply_c/CMakeLists.txt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,27 +40,24 @@ set(INCLUDE_DIRS
4040

4141
target_sources(matrix_multiply_client PRIVATE
4242
${CMAKE_CURRENT_SOURCE_DIR}/main_client.c
43-
4443
${CMAKE_CURRENT_SOURCE_DIR}/erpc_error_handler.cpp
4544

4645
${ERPC_OUT_DIR}/${APP_NAME}_interface.cpp
47-
${ERPC_OUT_DIR}/${APP_NAME}_client.cpp
4846
${ERPC_OUT_DIR}/c_${APP_NAME}_client.cpp
47+
${ERPC_OUT_DIR}/${APP_NAME}_client.cpp
4948
)
5049

5150
target_sources(matrix_multiply_server PRIVATE
5251
${CMAKE_CURRENT_SOURCE_DIR}/main_server.c
53-
5452
${CMAKE_CURRENT_SOURCE_DIR}/erpc_error_handler.cpp
5553

5654
${ERPC_OUT_DIR}/${APP_NAME}_interface.cpp
57-
${ERPC_OUT_DIR}/${APP_NAME}_server.cpp
5855
${ERPC_OUT_DIR}/c_${APP_NAME}_server.cpp
56+
${ERPC_OUT_DIR}/${APP_NAME}_server.cpp
5957
)
6058

6159
target_sources(matrix_multiply_client_cpp PRIVATE
6260
${CMAKE_CURRENT_SOURCE_DIR}/main_client.cpp
63-
6461
${CMAKE_CURRENT_SOURCE_DIR}/erpc_error_handler.cpp
6562

6663
${ERPC_OUT_DIR}/${APP_NAME}_interface.cpp
@@ -69,7 +66,6 @@ target_sources(matrix_multiply_client_cpp PRIVATE
6966

7067
target_sources(matrix_multiply_server_cpp PRIVATE
7168
${CMAKE_CURRENT_SOURCE_DIR}/main_server.cpp
72-
7369
${CMAKE_CURRENT_SOURCE_DIR}/erpc_error_handler.cpp
7470

7571
${ERPC_OUT_DIR}/${APP_NAME}_interface.cpp
@@ -78,12 +74,14 @@ target_sources(matrix_multiply_server_cpp PRIVATE
7874

7975
target_include_directories(matrix_multiply_client PRIVATE ${INCLUDE_DIRS})
8076
target_include_directories(matrix_multiply_server PRIVATE ${INCLUDE_DIRS})
77+
8178
target_include_directories(matrix_multiply_client_cpp PRIVATE ${INCLUDE_DIRS})
8279
target_include_directories(matrix_multiply_server_cpp PRIVATE ${INCLUDE_DIRS})
8380

8481
find_package(Threads REQUIRED)
8582

8683
target_link_libraries(matrix_multiply_client PRIVATE erpc Threads::Threads)
8784
target_link_libraries(matrix_multiply_server PRIVATE erpc Threads::Threads)
85+
8886
target_link_libraries(matrix_multiply_client_cpp PRIVATE erpc Threads::Threads)
8987
target_link_libraries(matrix_multiply_server_cpp PRIVATE erpc Threads::Threads)

‎examples/matrix_multiply_java/.idea/.gitignore

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/matrix_multiply_java/.idea/checkstyle-idea.xml

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/matrix_multiply_java/.idea/encodings.xml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/matrix_multiply_java/.idea/misc.xml

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/matrix_multiply_java/.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/matrix_multiply_tcp_python/matrix_multiply.py renamed to ‎examples/matrix_multiply_python/matrix_multiply.py

File renamed without changes.

‎examples/matrix_multiply_tcp_python/readme.md renamed to ‎examples/matrix_multiply_python/readme.md

File renamed without changes.

‎examples/matrix_multiply_tcp_python/service/__init__.py renamed to ‎examples/matrix_multiply_python/service/__init__.py

File renamed without changes.

‎examples/matrix_multiply_tcp_python/service/erpc_matrix_multiply.erpc renamed to ‎examples/matrix_multiply_python/service/erpc_matrix_multiply.erpc

File renamed without changes.

‎examples/matrix_multiply_tcp_python/service/erpc_matrix_multiply/__init__.py renamed to ‎examples/matrix_multiply_python/service/erpc_matrix_multiply/__init__.py

File renamed without changes.

‎examples/matrix_multiply_tcp_python/service/erpc_matrix_multiply/client.py renamed to ‎examples/matrix_multiply_python/service/erpc_matrix_multiply/client.py

File renamed without changes.

‎examples/matrix_multiply_tcp_python/service/erpc_matrix_multiply/common.py renamed to ‎examples/matrix_multiply_python/service/erpc_matrix_multiply/common.py

File renamed without changes.

‎examples/matrix_multiply_tcp_python/service/erpc_matrix_multiply/interface.py renamed to ‎examples/matrix_multiply_python/service/erpc_matrix_multiply/interface.py

File renamed without changes.

‎examples/matrix_multiply_tcp_python/service/erpc_matrix_multiply/server.py renamed to ‎examples/matrix_multiply_python/service/erpc_matrix_multiply/server.py

File renamed without changes.

‎test/test_annotations/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2023-2024 NXP
2+
# Copyright 2024 NXP
33
#
44
# SPDX-License-Identifier: BSD-3-Clause
55
#

‎test/test_arbitrator/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2023-2024 NXP
2+
# Copyright 2024 NXP
33
#
44
# SPDX-License-Identifier: BSD-3-Clause
55
#

‎test/test_arrays/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2023-2024 NXP
2+
# Copyright 2024 NXP
33
#
44
# SPDX-License-Identifier: BSD-3-Clause
55
#

‎test/test_binary/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2023-2024 NXP
2+
# Copyright 2024 NXP
33
#
44
# SPDX-License-Identifier: BSD-3-Clause
55
#

‎test/test_builtin/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2023-2024 NXP
2+
# Copyright 2024 NXP
33
#
44
# SPDX-License-Identifier: BSD-3-Clause
55
#

‎test/test_callbacks/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2023-2024 NXP
2+
# Copyright 2024 NXP
33
#
44
# SPDX-License-Identifier: BSD-3-Clause
55
#

‎test/test_const/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2023-2024 NXP
2+
# Copyright 2024 NXP
33
#
44
# SPDX-License-Identifier: BSD-3-Clause
55
#

‎test/test_enums/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2023-2024 NXP
2+
# Copyright 2024 NXP
33
#
44
# SPDX-License-Identifier: BSD-3-Clause
55
#

‎test/test_lists/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2023-2024 NXP
2+
# Copyright 2024 NXP
33
#
44
# SPDX-License-Identifier: BSD-3-Clause
55
#

‎test/test_shared/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2023-2024 NXP
2+
# Copyright 2024 NXP
33
#
44
# SPDX-License-Identifier: BSD-3-Clause
55
#

‎test/test_struct/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2023-2024 NXP
2+
# Copyright 2024 NXP
33
#
44
# SPDX-License-Identifier: BSD-3-Clause
55
#

‎test/test_typedef/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2023-2024 NXP
2+
# Copyright 2024 NXP
33
#
44
# SPDX-License-Identifier: BSD-3-Clause
55
#

‎test/test_unions/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2023-2024 NXP
2+
# Copyright 2024 NXP
33
#
44
# SPDX-License-Identifier: BSD-3-Clause
55
#

0 commit comments

Comments
 (0)