diff options
| author | Petteri Aimonen <jpa@git.mail.kapsi.fi> | 2022-11-25 16:43:14 +0300 |
|---|---|---|
| committer | Petteri Aimonen <jpa@git.mail.kapsi.fi> | 2022-11-25 16:43:14 +0300 |
| commit | bb5b4d90cb372288f157eb9c3c2b9cc6c6ad2df4 (patch) | |
| tree | 3337b46ebd82d852de2cfb886df631f4283bcfc4 /tests | |
| parent | eb135da5d4c6fce4f34ee6fcc5f13c741dbb042a (diff) | |
Allow using = instead of : with generator option -s
Relevant only for very old protoc versions where --nanopb_opt=
cannot be used, and --nanopb_out= parsing fails on colon.
I'm adding this just to be able to keep the regression test suite
running with protoc 3.0.0 also.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/regression/issue_795/SConscript | 2 | ||||
| -rw-r--r-- | tests/site_scons/site_tools/nanopb.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/regression/issue_795/SConscript b/tests/regression/issue_795/SConscript index 1ef86a8..e7295e3 100644 --- a/tests/regression/issue_795/SConscript +++ b/tests/regression/issue_795/SConscript @@ -6,7 +6,7 @@ Import('env') opts = env.Clone() -opts.Append(NANOPBFLAGS = "-s mangle_names:M_STRIP_PACKAGE") +opts.Append(NANOPBFLAGS = "-s mangle_names=M_STRIP_PACKAGE") opts.NanopbProto("test.proto") opts.NanopbProto("test2.proto") diff --git a/tests/site_scons/site_tools/nanopb.py b/tests/site_scons/site_tools/nanopb.py index 4abf02a..0b46c09 100644 --- a/tests/site_scons/site_tools/nanopb.py +++ b/tests/site_scons/site_tools/nanopb.py @@ -152,7 +152,7 @@ def _nanopb_proto_actions(source, target, env, for_signature): else: nanopb_flags = '--source-extension=%s,--header-extension=%s:.' % (source_extension, header_extension) - return SCons.Action.CommandAction('$PROTOC $PROTOCFLAGS %s --nanopb_out=%s %s' % (include_dirs, nanopb_flags, srcfile), + return SCons.Action.CommandAction('$PROTOC $PROTOCFLAGS %s "--nanopb_out=%s" %s' % (include_dirs, nanopb_flags, srcfile), chdir = prefix) def _nanopb_proto_emitter(target, source, env): |