Sync with C::B 25.03

Author: sizious

codeblocks/src/plugins/scriptedwizard/resources/dc/wizard.script

@@ -4,7 +4,7 @@
 //
 // Project: Sega Dreamcast Project (DreamSDK)
 // Author:  The DreamSDK Team (https://dreamsdk.org)
-// Last Update: 2025-08-16
+// Last Update: 2025-08-28
 //
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -224,16 +224,13 @@ function OnLeave_SettingsPage(fwd)
 function GetSoftwareDevelopmentKitHomeDir()
 {
 	local result = ReplaceMacros(_T("$(#DREAMSDK_HOME)"));
-	Trace(_T("GetSoftwareDevelopmentKitHomeDir = ") + result);
 	return result;
 }
 
 // -----------------------------------------------------------------------------
 // get the MSYS root base folder for DreamSDK
 function GetSoftwareDevelopmentKitMsysDir()
-{
-	Trace(_T("GetSoftwareDevelopmentKitMsysDir"));
-	
+{	
 	local result = _T("");
 	local buffer = _T("");	
 	local filePath = GetSoftwareDevelopmentKitHomeDir()
@@ -244,9 +241,7 @@ function GetSoftwareDevelopmentKitMsysDir()
 	// used by DreamSDK: MinGW/MSYS (1) or MinGW-w64/MSYS2 (2)
 	if (IO.FileExists(filePath))
 	{
-		buffer = IO.ReadFileContents(filePath);
-		Trace(_T("GetSoftwareDevelopmentKitMsysDir: Foundation = ") + buffer);
-		
+		buffer = IO.ReadFileContents(filePath);		
 		if (buffer.Find(_T("1")) != -1)
 		{
 			// MinGW/MSYS
@@ -268,8 +263,7 @@ function GetSoftwareDevelopmentKitMsysDir()
 		   "Sorry, your DreamSDK installation looks like broken.\n" +
 		   "Please reinstall or read the FAQ in the DreamSDK Help."));
 	}
-	
-	Trace(_T("GetSoftwareDevelopmentKitMsysDir = ") + result);	
+
 	return result;
 }
 
@@ -393,8 +387,12 @@ function InitializeWizard()
 
 	Trace(_T("InitializeWizard: ") + configFile);
 
+	Trace(_T("SoftwareDevelopmentKitHomeDir: " + GetSoftwareDevelopmentKitHomeDir()));
+	Trace(_T("SoftwareDevelopmentKitMsysDir: " + GetSoftwareDevelopmentKitMsysDir()));
+
 	// Handle DreamSDK IDE helper directory
 	FileSystemObjects.SoftwareDevelopmentKitHelperDir = GetSoftwareDevelopmentKitHelperDir();
+	Trace(_T("SoftwareDevelopmentKitHelperDir: " + FileSystemObjects.SoftwareDevelopmentKitHelperDir));
 	if (!IO.DirectoryExists(FileSystemObjects.SoftwareDevelopmentKitHelperDir))
 	{
 		return false;
@@ -419,11 +417,12 @@ function InitializeWizard()
 		return false;
 	}
 	FileSystemObjects.WizardLibraryInformationDir = exportPath;	
+	Trace(_T("WizardLibraryInformationDir: " + FileSystemObjects.WizardLibraryInformationDir));
 
 	// Static Files
 	FileSystemObjects.TemplateStaticFilesDir = FileSystemObjects.WizardBaseDir
 		+ _T("files") + wxFILE_SEP_PATH;
-
+	
 	// Dynamic Files
 	FileSystemObjects.TemplateDynamicFilesDir = FileSystemObjects.WizardBaseDir
 		+ _T("templates") + wxFILE_SEP_PATH;
@@ -473,26 +472,35 @@ function HandleLibraries(project)
 // add user library information to the project
 function HandleUserLibraries(project)
 {
+	Trace(_T("HandleUserLibraries"));
+
 	local separator = _T(":");
 
 	local buffer = ::wxArrayString();
 	local libraries = LibraryInformation.LibraryList;
 	local sortData = LibraryInformation.LibrarySortList;
 
 	// Add libraries name with weight (sort data)
+	Trace(_T("  Input dataset to sort:"));
 	for(local i = 0; i < libraries.GetCount(); i++)
 	{
 		local library = libraries.Item(i);
 		local sortIndex = sortData.Item(i);
-		buffer.Add(sortIndex + separator + library, 1);
+		local sortDataItem = sortIndex + separator + library;
+		Trace(_T("    " + sortDataItem));
+		buffer.Add(sortDataItem, 1);
 	}
-	buffer = JumpDownSort(buffer);
+	buffer = QuickSort(buffer);
 
 	// Everything is now sorted.
 	// Remove the weight information before adding the libs to the project.
+	Trace(_T("  Dataset sorted, adding libraries to project:"));
 	for(local i = 0; i < buffer.GetCount(); i++)
 	{
-		project.AddLinkLib(buffer.Item(i).AfterFirst(separator));
+		local library = buffer.Item(i);
+		Trace(_T("    " + library));
+		local library = library.AfterFirst(separator);
+		project.AddLinkLib(library);
 	}
 }
 
