mirror of
https://github.com/autc04/Retro68.git
synced 2024-06-30 10:29:39 +00:00
special characters should now work in interfaces&libraries path
This commit is contained in:
parent
e6ba1bf012
commit
48e6c62d6f
|
@ -16,18 +16,6 @@
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with Retro68. If not, see <http://www.gnu.org/licenses/>.
|
# along with Retro68. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
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
|
||||||
|
@ -66,15 +54,6 @@ function locateAndCheckInterfacesAndLibraries()
|
||||||
{
|
{
|
||||||
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
|
||||||
|
@ -142,7 +121,7 @@ function locateAndCheckInterfacesAndLibraries()
|
||||||
if locateInterfaceThing CARBONLIB CarbonLib; then
|
if locateInterfaceThing CARBONLIB CarbonLib; then
|
||||||
carbondir=`dirname "$CARBONLIB"`
|
carbondir=`dirname "$CARBONLIB"`
|
||||||
if [ "$carbondir" != "$SHAREDLIBRARIES" ]; then
|
if [ "$carbondir" != "$SHAREDLIBRARIES" ]; then
|
||||||
echo "Carbon.h found, but not in the same directory as InterfaceLib."
|
echo "CarbonLib found, but not in the same directory as InterfaceLib."
|
||||||
echo "This is confusing."
|
echo "This is confusing."
|
||||||
echo
|
echo
|
||||||
explainInterfaces
|
explainInterfaces
|
||||||
|
|
Loading…
Reference in New Issue
Block a user