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

Fix bundled protoc detection in scons script

Browse Source
This commit is contained in:
Petteri Aimonen
2013-12-29 22:08:13 +02:00
parent 585cd0356e
commit 18e71bbfe2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/site_scons/site_tools/nanopb.py
View File

@@ -57,8 +57,8 @@ def _detect_protoc(env):
# Use protoc defined by user # Use protoc defined by user
return env['PROTOC'] return env['PROTOC']
p = _detect_nanopb(env) n = _detect_nanopb(env)
p1 = os.path.join(p, 'generator-bin', 'protoc' + env['PROGSUFFIX']) p1 = os.path.join(n, 'generator-bin', 'protoc' + env['PROGSUFFIX'])
if os.path.exists(p1): if os.path.exists(p1):
# Use protoc bundled with binary package # Use protoc bundled with binary package
return env['ESCAPE'](p1) return env['ESCAPE'](p1)
@@ -78,7 +78,8 @@ def _detect_protocflags(env):
p = _detect_protoc(env) p = _detect_protoc(env)
n = _detect_nanopb(env) n = _detect_nanopb(env)
if p == os.path.join(n, 'generator-bin', 'protoc'): p1 = os.path.join(n, 'generator-bin', 'protoc' + env['PROGSUFFIX'])
if p == env['ESCAPE'](p1):
# Using the bundled protoc, no options needed # Using the bundled protoc, no options needed
return '' return ''