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

Fix handling spaces in directory name

Browse Source
This commit is contained in:
Petteri Aimonen
2013-12-29 21:11:57 +02:00
parent 10ef575d46
commit da8210b947
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,12 +61,12 @@ def _detect_protoc(env):
p1 = os.path.join(p, 'generator-bin', 'protoc') p1 = os.path.join(p, 'generator-bin', 'protoc')
if os.path.exists(p1): if os.path.exists(p1):
# Use protoc bundled with binary package # Use protoc bundled with binary package
return p1 return env['ESCAPE'](p1)
p = env.WhereIs('protoc') p = env.WhereIs('protoc')
if p: if p:
# Use protoc from path # Use protoc from path
return p return env['ESCAPE'](p)
raise SCons.Errors.StopError(NanopbWarning, raise SCons.Errors.StopError(NanopbWarning,
"Could not find the protoc compiler") "Could not find the protoc compiler")

4
tools/make_linux_package.sh
View File

@@ -34,10 +34,10 @@ LIBPROTOC=$(ldd `which protoc` | grep -o '/.*libprotoc[^ ]*')
cp $LIBPROTOC $DEST/generator-bin/ cp $LIBPROTOC $DEST/generator-bin/
cat > $DEST/generator-bin/protoc << EOF cat > $DEST/generator-bin/protoc << EOF
#!/bin/bash #!/bin/bash
SCRIPTDIR=\$(dirname \$(readlink -f \$0)) SCRIPTDIR=\$(dirname "\$0")
export LD_LIBRARY_PATH=\$SCRIPTDIR export LD_LIBRARY_PATH=\$SCRIPTDIR
export PATH=\$SCRIPTDIR:\$PATH export PATH=\$SCRIPTDIR:\$PATH
exec \$SCRIPTDIR/protoc.bin "\$@" exec "\$SCRIPTDIR/protoc.bin" "\$@"
EOF EOF
chmod +x $DEST/generator-bin/protoc chmod +x $DEST/generator-bin/protoc