diff options
Diffstat (limited to 'generator/proto')
| -rw-r--r-- | generator/proto/Makefile | 2 | ||||
| -rw-r--r-- | generator/proto/google/protobuf/descriptor.proto (renamed from generator/proto/descriptor.proto) | 0 | ||||
| -rw-r--r-- | generator/proto/nanopb.proto | 2 | ||||
| -rw-r--r-- | generator/proto/plugin.proto | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/generator/proto/Makefile b/generator/proto/Makefile index ee1390a5..89bfe528 100644 --- a/generator/proto/Makefile +++ b/generator/proto/Makefile @@ -1,4 +1,4 @@ -all: nanopb_pb2.py plugin_pb2.py descriptor_pb2.py +all: nanopb_pb2.py plugin_pb2.py %_pb2.py: %.proto protoc --python_out=. $< diff --git a/generator/proto/descriptor.proto b/generator/proto/google/protobuf/descriptor.proto index a785f79f..a785f79f 100644 --- a/generator/proto/descriptor.proto +++ b/generator/proto/google/protobuf/descriptor.proto diff --git a/generator/proto/nanopb.proto b/generator/proto/nanopb.proto index 2ea011f4..2be2f803 100644 --- a/generator/proto/nanopb.proto +++ b/generator/proto/nanopb.proto @@ -5,7 +5,7 @@ // These are used by nanopb to generate statically allocable structures // for memory-limited environments. -import "descriptor.proto"; +import "google/protobuf/descriptor.proto"; option java_package = "fi.kapsi.koti.jpa.nanopb"; diff --git a/generator/proto/plugin.proto b/generator/proto/plugin.proto index d8b515e3..651ed10c 100644 --- a/generator/proto/plugin.proto +++ b/generator/proto/plugin.proto @@ -46,7 +46,7 @@ package google.protobuf.compiler; -import "descriptor.proto"; +import "google/protobuf/descriptor.proto"; // An encoded CodeGeneratorRequest is written to the plugin's stdin. message CodeGeneratorRequest { |