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

Do not automatically add a dot with generator -e option.

Browse Source 
Now -e option in generator is more versatile. Especially it avoids
double-dot problem with some build systems.

Given foobar.proto, we now get:
-e .pb  =>  foobar.pb.c (default)
-e _pb  =>  foobar_pb.c
-e ''   =>  foobar.c

Note that if you have used -e option previously, you will have to prepend
. to the argument to get the same filenames as before.

Update issue 122
Status: FixedInGit
This commit is contained in:
Petteri Aimonen
2014-07-20 14:25:11 +03:00
parent 7f97ad549e
commit 3cf9668c75
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
generator/nanopb_generator.py
View File

@@ -724,7 +724,7 @@ def generate_header(dependencies, headername, enums, messages, extensions, optio
for dependency in dependencies: for dependency in dependencies:
noext = os.path.splitext(dependency)[0] noext = os.path.splitext(dependency)[0]
yield options.genformat % (noext + '.' + options.extension + '.h') yield options.genformat % (noext + options.extension + '.h')
yield '\n' yield '\n'
yield '#ifdef __cplusplus\n' yield '#ifdef __cplusplus\n'
@@ -959,8 +959,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", optparser.add_option("-e", "--extension", dest="extension", metavar="EXTENSION", default=".pb",
help="Set extension to use instead of 'pb' for generated files. [default: %default]") help="Set extension to use instead of '.pb' for generated files. [default: %default]")
optparser.add_option("-f", "--options-file", dest="options_file", metavar="FILE", default="%s.options", optparser.add_option("-f", "--options-file", dest="options_file", metavar="FILE", default="%s.options",
help="Set name of a separate generator options file.") help="Set name of a separate generator options file.")
optparser.add_option("-Q", "--generated-include-format", dest="genformat", optparser.add_option("-Q", "--generated-include-format", dest="genformat",
@@ -1027,11 +1027,11 @@ def process_file(filename, fdesc, options):
# Parse the file # Parse the file
file_options = get_nanopb_suboptions(fdesc, toplevel_options, Names([filename])) file_options = get_nanopb_suboptions(fdesc, toplevel_options, Names([filename]))
enums, messages, extensions = parse_file(fdesc, file_options) enums, messages, extensions = parse_file(fdesc, file_options)
# Decide the file names # Decide the file names
noext = os.path.splitext(filename)[0] noext = os.path.splitext(filename)[0]
headername = noext + '.' + options.extension + '.h' headername = noext + options.extension + '.h'
sourcename = noext + '.' + options.extension + '.c' sourcename = noext + options.extension + '.c'
headerbasename = os.path.basename(headername) headerbasename = os.path.basename(headername)
# List of .proto files that should not be included in the C header file # List of .proto files that should not be included in the C header file