@@ -532,33 +540,40 @@ function GetFileLibraryInfo(isLangCPP, fileId)
 // generate user library information (includes/libs)
 function GenerateUserLibraryInformation()
 {
+	Trace(_T("GenerateUserLibraryInformation"));
+	
 	LibraryInformation.IncludeBufferText = _T("");
 	LibraryInformation.IncludeDirectoryList.Clear();
 	LibraryInformation.LibraryList.Clear();
 	LibraryInformation.LibrarySortList.Clear();
-
+	
 	for (local i = 0; i < ProjectSettings.SelectedLibraryList.GetCount(); i++)
 	{
 		local selectedLibraryName = ProjectSettings.SelectedLibraryList.Item(i);
 		local selectedLibraryIndex = GetReferentialIndex(selectedLibraryName);
+		
+		Trace(_T("  Handling: ") + selectedLibraryName);
 
-		// Handle includes
+		// Handle includes	
 		LibraryInformation.IncludeBufferText = LibraryInformation.IncludeBufferText + _T("\r\n// ") + selectedLibraryName + _T("\r\n");
 		local libraryInc = GetReferentialInclude(selectedLibraryIndex);
 		for(local j = 0; j < libraryInc.GetCount(); j++)
 		{
 			LibraryInformation.IncludeBufferText = LibraryInformation.IncludeBufferText + _T("#include ") + libraryInc.Item(j) + _T("\r\n");
-		}
+		}		
 
 		// Handle include directories
+		Trace(_T("    Includes Directories:"));
 		local includeDirectoryList = GetReferentialIncludeDirectory(selectedLibraryIndex);
 		for(local j = 0; j < includeDirectoryList.GetCount(); j++)
 		{
 			local includeDirectory = includeDirectoryList.Item(j);
 			LibraryInformation.IncludeDirectoryList.Add(includeDirectory, 1);
-		}
+			Trace(_T("      ") + includeDirectory);
+		}		
 
 		// Handle libraries
+		Trace(_T("    Libraries:"));
 		local libraryNameList = GetReferentialLibrary(selectedLibraryIndex);
 		local librarySortList = GetReferentialLibrarySortIndex(selectedLibraryIndex);
 		for(local j = 0; j < libraryNameList.GetCount(); j++)
@@ -567,6 +582,7 @@ function GenerateUserLibraryInformation()
 			local librarySortIndex = librarySortList.Item(j);
 			LibraryInformation.LibraryList.Add(libraryName, 1);
 			LibraryInformation.LibrarySortList.Add(librarySortIndex, 1);
+			Trace(_T("      ") + libraryName);
 		}
 	}
 }
@@ -749,19 +765,105 @@ function HandleDirective(buffer, directive, enabled)
 }
 
 // -----------------------------------------------------------------------------
-// sort an wxArrayString (or any array type) using the jump-down sort algorithm.
+// sort an wxArrayString (or any array type) using the jump-down sort algorithm
 function JumpDownSort(array)
 {
-	for(local i = array.GetCount() - 1; i > 0; i--)
-		for(local j = 0; j < i; j++)
-			if (array.Item(i) < array.Item(j))
-			{
-				local tmp = array.Item(i);
-				array.SetItem(i, array.Item(j));
-				array.SetItem(j, tmp);
-			}
+    local n = array.GetCount();
+    local tmp = [];
 
-	return array;
+    // extract all wxStrings as pure strings
+    for (local i = 0; i < n; i++)
+        tmp.append(array.Item(i).tostring());
+
+    // standard insertion sort (pure strings)
+    for (local i = 1; i < n; i++)
+    {
+        local key = tmp[i];
+        local j = i - 1;
+        while (j >= 0 && tmp[j] > key)
+        {
+            tmp[j + 1] = tmp[j];
+            j--;
+        }
+        tmp[j + 1] = key;
+    }
+
+    // clear original array and refill
+    array.Clear();
+    foreach (s in tmp)
+        array.Add(_T(s), 1);
+
+    return array;
+}
+
+// -----------------------------------------------------------------------------
+// sort an wxArrayString (or any array type) using the quick sort algorithm
+function QuickSort(array)
+{
+    local n = array.GetCount();
+    local tmp = [];
+
+    // Extract all wxStrings as pure strings
+    for (local i = 0; i < n; i++)
+        tmp.append(array.Item(i).tostring());
+
+    // Iterative QuickSort
+    function partition(lst, low, high)
+    {
+        local pivot = lst[(low + high) / 2];
+        local i = low;
+        local j = high;
+
+        while (i <= j)
+        {
+            while (lst[i] < pivot) i++;
+            while (lst[j] > pivot) j--;
+
+            if (i <= j)
+            {
+                local t = lst[i];
+                lst[i] = lst[j];
+                lst[j] = t;
+                i++;
+                j--;
+            }
+        }
+        return [i, j];
+    }
+
+    function quicksort_iter(lst)
+    {
+        local stack = [];
+        stack.append([0, lst.len() - 1]);
+
+        while (stack.len() > 0)
+        {
+            local range = stack.pop();
+            local low = range[0];
+            local high = range[1];
+
+            if (low < high)
+            {
+                local res = partition(lst, low, high);
+                local i = res[0];
+                local j = res[1];
+
+                // Push sub-ranges onto stack
+                if (low < j) stack.append([low, j]);
+                if (i < high) stack.append([i, high]);
+            }
+        }
+    }
+
+    // Perform QuickSort on tmp
+    quicksort_iter(tmp);
+
+    // Clear original array and refill
+    array.Clear();
+    foreach (s in tmp)
+        array.Add(_T(s), 1);   // wxWidgets conversion
+
+    return array;
 }
 
 // -----------------------------------------------------------------------------