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

Make the generator options accept a file name in addition to format string.

Browse Source
This commit is contained in:
Petteri Aimonen
2013-03-09 23:03:09 +02:00
parent 03e5393072
commit 6468f23d23
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
generator/nanopb_generator.py
View File

@@ -455,7 +455,11 @@ def generate_header(dependencies, headername, enums, messages, options):
symbol = make_identifier(headername) symbol = make_identifier(headername)
yield '#ifndef _PB_%s_\n' % symbol yield '#ifndef _PB_%s_\n' % symbol
yield '#define _PB_%s_\n' % symbol yield '#define _PB_%s_\n' % symbol
yield options.libformat % ('pb.h') try:
yield options.libformat % ('pb.h')
except TypeError:
# no %s specified - use whatever was passed in as options.libformat
yield options.libformat
yield '\n' yield '\n'
for dependency in dependencies: for dependency in dependencies:
@@ -688,7 +692,11 @@ def process(filenames, options):
fdesc = descriptor.FileDescriptorSet.FromString(data) fdesc = descriptor.FileDescriptorSet.FromString(data)
# Check if any separate options are specified # Check if any separate options are specified
optfilename = options.options_file % os.path.splitext(filename)[0] try:
optfilename = options.options_file % os.path.splitext(filename)[0]
except TypeError:
# No %s specified, use the filename as-is
optfilename = options.options_file
if options.verbose: if options.verbose:
print 'Reading options from ' + optfilename print 'Reading options from ' + optfilename