new function for analyze crashs and other things

Author: Slushi-Github

README.md

@@ -7,14 +7,21 @@ Using this utility (Inspired by [HxCompileU](https://github.com/Slushi-Github/hx
 
 This is inspired by an attempt by the [RetroNX Team](https://github.com/retronx-team) to use Haxe on the Nintendo Switch. I used part of the [original project](https://github.com/retronx-team/switch-haxe) for this, so credit goes to them for achieving this in the first place!
 
-**This project is being tested with Haxe 4.3.7 and a Nintendo Switch V2 with firmware 20.4.0 (AMS 1.9.4).**
+**This project is being tested with Haxe 4.3.6 and a Nintendo Switch V2 with firmware 20.4.0 and Atmosphère 1.9.5.**
 
 Officially there are supported libraries to be used in conjunction with HaxeNXCompiler:
 
 - [hx_libnx](https://github.com/Slushi-Github/hx_libnx): Haxe/hxcpp @:native bindings for libnx, the Nintendo Switch's homebrew library.
 
 -----
 
+## Current problems:
+
+ - Apparently there is no full support for `sys.net.Socket`.
+ - Critical issue related to hxcpp and its garbage collector when the program ends, causing Atmosphère to crash sometimes.
+
+-----
+
 ## How?
 
 Well... Unlike the Wii U, where using hxcpp causes many problems, and to achieve that I had to use [Reflaxe/C++ (Amazing library!)](https://github.com/SomeRanDev/reflaxe.CPP) to be able to use Haxe on that console. With the Nintendo Switch, hxcpp compiles perfectly!
@@ -102,6 +109,14 @@ After that, you will get your executable ``HaxeNXCompiler`` in the "export" fold
 
 -----
 
+#### You can get errors from a log file using the following command:
+
+``{haxeNXCompilerProgram} --crashAnalyzer`` or ``{haxeNXCompilerProgram} --ca``
+
+**THIS IS TOO EXPERIMENTAL!**
+
+-----
+
 and that's it! if your compilation was successful on both Haxe and Nintendo Switch side, your ``.nro``, ``.ncap`` and ``.elf`` files will be in ``yourOutputFolder/switchFiles``.
 
 

src/JsonFile.hx

@@ -54,6 +54,7 @@ typedef JsonStruct = {
 	deleteTempFiles:Bool,
 	extraLibs:Array<String>,
 	projectDefines:Array<String>,
+	makeFileMaxJobs:Int,
 }
 
 /**
@@ -66,7 +67,10 @@ class JsonFile {
 	 */
 	public static function checkJson():Bool {
 		try {
-			if (FileSystem.exists(SlushiUtils.getPathFromCurrentTerminal() + "/haxeNXConfig.json")) {
+			if (!FileSystem.exists(SlushiUtils.getPathFromCurrentTerminal() + "/haxeNXConfig.json")) {
+				return false;
+			}
+			else if (FileSystem.exists(SlushiUtils.getPathFromCurrentTerminal() + "/haxeNXConfig.json")) {
 				var jsonFile:JsonStruct = JsonFile.getJson();
 				if (jsonFile == null) {
 					throw "JSON file is invalid, please check it";
@@ -89,28 +93,32 @@ class JsonFile {
 				var jsonContent:Dynamic = Json.parse(File.getContent(SlushiUtils.getPathFromCurrentTerminal() + "/haxeNXConfig.json"));
 
 				var jsonStructure:JsonStruct = {
-					programVersion: jsonContent.programVersion,
+					programVersion: jsonContent.programVersion ?? Main.version,
 					haxeConfig: {
-						sourceDir: jsonContent.haxeConfig.sourceDir,
-						hxMain: jsonContent.haxeConfig.hxMain,
-						cppOutDir: jsonContent.haxeConfig.cppOutDir,
-						debugMode: jsonContent.haxeConfig.debugMode ?? false,
-						othersOptions: jsonContent.haxeConfig.othersOptions,
-						errorReportingStyle: jsonContent.haxeConfig.errorReportingStyle ?? "pretty",
+						sourceDir: jsonContent.haxeConfig?.sourceDir,
+						hxMain: jsonContent.haxeConfig?.hxMain ?? "Main",
+						cppOutDir: jsonContent.haxeConfig?.cppOutDir ?? "build",
+						debugMode: jsonContent.haxeConfig?.debugMode ?? false,
+						othersOptions: jsonContent.haxeConfig?.othersOptions ?? new Array<String>(),
+						errorReportingStyle: jsonContent.haxeConfig?.errorReportingStyle ?? "pretty",
 					},
 					switchConfig: {
-						projectName: jsonContent.switchConfig.projectName ?? "Project",
-						consoleIP: jsonContent.switchConfig.consoleIP ?? "0.0.0.0",
-						appVersion: jsonContent.switchConfig.appVersion ?? "1.0.0",
-						appTitle: jsonContent.switchConfig.appTitle ?? "Project",
-						appAuthor: jsonContent.switchConfig.appAuthor ?? "None",
+						projectName: jsonContent.switchConfig?.projectName ?? "Project",
+						consoleIP: jsonContent.switchConfig?.consoleIP ?? "0.0.0.0",
+						appVersion: jsonContent.switchConfig?.appVersion ?? "1.0.0",
+						appTitle: jsonContent.switchConfig?.appTitle ?? "Project",
+						appAuthor: jsonContent.switchConfig?.appAuthor ?? "None",
 					},
 					deleteTempFiles: jsonContent.deleteTempFiles ?? false,
-					extraLibs: jsonContent.extraLibs,
-					projectDefines: jsonContent.projectDefines,
+					extraLibs: jsonContent.extraLibs ?? new Array<String>(),
+					projectDefines: jsonContent.projectDefines ?? new Array<String>(),
+					makeFileMaxJobs: jsonContent.makeFileMaxJobs ?? 2,
 				};
 				return jsonStructure;
 			}
+			else {
+				SlushiUtils.printMsg("[haxeNXConfig.json] not found!", ERROR);
+			}
 		} catch (e) {
 			throw "Error loading [haxeNXConfig.json]: " + e;
 		}
@@ -148,6 +156,7 @@ class JsonFile {
 			deleteTempFiles: true,
 			extraLibs: [],
 			projectDefines: [],
+			makeFileMaxJobs: 2,
 		};
 
 		try {
@@ -173,7 +182,7 @@ class JsonFile {
 		var defines:String = "";
 
 		defines += "-D HAXENXCOMPILER_VERSION=\\\"" + Main.version + "\\\" ";
-		defines += "-D HAXENXCOMPILER_JSON_SWITCH_PROJECTNAME=\\\"" + jsonFile.switchConfig.projectName + "\\\" ";
+		defines += "-D HAXENXCOMPILER_JSON_SWITCH_PROJECTNAME=\\\"" + jsonFile.switchConfig?.projectName + "\\\" ";
 
 		var dateNow:Date = Date.now();
 		var dateString = dateNow.getHours() + ":" + StringTools.lpad(dateNow.getMinutes() + "", "0", 2) + ":"

src/Main.hx

@@ -6,6 +6,7 @@
 
 package src;
 
+import src.utils.CrashAnalyzer;
 import haxe.CallStack;
 
 import src.SlushiUtils;
@@ -23,8 +24,8 @@ import src.utils.DevKitProUtils;
  * Author: Slushi
  */
 class Main {
-	public static var haxenxcompilerString = "\x1b[38;5;214mHaxe\033[0m\x1b[38;5;81mN\x1b[38;5;1mX\033[0mCompiler (Based on \x1b[38;5;214mHx\033[0mCompile\x1b[38;5;74mU\033[0m)";
-	public static final version:String = "2.0.0";
+	public static final haxenxcompilerString = "\x1b[38;5;214mHaxe\033[0m\x1b[38;5;81mN\x1b[38;5;1mX\033[0mCompiler (Based on \x1b[38;5;214mHx\033[0mCompile\x1b[38;5;74mU\033[0m)";
+	public static final version:String = "2.1.0";
 	static var stdin = Sys.stdin();
 	static var stdout = Sys.stdout();
 	static var args = Sys.args();
@@ -40,23 +41,26 @@ class Main {
 				SlushiUtils.printMsg('$haxenxcompilerString v$version -- Created by \033[96mSlushi\033[0m', NONE);
 			}
 
-			if (JsonFile.checkJson() == false) {
-				return;
+			if (args[0] != "--import" && args[0] != "--i" && args[0] != "--prepare" && args[0] != "--p") {
+				// if (!JsonFile.checkJson())
+					return;
 			}
 
 			switch (args[0]) {
 				case "--prepare" | "--p":
-					JsonFile.createJson();
+					SlushiUtils.prepareProject(false, "");
 				case "--import" | "--i":
-					JsonFile.importJSON(args[1]);
+					SlushiUtils.prepareProject(true, args[1]);
 				case "--compile" | "--c":
 					MainCompiler.start(args[1], args[2]);
 				case "--searchProblem" | "--sp":
 					DevKitProUtils.searchProblem(args[1]);
+				case "--crashAnalyzer" | "--ca":
+					CrashAnalyzer.initWithFile();
 				case "--send" | "--s":
 					DevKitProUtils.send(args[1]);
 				case "--help" | "--h":
-					SlushiUtils.printMsg("Usage: HaxeNXCompiler [command]\nCommands:\n\t--prepare, --p: Creates a new haxeNXConfig.json in the current directory.\n\t--import, --i \033[3mHAXE_LIB\033[0m: Imports a JSON file from a Haxe lib to the current directory \n\t--compile, --c: Compiles the project. \n\t\tAdd \"--debug\" to enable Haxe debug mode \n\t--searchProblem, --sp \033[3mLINE_ADDRESS\033[0m: search for a line of code in the [.elf] file from a line address of some log using devkitA64's aarch64-none-elf-addr2line program \n\t--send, --s: Sends the .nro file to the Nintendo Switch using DevKitPro's nxlink program \n\t\tAdd \"--server\" or \"--s\" to start the a cosnole server via nxlink\n\t--version, --v: Shows the version of the compiler\n\t--help, --h: Shows this message",
+					SlushiUtils.printMsg("Usage: HaxeNXCompiler [command]\nCommands:\n\t--prepare, --p: Creates a new haxeNXConfig.json in the current directory.\n\t--import, --i \033[3mHAXE_LIB\033[0m: Imports a JSON file from a Haxe lib to the current directory \n\t--compile, --c: Compiles the project. \n\t\tAdd \"--debug\" to enable Haxe debug mode \n\t--searchProblem, --sp \033[3mLINE_ADDRESS\033[0m: search for a line of code in the [.elf] file from a line address of some log using devkitA64's aarch64-none-elf-addr2line program \n\t--send, --s: Sends the .nro file to the Nintendo Switch using DevKitPro's nxlink program \n\t\tAdd \"--server\" or \"--s\" to start the a cosnole server via DevKitPro's nxlink program\n\t--version, --v: Shows the version of the compiler\n\t--help, --h: Shows this message",
 						NONE);
 				default:
 					SlushiUtils.printMsg("Invalid argument: [" + args.join(" ") + "], use \033[3m--help\033[0m argument for more information", NONE);

src/SlushiUtils.hx

@@ -125,4 +125,38 @@ class SlushiUtils {
 			}
 		}
 	}
+
+
+	/**
+	 * Prepares the new project, first it checks if the user has installed DevKitPro and DevKitA64
+	 * @param imported 
+	 * @param lib 
+	 */
+	public static function prepareProject(imported:Bool, ?lib:String):Void {
+		var fail:Bool = false;
+		var devkitproEnv = Sys.getEnv("DEVKITPRO");
+
+		SlushiUtils.printMsg("Preparing project...", PROCESSING);
+
+		if (devkitproEnv == null || !FileSystem.exists(devkitproEnv)) {
+			SlushiUtils.printMsg("DEVKITPRO environment variable not found", ERROR);
+			fail = true;
+		}
+		else if ((devkitproEnv == null || !FileSystem.exists(devkitproEnv + "/devkitA64")) && !fail) {
+			SlushiUtils.printMsg("DevkitA64 not found", ERROR);
+			fail = true;
+		}
+
+		if (fail) {
+			SlushiUtils.printMsg("Failed to prepare project. Can't find DevKitPro or DevKitA64, please install them (Or add them to your PATH) and try again:\n\thttps://devkitpro.org/wiki/devkitPro_pacman", NONE);
+			return;
+		}
+
+		if (imported) {
+			JsonFile.importJSON(lib);
+		}
+		else {
+			JsonFile.createJson();
+		}
+	}
 }

src/compilers/HaxeCompiler.hx

@@ -89,6 +89,7 @@ class HaxeCompiler {
 	-D HAXENXCOMPILER_VERSION="${Main.version}"
 	-D HAXENXCOMPILER_JSON_SWITCH_PROJECTNAME="${jsonFile.switchConfig.projectName}"
 	${finalHxDefines().main}
+	${finalHxDefines().hxlibs}
 	# Extra options
 	${finalOtherOptions()}
 	${finalHxDefines().hxDef}
@@ -166,8 +167,8 @@ class HaxeCompiler {
 		return libs;
 	}
 
-	static function finalHxDefines():{main:String, hxDef:String} {
-		var defines = {main: "", hxDef: ""};
+	static function finalHxDefines():{main:String, hxDef:String, hxlibs:String} {
+		var defines = {main: "", hxDef: "", hxlibs: ""};
 
 		for (define in Defines.parseHXDefines().main) {
 			defines.main += define + "\n\t";
@@ -177,6 +178,10 @@ class HaxeCompiler {
 			defines.hxDef += define + "\n\t";
 		}
 
+		for (define in Defines.parseHXDefines().hxlibs) {
+			defines.hxlibs += define + "\n\t";
+		}
+
 		return defines;
 	}
 

src/compilers/MainCompiler.hx

@@ -30,6 +30,12 @@ class MainCompiler {
 	 * Starts the compilation of the project.
 	 */
 	public static function start(arg2:String, arg3:String):Void {
+
+		if (!FileSystem.exists(SlushiUtils.getPathFromCurrentTerminal() + "/haxeNXConfig.json")) {
+			SlushiUtils.printMsg("Can't find [haxeNXConfig.json]", ERROR);
+			return;
+		}
+
 		var jsonVersion:String = JsonFile.getJson().programVersion;
 		var forced:Bool = jsonVersion.endsWith(":forced");
 		var versionStr = forced ? jsonVersion.split(":")[0] : jsonVersion;

src/compilers/NXLinker.hx

@@ -20,14 +20,21 @@ using StringTools;
 
 /**
  * The NXLinker class is used to link the project to Nintendo Switch
- * using [DevKitPro](https://devkitpro.org) MakeFile.
+ * using [DevKitPro](https://devkitpro.org) MakeFile as a placeholder
  * 
  * Author: Slushi.
  */
 class NXLinker {
 	static var jsonFile:JsonStruct = JsonFile.getJson();
 	static var exitCodeNum:Int = 0;
 
+	/**
+	 * The maximum number of jobs that can be executed in parallel
+	 * 
+	 * For now it's hardcoded to 2
+	 */
+	static var maxJobs:Int = 2;
+
 	public static function init() {
 		if (HaxeCompiler.getExitCode() != 0) {
 			return;
@@ -38,13 +45,33 @@ class NXLinker {
 			return;
 		}
 
+		if (jsonFile.switchConfig == null) {
+			SlushiUtils.printMsg("Error loading [haxeNXConfig.json -> switchConfig]", ERROR);
+			return;
+		}
+
+		if (jsonFile.haxeConfig == null) {
+			SlushiUtils.printMsg("Error loading [haxeNXConfig.json -> haxeConfig]", ERROR);
+			return;
+		}
+
+		if (jsonFile.haxeConfig?.cppOutDir == null) {
+			SlushiUtils.printMsg("Error loading [haxeNXConfig.json -> haxeConfig.cppOutDir]", ERROR);
+			return;
+		}
+
 		// Check if all required fields are set
-		if (jsonFile.switchConfig.projectName == "") {
+		if (jsonFile.switchConfig?.projectName == "") {
 			SlushiUtils.printMsg("projectName in [haxeNXConfig.json -> switchConfig.projectName] is empty", ERROR);
 			exitCodeNum = 3;
 			return;
 		}
 
+		maxJobs = jsonFile.makeFileMaxJobs ?? 2;
+		if (maxJobs <= 0) {
+			maxJobs = 2;
+		}
+
 		SlushiUtils.printMsg("Trying to compile to a \x1b[38;5;1mNintendo Switch\033[0m project -> \x1b[38;5;110m[" + jsonFile.switchConfig.projectName + "]\033[0m...", PROCESSING);
 
 		SlushiUtils.printMsg("Creating Makefile...", PROCESSING);
@@ -122,10 +149,10 @@ class NXLinker {
 			return;
 		}
 
-		SlushiUtils.printMsg("Compiling to ARM64/\x1b[38;5;1mNintendo Switch\033[0m...\n------------------", PROCESSING);
+		SlushiUtils.printMsg("Compiling to ARM64/\x1b[38;5;1mNintendo Switch\033[0m using " + maxJobs + " threads...\n------------------", PROCESSING);
 
 		var startTime:Float = Sys.time();
-		var compileProcess = Sys.command("make");
+		var compileProcess = Sys.command("make" + " -j" + maxJobs);
 
 		if (compileProcess != 0) {
 			SlushiUtils.printMsg("\x1b[38;5;1m------------------\033[0m", NONE);