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

Rework the Makefiles to be compatible with binary packages.

Browse Source
This commit is contained in:
Petteri Aimonen
2013-11-17 20:04:29 +02:00
parent bee09c3a38
commit b4457a86d6
8 changed files with 86 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
generator/nanopb_generator.py
View File

@@ -15,10 +15,17 @@ except:
print
raise
import proto.nanopb_pb2 as nanopb_pb2
import proto.descriptor_pb2 as descriptor
try:
import proto.nanopb_pb2 as nanopb_pb2
import proto.descriptor_pb2 as descriptor
except:
print
print "********************************************************************"
print "*** Failed to import the protocol definitions for generator. ***"
print "*** You have to run 'make' in the nanopb/generator/proto folder. ***"
print "********************************************************************"
print
raise
# ---------------------------------------------------------------------------
@@ -1031,7 +1038,7 @@ def main_plugin():
if __name__ == '__main__':
# Check if we are running as a plugin under protoc
if 'protoc-gen-' in sys.argv[0]:
if 'protoc-gen-' in sys.argv[0] or '--protoc-plugin' in sys.argv:
main_plugin()
else:
main_cli()