Update: Improved iOS support, now installing automatically and running the app

Author: MrcSnm

tools/hbuild/dub.json

@@ -5,7 +5,7 @@
 	"copyright": "Copyright © 2023, Hipreme",
 	"dependencies": {
 		"arsd-official:terminal": "~>11.5.0",
-		"redub": "~>1.24.5",
+		"redub": "~>1.24.7",
 		"handy-httpd": "~>8.4.3",
 		"archive": "~>0.7.1",
 		"my-ip": "~>0.2.0",

tools/hbuild/source/common_macos.d

@@ -13,6 +13,7 @@ void setupPerCompiler(ref Terminal t, string compiler, string arch, out string e
 		{
 			string outputDruntime = getHipPath("build", "appleos", XCodeDFolder, "static", "libdruntime-ldc.a");
 			string ldcLibPath = buildNormalizedPath(configs["ldcPath"].str, "lib-"~arch);
+			
 			string druntimeLib = ldcLibPath.getFirstExisting("libdruntime-ldc.a");
 			if(druntimeLib == null) 
 				throw new Error("DRuntime Library not found on path "~configs["ldcPath"].str);
@@ -25,6 +26,7 @@ void setupPerCompiler(ref Terminal t, string compiler, string arch, out string e
 			string outputPhobos = getHipPath("build", "appleos", XCodeDFolder,"static");
 			std.file.mkdirRecurse(outputPhobos);
 			outputPhobos = buildNormalizedPath(outputPhobos, "libphobos2.a");
+
 			t.writelnSuccess("Copying phobos to XCode ", phobosLib, "->", outputPhobos);
 			t.flush;
 			std.file.copy(phobosLib, outputPhobos);

tools/hbuild/source/targets/ios.d

@@ -22,7 +22,7 @@ string getTargetArchitecture(bool isSimulator)
 string getExtraCommand(string type)
 {
 	if(type == "simulator") return " -sdk iphonesimulator ";
-	return "";
+	return " -sdk iphoneos";
 }
 
 
@@ -100,6 +100,7 @@ unittest
 
 private string getDestination()
 {
+	// return "-destination 'generic/platform=iOS' ";
 	return "-destination 'platform=iOS Simulator,name="~
 	configs["iosDevice"].str ~
 	",OS=" ~configs["iosVersions"].array[0].integer.versionFromInt ~ "' ";
@@ -113,7 +114,21 @@ private string getIosTriple(string arch, bool isSimulator)
 			return "arm64-apple-ios14.0-simulator";
 	}
 	return arch~"-apple-ios14.0";
-	
+}
+
+string getIosLibFolder(bool isSimulator)
+{
+	version(X86_64)
+	{
+		if(isSimulator)
+			return "ios-x86_64";
+	}
+	else
+	{
+		if(isSimulator)
+			return "ios-arm64-simulator";
+	}
+	return "ios-arm64";
 }
 ChoiceResult putInstalledDeviceInformation(ref Terminal t)
 {
@@ -163,17 +178,16 @@ ChoiceResult putInstalledDeviceInformation(ref Terminal t)
 	updateConfigFile();
 
 	return ChoiceResult.Continue;
-
-	
 }
 
 ChoiceResult prepareiOS(Choice* c, ref Terminal t, ref RealTimeConsoleInput input, in CompilationOptions cOpts)
 {
-	string arch = getTargetArchitecture(TARGET_TYPE == "simulator");
+	bool isSimulator = TARGET_TYPE == "simulator";
+	string arch = getTargetArchitecture(isSimulator);
 	prepareAppleOSBase(c,t,input);
 
 	string out_extraLinkerFlags;
-	setupPerCompiler(t, "ldc2", "ios-"~arch, out_extraLinkerFlags);
+	setupPerCompiler(t, "ldc2", getIosLibFolder(isSimulator), out_extraLinkerFlags);
 	injectLinkerFlagsOnXcode(t, input, out_extraLinkerFlags);
 	if(!("lastUser" in configs))
 	{
@@ -197,7 +211,7 @@ ChoiceResult prepareiOS(Choice* c, ref Terminal t, ref RealTimeConsoleInput inpu
 		cleanAppleOSLibFolder();
 		ProjectDetails d;
 		if(waitRedub(t, DubArguments().
-			command("build").configuration("ios").arch(getIosTriple(arch, TARGET_TYPE == "simulator")).compiler("ldc2").opts(cOpts),
+			command("build").configuration("ios").arch(getIosTriple(arch, isSimulator)).compiler("ldc2").opts(cOpts),
 			d,
 			getHipPath("build", "appleos", XCodeDFolder, "libs")) != 0)
 		{
@@ -213,15 +227,20 @@ ChoiceResult prepareiOS(Choice* c, ref Terminal t, ref RealTimeConsoleInput inpu
 				clean ~
 				"build CONFIGURATION_BUILD_DIR=\"bin\" "~ 
 				codeSignCommand ~ extraCommands ~
-				getDestination() ~
-				" && cd bin && HipremeEngine.app/Contents/iOS/HipremeEngine")
-			);
+				getDestination()
+			));
+
+			t.wait(spawnShell(
+				"open -a Simulator && "~
+				"xcrun simctl install booted " ~ getHipPath("build", "appleos", "bin", "HipremeEngine.app") ~ " && " ~
+				"xcrun simctl launch booted hipreme.HipremeEngine"
+			));
 		}
 	}
 	if(configs["firstiOSRun"].boolean)
 	{
 		configs["firstiOSRun"] = false;
 		updateConfigFile();
 	}
-	return ChoiceResult.Continue;
+	return ChoiceResult.None;
 }