BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-25 18:58:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverting grpc generated file suffix (#6995)

Browse Source 
* Reverting grpc generated file suffix

* - Setting the greeter sample as it was
- Reverting the include of the generated message in grpc.cc file
This commit is contained in:
Panagiotis Gourgaris
2021-12-19 04:23:28 +02:00
committed by GitHub
parent b8aaccee82
commit b3edfdbfb7
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
grpc/samples/greeter/Makefile
View File

@@ -4,11 +4,11 @@ LDFLAGS ?=
.PHONY: all .PHONY: all
all: server client all: server client
greeter_generated.h: greeter.fbs greeter_generated: greeter.fbs
flatc --grpc --cpp $< flatc --grpc --cpp $<
server: server.cpp greeter.grpc.fb.cc greeter_generated.h greeter.grpc.fb.h server: greeter_generated server.cpp greeter.grpc.fb.cc greeter.grpc.fb.h
g++ -std=c++11 -O2 $(CXXFLAGS) $(LDFLAGS) -lgpr -lgrpc -lgrpc++ server.cpp greeter.grpc.fb.cc -o $@ g++ -std=c++11 -O2 $(CXXFLAGS) $(LDFLAGS) -lgpr -lgrpc -lgrpc++ server.cpp greeter.grpc.fb.cc -o $@
client: client.cpp greeter.grpc.fb.cc greeter_generated.h greeter.grpc.fb.h client: greeter_generated client.cpp greeter.grpc.fb.cc greeter.grpc.fb.h
g++ -std=c++11 -O2 $(CXXFLAGS) $(LDFLAGS) -lgpr -lgrpc -lgrpc++ client.cpp greeter.grpc.fb.cc -o $@ g++ -std=c++11 -O2 $(CXXFLAGS) $(LDFLAGS) -lgpr -lgrpc -lgrpc++ client.cpp greeter.grpc.fb.cc -o $@

2
grpc/src/compiler/cpp_generator.cc
View File

@@ -1155,6 +1155,7 @@ grpc::string GetSourcePrologue(grpc_generator::File *file,
vars["filename"] = file->filename(); vars["filename"] = file->filename();
vars["filename_base"] = file->filename_without_ext(); vars["filename_base"] = file->filename_without_ext();
vars["message_header_ext"] = file->message_header_ext();
vars["service_header_ext"] = file->service_header_ext(); vars["service_header_ext"] = file->service_header_ext();
printer->Print(vars, "// Generated by the gRPC C++ plugin.\n"); printer->Print(vars, "// Generated by the gRPC C++ plugin.\n");
@@ -1162,6 +1163,7 @@ grpc::string GetSourcePrologue(grpc_generator::File *file,
"// If you make any local change, they will be lost.\n"); "// If you make any local change, they will be lost.\n");
printer->Print(vars, "// source: $filename$\n\n"); printer->Print(vars, "// source: $filename$\n\n");
printer->Print(vars, "#include \"$filename_base$$message_header_ext$\"\n");
printer->Print(vars, "#include \"$filename_base$$service_header_ext$\"\n"); printer->Print(vars, "#include \"$filename_base$$service_header_ext$\"\n");
printer->Print(vars, "\n"); printer->Print(vars, "\n");
} }

16
src/idl_gen_grpc.cpp
View File

@@ -246,9 +246,7 @@ class FlatBufFile : public grpc_generator::File {
return parser_.opts.filename_suffix + ".h"; return parser_.opts.filename_suffix + ".h";
} }
std::string service_header_ext() const { std::string service_header_ext() const { return ".grpc.fb.h"; }
return parser_.opts.filename_suffix + ".grpc.fb.h";
}
std::string package() const { std::string package() const {
return parser_.current_namespace_->GetFullyQualifiedName(""); return parser_.current_namespace_->GetFullyQualifiedName("");
@@ -374,14 +372,10 @@ bool GenerateCppGRPC(const Parser &parser, const std::string &path,
grpc_cpp_generator::GetSourceServices(&fbfile, generator_parameters) + grpc_cpp_generator::GetSourceServices(&fbfile, generator_parameters) +
grpc_cpp_generator::GetSourceEpilogue(&fbfile, generator_parameters); grpc_cpp_generator::GetSourceEpilogue(&fbfile, generator_parameters);
return flatbuffers::SaveFile( return flatbuffers::SaveFile((path + file_name + ".grpc.fb.h").c_str(),
(path + file_name + parser.opts.filename_suffix + ".grpc.fb.h") header_code, false) &&
.c_str(), flatbuffers::SaveFile((path + file_name + ".grpc.fb.cc").c_str(),
header_code, false) && source_code, false);
flatbuffers::SaveFile(
(path + file_name + parser.opts.filename_suffix + ".grpc.fb.cc")
.c_str(),
source_code, false);
} }
class JavaGRPCGenerator : public flatbuffers::BaseGenerator { class JavaGRPCGenerator : public flatbuffers::BaseGenerator {