From e76dfe1f4d3f3f9485ea463f07665d59bef28b94 Mon Sep 17 00:00:00 2001
From: Ezra Buehler <spam@easyb.ch>
Date: Sat, 17 Aug 2019 11:37:22 +0200
Subject: [PATCH] Move Interfaces&Libraries handling to separate file

To enable binary distribution it is now possible to install Apple's
interfaces and libraries at a later point by running:

    interfaces-and-libraries.sh /install/to /from/InterfacesAndLibraries
---
 build-toolchain.bash        | 230 +---------------------------------
 interfaces-and-libraries.sh | 240 ++++++++++++++++++++++++++++++++++++
 2 files changed, 245 insertions(+), 225 deletions(-)
 create mode 100755 interfaces-and-libraries.sh

diff --git a/build-toolchain.bash b/build-toolchain.bash
index a32cd8f07e..afa379ee5b 100755
--- a/build-toolchain.bash
+++ b/build-toolchain.bash
@@ -177,142 +177,9 @@ fi
 
 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
-}
+. "$SRC/interfaces-and-libraries.sh"
 
-function locateInterfaceThing()
-{
-	local varname=$1
-	local name=$2
-	printf "Searching for %-25s" "$name..."
-	local found=`find "$INTERFACES_DIR" -name ".*" -prune -o -name $name -print`
-	if [ -n "$found" ]; then
-		eval "$varname=\$found"
-		echo ${found#$INTERFACES_DIR/}
-		return 0	# success
-	else
-		echo "NOT FOUND"
-		return 1	# failure
-	fi
-}
-
-function explainInterfaces()
-{
-	echo "Please get a copy of Apple's Universal Interfaces & Libraries, "
-	echo "version 3.x, and place it in the InterfacesAndLibraries directory inside"
-	echo "the Retro68 source directory."
-	echo
-	echo "The exact directory layout does not matter, but there has to be"
-	echo "  - a directory with C header files (usually \"CIncludes\")"
-	echo "  - a directory with Rez header files (usually \"RIncludes\")"
-	echo "  - (for 68K) a directory containing Interface.o (usually \"Libraries\")"
-	echo "  - (for PPC) a directory containing InterfaceLib (usually \"SharedLibraries\")"
-	echo "  - (for Carbon) Carbon.h and CarbonLib, in the same directories"
-	echo
-	echo "The Interfaces&Libraries folder from Apple's last MPW release (MPW 3.5 "
-	echo "aka MPW GM 'Golden Master') is known to work."
-	exit 1
-}
-
-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
-	echo "Could not find ConditionalMacros.h anywhere inside InterfaceAndLibraries/"
-	echo
-	explainInterfaces
-fi
-
-if locateInterfaceThing CONDITIONALMACROS_R ConditionalMacros.r; then
-	RINCLUDES=`dirname "$CONDITIONALMACROS_R"`
-else
-	echo "Could not find ConditionalMacros.r anywhere inside InterfaceAndLibraries/"
-	echo
-	explainInterfaces
-fi
-
-if [ $BUILD_68K != false ]; then
-
-	if locateInterfaceThing INTERFACE_O Interface.o; then
-		M68KLIBRARIES=`dirname "$INTERFACE_O"`
-	else
-		echo "Could not find Interface.o anywhere inside InterfaceAndLibraries/"
-		echo "(This file is required for 68K support only)"
-		echo
-		explainInterfaces
-	fi
-
-fi
-
-if [ $BUILD_PPC != false ]; then
-
-	if locateInterfaceThing INTERFACELIB InterfaceLib; then
-		SHAREDLIBRARIES=`dirname "$INTERFACELIB"`
-	else
-		echo "Could not find InterfaceLib anywhere inside InterfaceAndLibraries/"
-		echo "(This file is required for PowerPC support only)"
-		echo
-		explainInterfaces
-	fi
-
-	if locateInterfaceThing OPENTRANSPORTAPPPPC OpenTransportAppPPC.o; then
-		PPCLIBRARIES=`dirname "$OPENTRANSPORTAPPPPC"`
-	else
-		echo "Could not find OpenTransportAppPPC.o anywhere inside InterfaceAndLibraries/"
-		echo "(This file is required for OpenTransport on PPC only)"
-	fi
-
-fi
-
-if [ $BUILD_CARBON != false ]; then
-	if locateInterfaceThing CARBON_H Carbon.h; then
-		carbondir=`dirname "$CARBON_H"`
-		if [ "$carbondir" != "$CINCLUDES" ]; then
-			echo "Carbon.h found, but not in the same directory as ConditionalMacros.h."
-			echo "This is confusing."
-			echo
-			explainInterfaces
-		fi
-	else
-		echo "Could not find Carbon.h anywhere inside InterfaceAndLibraries/"
-		echo "(This file is required for Carbon support only)"
-		echo
-		explainInterfaces
-	fi
-	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 "This is confusing."
-			echo
-			explainInterfaces
-		fi
-	else
-		echo "Could not find CarbonLib anywhere inside InterfaceAndLibraries/"
-		echo "(This file is required for Carbon support only)"
-		echo
-		explainInterfaces
-	fi
-fi
+locateAndCheckInterfacesAndLibraries
 
 ##################### Third-Party components: binutils, gcc, hfsutils
 
@@ -465,98 +332,11 @@ echo 'subdirs("build-host")' > CTestTestfile.cmake
 	# make tools (such as MakeImport and the compilers) available for later commands
 export PATH=$PREFIX/bin:$PATH
 
-##################### Setup Interfaces & Libraries
+##################### Set up Interfaces & Libraries
 
-echo "Preparing CIncludes..."
-rm -rf "$PREFIX/CIncludes"
-mkdir "$PREFIX/CIncludes"
-sh "$SRC/prepare-headers.sh" "$CINCLUDES" "$PREFIX/CIncludes"
+setUpInterfacesAndLibraries
 
-echo "Preparing RIncludes..."
-rm -rf "$PREFIX/RIncludes"
-mkdir "$PREFIX/RIncludes"
-sh "$SRC/prepare-rincludes.sh" "$RINCLUDES" "$PREFIX/RIncludes"
-
-# remove old symlinks in $PREFIX/*-apple-macos/include/
-# and link files from $PREFIX/CIncludes
-function linkheaders()
-{
-	# incompatible with Universal Interfaces on case-insensitive file systems
-	# (and does not currently work anyways)
-	rm -f "$1"/threads.h
-
-	# the following command doesn't work on older Mac OS X versions.
-	# allow it to fail quietly, at worst we leave some dangling symlinks around
-	# in the rare situation that headers are removed from the input directory
-	find "$1" -lname "../../CIncludes/*" -delete || true
-	(cd "$1" && find "../../CIncludes/" -name '*.h' -exec ln -s {} . \;)
-}
-
-echo "Creating Symlinks for CIncludes and RIncludes..."
-
-if [ $BUILD_68K != false ]; then
-	ln -sf ../RIncludes $PREFIX/m68k-apple-macos/RIncludes
-	linkheaders $PREFIX/m68k-apple-macos/include
-fi
-
-if [ $BUILD_PPC != false ]; then
-	ln -sf ../RIncludes $PREFIX/powerpc-apple-macos/RIncludes
-	linkheaders $PREFIX/powerpc-apple-macos/include
-fi
-
-if [ $BUILD_68K != false ]; then
-	echo "Converting 68K static libraries..."
-	for macobj in "${M68KLIBRARIES}/"*.o; do
-		if [ -r $macobj ]; then
-			libname=`basename "$macobj"`
-			libname=${libname%.o}
-			printf "    %30s => %-30s\n" ${libname}.o lib${libname}.a
-			obj="$PREFIX/m68k-apple-macos/lib/$libname.o"
-			lib="$PREFIX/m68k-apple-macos/lib/lib${libname}.a"
-			rm -f $lib
-
-			(ConvertObj "$macobj" | m68k-apple-macos-as - -o $obj) && m68k-apple-macos-ar cqs $lib $obj
-		fi
-	done
-fi
-
-if [ $BUILD_PPC != false ]; then
-	case `ResInfo -n "$INTERFACELIB" || echo 0` in
-		0)
-			echo "WARNING: Couldn't read resource fork for \"$INTERFACELIB\"."
-			echo "         Falling back to included import libraries."
-			echo "Copying readymade PowerPC import libraries..."
-			cp $SRC/ImportLibraries/*.a $PREFIX/powerpc-apple-macos/lib/
-			;;
-		*)
-			echo "Building PowerPC import libraries..."
-			for shlib in "${SHAREDLIBRARIES}/"*; do
-				libname=`basename "$shlib"`
-				implib=lib${libname}.a
-				printf "    %30s => %-30s\n" ${libname} ${implib}
-				MakeImport "$shlib" "$PREFIX/powerpc-apple-macos/lib/$implib"
-			done
-			;;
-	esac
-
-	if [ -d ${PPCLIBRARIES} ]; then
-		echo "Copying static PPC libraries"
-		for obj in ${PPCLIBRARIES}/OpenT*.o ${PPCLIBRARIES}/CarbonAccessors.o ${PPCLIBRARIES}/CursorDevicesGlue.o; do
-			if [ -r $obj ]; then
-				# copy the library:
-				cp $obj $PREFIX/powerpc-apple-macos/lib/
-
-				# and wrap it in a .a archive for convenience
-				lib=$PREFIX/powerpc-apple-macos/lib/lib`basename "${obj%.o}"`.a
-				rm -f $lib
-				$PREFIX/bin/powerpc-apple-macos-ar cqs $lib $obj
-			fi
-		done
-	fi
-fi
-
-
-	##################### Setup Interfaces & Libraries
+##################### Build target libraries and samples
 
 if [ $BUILD_68K != false ]; then
 	echo "Building target libraries and samples for 68K..."
diff --git a/interfaces-and-libraries.sh b/interfaces-and-libraries.sh
new file mode 100755
index 0000000000..6ef70a156d
--- /dev/null
+++ b/interfaces-and-libraries.sh
@@ -0,0 +1,240 @@
+#!/bin/bash
+#   Copyright 2014 Wolfgang Thaller.
+#
+#   This file is part of Retro68.
+#
+#   Retro68 is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   Retro68 is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   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
+	local name=$2
+	printf "Searching for %-25s" "$name..."
+	local found=`find "$INTERFACES_DIR" -name ".*" -prune -o -name $name -print`
+	if [ -n "$found" ]; then
+		eval "$varname=\$found"
+		echo ${found#$INTERFACES_DIR/}
+		return 0	# success
+	else
+		echo "NOT FOUND"
+		return 1	# failure
+	fi
+}
+
+function explainInterfaces()
+{
+	echo "Please get a copy of Apple's Universal Interfaces & Libraries, "
+	echo "version 3.x, and place it in the InterfacesAndLibraries directory inside"
+	echo "the Retro68 source directory."
+	echo
+	echo "The exact directory layout does not matter, but there has to be"
+	echo "  - a directory with C header files (usually \"CIncludes\")"
+	echo "  - a directory with Rez header files (usually \"RIncludes\")"
+	echo "  - (for 68K) a directory containing Interface.o (usually \"Libraries\")"
+	echo "  - (for PPC) a directory containing InterfaceLib (usually \"SharedLibraries\")"
+	echo "  - (for Carbon) Carbon.h and CarbonLib, in the same directories"
+	echo
+	echo "The Interfaces&Libraries folder from Apple's last MPW release (MPW 3.5 "
+	echo "aka MPW GM 'Golden Master') is known to work."
+	exit 1
+}
+
+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
+		echo "Could not find ConditionalMacros.h anywhere inside InterfaceAndLibraries/"
+		echo
+		explainInterfaces
+	fi
+
+	if locateInterfaceThing CONDITIONALMACROS_R ConditionalMacros.r; then
+		RINCLUDES=`dirname "$CONDITIONALMACROS_R"`
+	else
+		echo "Could not find ConditionalMacros.r anywhere inside InterfaceAndLibraries/"
+		echo
+		explainInterfaces
+	fi
+
+	if [ $BUILD_68K != false ]; then
+
+		if locateInterfaceThing INTERFACE_O Interface.o; then
+			M68KLIBRARIES=`dirname "$INTERFACE_O"`
+		else
+			echo "Could not find Interface.o anywhere inside InterfaceAndLibraries/"
+			echo "(This file is required for 68K support only)"
+			echo
+			explainInterfaces
+		fi
+
+	fi
+
+	if [ $BUILD_PPC != false ]; then
+
+		if locateInterfaceThing INTERFACELIB InterfaceLib; then
+			SHAREDLIBRARIES=`dirname "$INTERFACELIB"`
+		else
+			echo "Could not find InterfaceLib anywhere inside InterfaceAndLibraries/"
+			echo "(This file is required for PowerPC support only)"
+			echo
+			explainInterfaces
+		fi
+
+		if locateInterfaceThing OPENTRANSPORTAPPPPC OpenTransportAppPPC.o; then
+			PPCLIBRARIES=`dirname "$OPENTRANSPORTAPPPPC"`
+		else
+			echo "Could not find OpenTransportAppPPC.o anywhere inside InterfaceAndLibraries/"
+			echo "(This file is required for OpenTransport on PPC only)"
+		fi
+
+	fi
+
+	if [ $BUILD_CARBON != false ]; then
+		if locateInterfaceThing CARBON_H Carbon.h; then
+			carbondir=`dirname "$CARBON_H"`
+			if [ "$carbondir" != "$CINCLUDES" ]; then
+				echo "Carbon.h found, but not in the same directory as ConditionalMacros.h."
+				echo "This is confusing."
+				echo
+				explainInterfaces
+			fi
+		else
+			echo "Could not find Carbon.h anywhere inside InterfaceAndLibraries/"
+			echo "(This file is required for Carbon support only)"
+			echo
+			explainInterfaces
+		fi
+		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 "This is confusing."
+				echo
+				explainInterfaces
+			fi
+		else
+			echo "Could not find CarbonLib anywhere inside InterfaceAndLibraries/"
+			echo "(This file is required for Carbon support only)"
+			echo
+			explainInterfaces
+		fi
+	fi
+}
+
+function setUpInterfacesAndLibraries()
+{
+	echo "Preparing CIncludes..."
+	rm -rf "$PREFIX/CIncludes"
+	mkdir "$PREFIX/CIncludes"
+	sh "$SRC/prepare-headers.sh" "$CINCLUDES" "$PREFIX/CIncludes"
+
+	echo "Preparing RIncludes..."
+	rm -rf "$PREFIX/RIncludes"
+	mkdir "$PREFIX/RIncludes"
+	sh "$SRC/prepare-rincludes.sh" "$RINCLUDES" "$PREFIX/RIncludes"
+
+	if [ $BUILD_68K != false ]; then
+		echo "Converting 68K static libraries..."
+		for macobj in "${M68KLIBRARIES}/"*.o; do
+			if [ -r $macobj ]; then
+				libname=`basename "$macobj"`
+				libname=${libname%.o}
+				printf "    %30s => %-30s\n" ${libname}.o lib${libname}.a
+				obj="$PREFIX/m68k-apple-macos/lib/$libname.o"
+				lib="$PREFIX/m68k-apple-macos/lib/lib${libname}.a"
+				rm -f $lib
+
+				(ConvertObj "$macobj" | m68k-apple-macos-as - -o $obj) && m68k-apple-macos-ar cqs $lib $obj
+			fi
+		done
+	fi
+
+	if [ $BUILD_PPC != false ]; then
+		case `ResInfo -n "$INTERFACELIB" || echo 0` in
+			0)
+				echo "WARNING: Couldn't read resource fork for \"$INTERFACELIB\"."
+				echo "         Falling back to included import libraries."
+				echo "Copying readymade PowerPC import libraries..."
+				cp $SRC/ImportLibraries/*.a $PREFIX/powerpc-apple-macos/lib/
+				;;
+			*)
+				echo "Building PowerPC import libraries..."
+				for shlib in "${SHAREDLIBRARIES}/"*; do
+					libname=`basename "$shlib"`
+					implib=lib${libname}.a
+					printf "    %30s => %-30s\n" ${libname} ${implib}
+					MakeImport "$shlib" "$PREFIX/powerpc-apple-macos/lib/$implib"
+				done
+				;;
+		esac
+
+		if [ -d ${PPCLIBRARIES} ]; then
+			echo "Copying static PPC libraries"
+			for obj in ${PPCLIBRARIES}/OpenT*.o ${PPCLIBRARIES}/CarbonAccessors.o ${PPCLIBRARIES}/CursorDevicesGlue.o; do
+				if [ -r $obj ]; then
+					# copy the library:
+					cp $obj $PREFIX/powerpc-apple-macos/lib/
+
+					# and wrap it in a .a archive for convenience
+					lib=$PREFIX/powerpc-apple-macos/lib/lib`basename "${obj%.o}"`.a
+					rm -f $lib
+					$PREFIX/bin/powerpc-apple-macos-ar cqs $lib $obj
+				fi
+			done
+		fi
+	fi
+}
+
+if [ "$0" = "$BASH_SOURCE" ]; then
+	# We are being run directly
+
+	if [ $# -lt 2 ]; then
+		echo "Usage: $0 /install/path /path/to/InterfacesAndLibraries"
+		exit 1
+	fi
+
+	PREFIX=$1
+	INTERFACES_DIR=$2
+	BUILD_68K=${3:-true}
+	BUILD_PPC=${4:-true}
+	BUILD_CARBON=${5:-true}
+	SRC=$(cd `dirname $0` && pwd -P)
+
+	locateAndCheckInterfacesAndLibraries
+	setUpInterfacesAndLibraries
+fi