aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetteri Aimonen <jpa@git.mail.kapsi.fi>2013-12-29 21:36:06 +0200
committerPetteri Aimonen <jpa@git.mail.kapsi.fi>2013-12-29 21:36:06 +0200
commit125b49bf24883585d6826b8d72e14ccdfae41206 (patch)
treec59429f9a040401a315045b4b998bec40478082f
parentda8210b947821b2002ce7dfb34eba213a2da73a3 (diff)
Fix spaces in paths on Windows also
-rw-r--r--generator/protoc-gen-nanopb.bat2
-rw-r--r--tests/site_scons/site_tools/nanopb.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/generator/protoc-gen-nanopb.bat b/generator/protoc-gen-nanopb.bat
index 3eed057b..7624984e 100644
--- a/generator/protoc-gen-nanopb.bat
+++ b/generator/protoc-gen-nanopb.bat
@@ -9,4 +9,4 @@
:: --plugin= on the command line.
set mydir=%~dp0
-python %mydir%\nanopb_generator.py --protoc-plugin
+python "%mydir%\nanopb_generator.py" --protoc-plugin
diff --git a/tests/site_scons/site_tools/nanopb.py b/tests/site_scons/site_tools/nanopb.py
index 97837666..9197e190 100644
--- a/tests/site_scons/site_tools/nanopb.py
+++ b/tests/site_scons/site_tools/nanopb.py
@@ -58,7 +58,7 @@ def _detect_protoc(env):
return env['PROTOC']
p = _detect_nanopb(env)
- p1 = os.path.join(p, 'generator-bin', 'protoc')
+ p1 = os.path.join(p, 'generator-bin', 'protoc' + env['PROGSUFFIX'])
if os.path.exists(p1):
# Use protoc bundled with binary package
return env['ESCAPE'](p1)