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

Add --extension option to generator.

Browse Source 
Patch courtesy of Michael Haberler.
This commit is contained in:
Petteri Aimonen
2013-02-28 16:42:34 +02:00
parent 57e81ca73b
commit 0e3053894f
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
generator/nanopb_generator.py
View File

@@ -439,7 +439,7 @@ def make_identifier(headername):
result += '_' result += '_'
return result return result
def generate_header(dependencies, headername, enums, messages): def generate_header(dependencies, headername, enums, messages, options):
'''Generate content for a header file. '''Generate content for a header file.
Generates strings, which should be concatenated and stored to file. Generates strings, which should be concatenated and stored to file.
''' '''
@@ -454,7 +454,7 @@ def generate_header(dependencies, headername, enums, messages):
for dependency in dependencies: for dependency in dependencies:
noext = os.path.splitext(dependency)[0] noext = os.path.splitext(dependency)[0]
yield '#include "%s.pb.h"\n' % noext yield '#include "%s.%s.h"\n' % (noext,options.extension)
yield '#ifdef __cplusplus\n' yield '#ifdef __cplusplus\n'
yield 'extern "C" {\n' yield 'extern "C" {\n'
@@ -582,6 +582,8 @@ optparser = OptionParser(
"Output will be written to file.pb.h and file.pb.c.") "Output will be written to file.pb.h and file.pb.c.")
optparser.add_option("-x", dest="exclude", metavar="FILE", action="append", default=[], optparser.add_option("-x", dest="exclude", metavar="FILE", action="append", default=[],
help="Exclude file from generated #include list.") help="Exclude file from generated #include list.")
optparser.add_option("-e", "--extension", dest="extension", metavar="EXTENSION", default="pb",
help="use extension instead of 'pb' for generated files.")
optparser.add_option("-q", "--quiet", dest="quiet", action="store_true", default=False, optparser.add_option("-q", "--quiet", dest="quiet", action="store_true", default=False,
help="Don't print anything except errors.") help="Don't print anything except errors.")
optparser.add_option("-v", "--verbose", dest="verbose", action="store_true", default=False, optparser.add_option("-v", "--verbose", dest="verbose", action="store_true", default=False,
@@ -638,8 +640,8 @@ def process(filenames, options):
enums, messages = parse_file(fdesc.file[0], file_options) enums, messages = parse_file(fdesc.file[0], file_options)
noext = os.path.splitext(filename)[0] noext = os.path.splitext(filename)[0]
headername = noext + '.pb.h' headername = noext + '.' + options.extension + '.h'
sourcename = noext + '.pb.c' sourcename = noext + '.' + options.extension + '.c'
headerbasename = os.path.basename(headername) headerbasename = os.path.basename(headername)
if not options.quiet: if not options.quiet:
@@ -651,7 +653,7 @@ def process(filenames, options):
dependencies = [d for d in fdesc.file[0].dependency if d not in excludes] dependencies = [d for d in fdesc.file[0].dependency if d not in excludes]
header = open(headername, 'w') header = open(headername, 'w')
for part in generate_header(dependencies, headerbasename, enums, messages): for part in generate_header(dependencies, headerbasename, enums, messages, options):
header.write(part) header.write(part)
source = open(sourcename, 'w') source = open(sourcename, 'w')