Macintosh-Tools/Retro68
1
0
Fork 0
mirror of https://github.com/autc04/Retro68.git synced 2025-01-15 15:33:44 +00:00
Code Issues Projects Releases Wiki Activity

special characters should now work in interfaces&libraries path

Browse Source
This commit is contained in:
Wolfgang Thaller 2019-08-17 21:57:11 +02:00
parent e6ba1bf012
commit 48e6c62d6f
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
interfaces-and-libraries.sh
View File

@ -16,18 +16,6 @@
# You should have received a copy of the GNU General Public License
# 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()
{
local varname=$1
@ -66,15 +54,6 @@ function locateAndCheckInterfacesAndLibraries()
{
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
CINCLUDES=`dirname "$CONDITIONALMACROS_H"`
else
@ -142,7 +121,7 @@ function locateAndCheckInterfacesAndLibraries()
if locateInterfaceThing CARBONLIB CarbonLib; then
carbondir=`dirname "$CARBONLIB"`
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
explainInterfaces