Skip to content

Commit 1cdd350

Browse files
committed
refactor: rename currency service project to currency-proto and update related CMake configurations
Signed-off-by: Charlie Le <[email protected]>
1 parent 3ddd139 commit 1cdd350

13 files changed

+3
-29181
lines changed

docker-gen-proto.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ gen_proto_cpp() {
2020
echo "Generating Cpp protobuf files for $1"
2121
docker build --build-arg OPENTELEMETRY_CPP_VERSION=${OPENTELEMETRY_CPP_VERSION} -f "src/$1/genproto/Dockerfile" -t "$1-genproto" .
2222
docker run --rm -v $(pwd):/build "$1-genproto" \
23-
cp -r "/$1/build/generated/" "/build/src/$1/build/generated/"
23+
cp -r "/$1/build/generated" "/build/src/$1/build/"
2424
}
2525

2626
gen_proto_python() {

src/currency/CMakeLists.txt

+1-45
Original file line numberDiff line numberDiff line change
@@ -5,54 +5,10 @@ find_package(Protobuf REQUIRED)
55
find_package(gRPC CONFIG REQUIRED)
66
find_package(opentelemetry-cpp CONFIG REQUIRED)
77

8-
set(PROTO_PATH "${CMAKE_CURRENT_SOURCE_DIR}/proto")
98
set(GENERATED_PROTOBUF_PATH "${CMAKE_BINARY_DIR}/generated/proto")
10-
set(GENERATED_HEALTH_PROTOBUF_PATH "${GENERATED_PROTOBUF_PATH}/grpc/health/v1")
119

12-
file(MAKE_DIRECTORY "${GENERATED_PROTOBUF_PATH}")
10+
add_subdirectory(genproto)
1311

14-
set(DEMO_PROTO "${PROTO_PATH}/demo.proto")
15-
set(DEMO_PB_CPP_FILE "${GENERATED_PROTOBUF_PATH}/demo.pb.cc")
16-
set(DEMO_PB_H_FILE "${GENERATED_PROTOBUF_PATH}/demo.pb.h")
17-
set(DEMO_GRPC_PB_CPP_FILE "${GENERATED_PROTOBUF_PATH}/demo.grpc.pb.cc")
18-
set(DEMO_GRPC_PB_H_FILE "${GENERATED_PROTOBUF_PATH}/demo.grpc.pb.h")
19-
set(HEALTH_PROTO "${PROTO_PATH}/grpc/health/v1/health.proto")
20-
set(HEALTH_PB_CPP_FILE "${GENERATED_HEALTH_PROTOBUF_PATH}/health.pb.cc")
21-
set(HEALTH_PB_H_FILE "${GENERATED_HEALTH_PROTOBUF_PATH}/health.pb.h")
22-
set(HEALTH_GRPC_PB_CPP_FILE "${GENERATED_HEALTH_PROTOBUF_PATH}/health.grpc.pb.cc")
23-
set(HEALTH_GRPC_PB_H_FILE "${GENERATED_HEALTH_PROTOBUF_PATH}/health.grpc.pb.h")
24-
25-
foreach(IMPORT_DIR ${PROTOBUF_IMPORT_DIRS})
26-
list(APPEND PROTOBUF_INCLUDE_FLAGS "-I${IMPORT_DIR}")
27-
endforeach()
28-
29-
find_program(gRPC_CPP_PLUGIN_EXECUTABLE grpc_cpp_plugin)
30-
31-
add_custom_command(
32-
OUTPUT ${DEMO_PB_H_FILE}
33-
${DEMO_PB_CPP_FILE}
34-
${DEMO_GRPC_PB_CPP_FILE}
35-
${DEMO_GRPC_PB_H_FILE}
36-
${HEALTH_PB_H_FILE}
37-
${HEALTH_PB_CPP_FILE}
38-
${HEALTH_GRPC_PB_CPP_FILE}
39-
${HEALTH_GRPC_PB_H_FILE}
40-
41-
COMMAND
42-
echo)
43-
44-
message(STATUS "gRPC_CPP_PLUGIN_EXECUTABLE=${gRPC_CPP_PLUGIN_EXECUTABLE}")
45-
46-
add_library(demo-proto ${DEMO_PB_H_FILE}
47-
${DEMO_PB_CPP_FILE}
48-
${DEMO_GRPC_PB_CPP_FILE}
49-
${DEMO_GRPC_PB_H_FILE}
50-
${HEALTH_PB_H_FILE}
51-
${HEALTH_PB_CPP_FILE}
52-
${HEALTH_GRPC_PB_CPP_FILE}
53-
${HEALTH_GRPC_PB_H_FILE})
54-
55-
target_link_libraries(demo-proto gRPC::grpc++ protobuf::libprotobuf)
5612
include_directories("${GENERATED_PROTOBUF_PATH}" "${OPENTELEMETRY_CPP_INCLUDE_DIRS}")
5713

5814
add_executable(currency src/server.cpp)

src/currency/build/generated/generated/proto/demo.grpc.pb.cc

-1,055
This file was deleted.

src/currency/build/generated/generated/proto/demo.grpc.pb.h

-3,708
This file was deleted.

src/currency/build/generated/generated/proto/demo.pb.cc

-10,792
This file was deleted.

src/currency/build/generated/generated/proto/demo.pb.h

-12,001
This file was deleted.

src/currency/build/generated/generated/proto/demo_mock.grpc.pb.h

-119
This file was deleted.

0 commit comments

Comments
 (0)