Code Review
/
apps
/
agl-service-can-low-level.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix problem with callback-type fields (issue #99).
[apps/agl-service-can-low-level.git]
/
generator
/
nanopb_generator.py
diff --git
a/generator/nanopb_generator.py
b/generator/nanopb_generator.py
index
ab6f3cb
..
094f8e8
100755
(executable)
--- a/
generator/nanopb_generator.py
+++ b/
generator/nanopb_generator.py
@@
-1,12
+1,19
@@
#!/usr/bin/python
'''Generate header file for nanopb from a ProtoBuf FileDescriptorSet.'''
#!/usr/bin/python
'''Generate header file for nanopb from a ProtoBuf FileDescriptorSet.'''
-nanopb_version = "nanopb-0.2.
5
-dev"
+nanopb_version = "nanopb-0.2.
6
-dev"
import sys
try:
import sys
try:
+ # Add some dummy imports to keep packaging tools happy.
import google, distutils.util # bbfreeze seems to need these
import google, distutils.util # bbfreeze seems to need these
+ import pkg_resources # pyinstaller / protobuf 2.5 seem to need these
+except:
+ # Don't care, we will error out later if it is actually important.
+ pass
+
+try:
import google.protobuf.text_format as text_format
except:
sys.stderr.write('''
import google.protobuf.text_format as text_format
except:
sys.stderr.write('''
@@
-162,6
+169,7
@@
class Field:
self.max_count = None
self.array_decl = ""
self.enc_size = None
self.max_count = None
self.array_decl = ""
self.enc_size = None
+ self.ctype = None
# Parse field options
if field_options.HasField("max_size"):
# Parse field options
if field_options.HasField("max_size"):