Merge pull request #62 from donbright/patch-3

check the directories where the interfaces and libraries are installed to make sure they dont contain the '&' character, which breaks the build on linux. (some archives of the interfaces and libraries files, have them named as "Interfaces&Libraries")
This commit is contained in:
Wolfgang Thaller 2018-09-16 18:28:42 +02:00 committed by GitHub
commit 564dd9be0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -162,6 +162,18 @@ fi
INTERFACES_DIR="$SRC/InterfacesAndLibraries" INTERFACES_DIR="$SRC/InterfacesAndLibraries"
function verifyInterfaceDirNames()
{
printf "Searching for special characters in subdirs of $INTERFACES_DIR"
local found=`find "$INTERFACES_DIR" -type d -name "*" -print `
if [ "`echo $found | grep \&`" ]; then
echo "\n$found Contained special character &"
return 1 # failure
else
return 0 # success
fi
}
function locateInterfaceThing() function locateInterfaceThing()
{ {
local varname=$1 local varname=$1
@ -198,6 +210,15 @@ function explainInterfaces()
echo "Looking for various files in $INTERFACES_DIR/..." echo "Looking for various files in $INTERFACES_DIR/..."
if verifyInterfaceDirNames; then
echo "Directory name looks clean"
else
echo "Directory name contained special character & that would break build"
echo "Please install the Interfaces and Libraries files in a path under"
echo "$INTERFACES_DIR that does not contain the & character"
exit 1
fi
if locateInterfaceThing CONDITIONALMACROS_H ConditionalMacros.h; then if locateInterfaceThing CONDITIONALMACROS_H ConditionalMacros.h; then
CINCLUDES=`dirname "$CONDITIONALMACROS_H"` CINCLUDES=`dirname "$CONDITIONALMACROS_H"`
else else