From 45c1a32e5046fe9323d4fd0213b474a554b2bbed Mon Sep 17 00:00:00 2001 From: Petteri Aimonen Date: Sun, 17 Nov 2013 20:04:29 +0200 Subject: Rework the Makefiles to be compatible with binary packages. --- generator/nanopb_generator.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'generator/nanopb_generator.py') diff --git a/generator/nanopb_generator.py b/generator/nanopb_generator.py index 86c554a2..7b3c9f80 100755 --- a/generator/nanopb_generator.py +++ b/generator/nanopb_generator.py @@ -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 # --------------------------------------------------------------------------- @@ -1054,7 +1061,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() -- cgit 1.2.3-korg