rik/nanopb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move descriptor.proto to google/protobuf directory where it belongs.

Browse Source 
This fixes some interoperability problems when trying to compile
nanopb.proto for e.g. the Google's C++ library.

Update issue 104
Status: FixedInGit
This commit is contained in:
Petteri Aimonen
2014-02-12 19:43:04 +02:00
parent fe0bf121eb
commit 542463dbaa
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
generator/nanopb_generator.py
View File

@@ -15,6 +15,7 @@ except:
try:
import google.protobuf.text_format as text_format
import google.protobuf.descriptor_pb2 as descriptor
except:
sys.stderr.write('''
*************************************************************
@@ -26,7 +27,7 @@ except:
try:
import proto.nanopb_pb2 as nanopb_pb2
import proto.descriptor_pb2 as descriptor
import proto.plugin_pb2 as plugin_pb2
except:
sys.stderr.write('''
********************************************************************
@@ -1070,7 +1071,6 @@ def main_plugin():
msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
import proto.plugin_pb2 as plugin_pb2
data = sys.stdin.read()
request = plugin_pb2.CodeGeneratorRequest.FromString(data)