Scripting Fixes

Author: MathewBensonCode

CMakePresets.json

@@ -7,7 +7,7 @@
     },
     "configurePresets":[
         {
-            "name": "Debug_Windows",
+            "name": "Windows_Debug",
             "displayName": "Windows Visual Studio Debug",
             "generator": "Visual Studio 2022",
             "binaryDir": "${sourceDir}/../builds/RendererEngine",
@@ -59,72 +59,66 @@
             }
         },
         {
-            "name": "Release_Windows",
+            "name": "Windows_Release",
             "displayName": "Windows Visual Studio Release",
-            "inherits": "Debug_Windows",
+            "inherits": "Windows_Debug",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Release"
             }
         },
 
-        # Mac Os
         {
-            "name": "Debug_MacOS",
-            "inherits": "Debug_Windows",
+            "name": "MacOS_Debug",
+            "inherits": "Windows_Debug",
             "displayName": "MacOS XCode Debug",
-            "generator": "Xcode",
+            "generator": "Xcode"
         },
         {
-            "name": "Release_MacOS",
-            "inherits": "Release_Windows",
+            "name": "MacOS_Release",
+            "inherits": "Windows_Release",
             "displayName": "MacOS XCode Release",
             "generator": "Xcode"
         },
 
-        # Linux
         {
-            "name": "Debug_Linux",
-            "inherits": "Debug_Windows",
+            "name": "Linux_Debug",
+            "inherits": "Windows_Debug",
             "displayName": "Linux Ninja Debug",
-            "generator": "Xcode",
+            "generator": "Ninja"
         },
         {
-            "name": "Release_Linux",
-            "inherits": "Release_Windows",
+            "name": "Linux_Release",
+            "inherits": "Windows_Release",
             "displayName": "Linux Ninja Release",
-            "generator": "Xcode"
-        },
-
-
+            "generator": "Ninja"
+        }
     ],
+
     "buildPresets": [
-        # Windows Builds
         {
-            "name": "Windows_Debug_Build",
+            "name": "Windows_Debug",
             "configurePreset": "Windows_Debug"
         },
         {
-            "name": "Windows_Release_Build",
+            "name": "Windows_Release",
             "configurePreset": "Windows_Release"
         },
 
-        # MacOS Builds
         {
-            "name": "MacOS_Debug_Build",
+            "name": "MacOS_Debug",
             "configurePreset": "MacOS_Debug"
         },
         {
-            "name": "MacOS_Release_Build",
+            "name": "MacOS_Release",
             "configurePreset": "MacOS_Release"
         },
 
-        # Linux Builds
         {
-            "name": "Linux_Debug_Build",
+            "name": "Linux_Debug",
             "configurePreset": "Linux_Debug"
         },
         {
-            "name": "Linux_Release_Build",
+            "name": "Linux_Release",
             "configurePreset": "Linux_Release"
         }
     ]

Scripts/BuildEngine.ps1

@@ -102,22 +102,21 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
         if($IsMacOS) {
             $cMakePreset = "MacOS_$configuration"
         }
-    }
 
     $cMakeArguments = "--preset $cmakePreset"
 
     # CMake Generation process
-    Write-Host "Creating Build for Preset $cMakeArguments"
+    Write-Host "Creating Build for Preset $cMakePreset"
     $cMakeProcess = Start-Process $cMakeProgram -ArgumentList $cMakeArguments -NoNewWindow -Wait -PassThru
     if ($cMakeProcess.ExitCode -ne 0 ) {
-        throw "cmake failed generation for '$cMakeArguments' with exit code '$cMakeProcess.ExitCode'"
+        throw "cmake failed generation for '$cMakePreset' with exit code '$cMakeProcess.ExitCode'"
     }
 
     # CMake Build Process
     #
     if ($runBuild) {
 
-        $buildArguments = "--build --preset $cmakePreset_Build"
+        $buildArguments = "--build --preset $cmakePreset"
 
         $buildProcess = Start-Process $cMakeProgram -ArgumentList $buildArguments -NoNewWindow -PassThru
 
@@ -127,7 +126,7 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
         $processHandle = $buildProcess.Handle
         $buildProcess.WaitForExit();
         if ($buildProcess.ExitCode -ne 0) {
-            throw "cmake failed build for '$buildArguments' with exit code '$buildProcess.ExitCode'"
+            throw "cmake failed build for '$cmakePreset' with exit code '$buildProcess.ExitCode'"
         }
     }
 }