From 46a1d5f1c6b73ae4015a2742c1b1e0727f08772a Mon Sep 17 00:00:00 2001
From: Scott Duensing <scott@kangaroopunch.com>
Date: Tue, 27 Sep 2022 16:13:52 -0500
Subject: [PATCH] Will now install from Xcode XIP if the SDK tarball is not
 available.

---
 scripts/buildVm.sh | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/scripts/buildVm.sh b/scripts/buildVm.sh
index ffdfba3..c0abd40 100755
--- a/scripts/buildVm.sh
+++ b/scripts/buildVm.sh
@@ -254,14 +254,21 @@ function buildJoeyLib() {
 
 function buildMacOSSDK() {
 	local SDK=$1
-	local PLATFORM=$2   
+	local XCODE=$2
+	local PLATFORM=$3
 
 	if [[ ! -d osxcross ]]; then
 		git clone https://skunkworks.kangaroopunch.com/mirrors/osxcross.git
 	fi
 	
 	pushd osxcross
-		cp -f ../"${SDK}" tarballs/.
+		# Do we have an existing SDK tarball?
+		if [[ ! -f "../${SDK}" ]]; then
+			# Nope.  Build tarball and keep for later.
+			./tools/gen_sdk_package_pbzx.sh "../${XCODE}"
+			mv -f MacOSX* ../.
+		fi
+		cp -f "../${SDK}" tarballs/.
 		UNATTENDED=1 ./build.sh
 		sudo ENABLE_COMPILER_RT_INSTALL=1 ./build_compiler_rt.sh
 		mkdir -p ../cross/${PLATFORM}
@@ -528,8 +535,8 @@ function doInstall() {
 	configureSFTP
 
 	buildIIgsSDK "Golden Gate.msi" "Opus ][ The Software.iso" id_rsa id_rsa.pub "${GGUSER}" "${GGPASS}"
-	buildMacOSSDK MacOSX10.13.sdk.tar.xz macos-intel
-	buildMacOSSDK MacOSX11.3.sdk.tar.xz macos-apple
+	buildMacOSSDK MacOSX10.13.sdk.tar.xz Xcode_9.4.1.xip macos-intel
+	buildMacOSSDK MacOSX11.3.sdk.tar.xz Xcode_12.5.1.xip macos-apple
 
 	setCompiler linux i386
 	buildSDL2 ${SDL2_NEW}
@@ -552,7 +559,9 @@ function doInstall() {
 	setCompiler windows x86_64
 	buildSDL2 ${SDL2_NEW}
 
-	rebuildJoeyLib	
+	rebuildJoeyLib
+	
+	#***TODO*** Install and start the build service.
 }