Updating post build for macOS Intel / Silicon architecture (#369)

* updated post build for macos arch

* updated macos pipeline builds

* fixed script type

* fixed typo again

Author: JeanPhilippeKernel

.github/workflows/macOS-build.yml

@@ -7,13 +7,27 @@ on:
     branches: [ master, develop ]
 
 jobs:
-  macOS-Build:
+  macOS-Intel-Build:
     runs-on: macos-13
     strategy:
       matrix:
           buildConfiguration: [Debug, Release]
 
-    steps:      
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: CMake Build
+      run: .\Scripts\BuildEngine.ps1 -Configurations ${{matrix.buildConfiguration}}
+      shell: pwsh
+
+  macOS-Silicon-Build:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+          buildConfiguration: [Debug, Release]
+
+    steps:
     - name: Checkout repository
       uses: actions/checkout@v2
 

CMakeLists.txt

@@ -111,15 +111,24 @@ add_custom_target (AssembleContent ALL
 	DEPENDS BuildLauncher
 )
 
+
+set (SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
+if ((${CMAKE_SYSTEM_NAME} STREQUAL "Windows") OR (${CMAKE_SYSTEM_NAME} STREQUAL "Linux"))
+	set (SYSTEM_ARCHITECTURE "x64")
+elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+	if (MACOSX_ARCHITECTURE_ARM64)
+		set (SYSTEM_ARCHITECTURE "osx-arm64")
+	else ()
+		set (SYSTEM_ARCHITECTURE "osx-x64")
+	endif ()
+endif ()
 add_custom_command (TARGET AssembleContent
 	POST_BUILD
-	COMMAND pwsh ${CMAKE_CURRENT_SOURCE_DIR}/Scripts/PostBuild.ps1 -Configurations $<IF:$<CONFIG:Debug>,Debug,Release> $<$<BOOL:${LAUNCHER_ONLY}>:-LauncherOnly>
+	COMMAND pwsh ${CMAKE_CURRENT_SOURCE_DIR}/Scripts/PostBuild.ps1 -SystemName ${SYSTEM_NAME} -Architectures ${SYSTEM_ARCHITECTURE} -Configurations $<IF:$<CONFIG:Debug>,Debug,Release> $<$<BOOL:${LAUNCHER_ONLY}>:-LauncherOnly>
 )
 
 # Copying Examples dir
 #
 if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Examples/projectConfig.json)
 	file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/Examples/projectConfig.json DESTINATION ${CMAKE_BINARY_DIR}/Examples)
 endif ()
-
-

Scripts/PostBuild.ps1

@@ -23,6 +23,14 @@
 #Requires -PSEdition Core
 
 param (
+    [Parameter(HelpMessage="SystemName type to build, default to Windows")]
+    [ValidateSet('Windows', 'Darwin', 'Linux')]
+    [string[]] $SystemName = 'Windows',
+
+    [Parameter(HelpMessage="Architecture type to build, default to x64")]
+    [ValidateSet('x64', 'arm64', 'osx-x64', 'osx-arm64')]
+    [string[]] $Architectures = 'x64',
+
     [Parameter(HelpMessage="Configuration type to build, default to Debug")]
     [ValidateSet('Debug', 'Release')]
     [string[]] $Configurations = 'Debug',
@@ -33,23 +41,10 @@ param (
 
 $ErrorActionPreference = "Stop"
 
-# Check the system name
-if ($IsLinux) {
-    $SystemName =  "Linux"
-}
-elseif ($IsMacOS) {
-    $SystemName =   "Darwin"
-}
-elseif ($IsWindows) {
-    $SystemName =  "Windows"
-}else{
-    throw 'The OS is not supported' 
-}
-
 [string]$RepoRoot = [IO.Path]::Combine($PSScriptRoot, "..")
-[string]$OuputBuildDirectory = If($IsWindows) { 
-    [IO.Path]::Combine($RepoRoot, "Result.Windows.x64.MultiConfig") 
-}  Else { 
+[string]$OuputBuildDirectory = If($IsWindows) {
+    [IO.Path]::Combine($RepoRoot, "Result.Windows.x64.MultiConfig")
+}  Else {
     [IO.Path]::Combine($RepoRoot, "Result.$SystemName.x64.$Configurations")
 }
 
@@ -63,26 +58,53 @@ $ContentsToProcess = @(
         Name = "Resources"
         IsDirectory = $true
         Contents = @(
-        
-            if ($IsWindows) {
-                @{ From = "$RepoRoot\Resources\Shaders";            To = "$OuputBuildDirectory\Tetragrama\src\$Configurations\Shaders"}
-                @{ From = "$RepoRoot\Resources\Editor\Settings";    To = "$OuputBuildDirectory\Tetragrama\src\$Configurations\Settings"}
-            }
-            elseif ($IsMacOS) {
-                @{ From = "$RepoRoot\Resources\Shaders";            To = "$OuputBuildDirectory\Tetragrama\src\$Configurations\Shaders"}
-                @{ From = "$RepoRoot\Resources\Editor\Settings";    To = "$OuputBuildDirectory\Tetragrama\src\$Configurations\Settings"}
-            }
-            else {
-                @{ From = "$RepoRoot\Resources\Shaders";            To = "$OuputBuildDirectory\Tetragrama\src\Shaders"}
-                @{ From = "$RepoRoot\Resources\Editor\Settings";    To = "$OuputBuildDirectory\Tetragrama\src\Settings"}
+            switch ($SystemName) {
+                "Windows" {
+                    @{ From = "$RepoRoot\Resources\Shaders";            To = "$OuputBuildDirectory\Tetragrama\src\$Configurations\Shaders"}
+                    @{ From = "$RepoRoot\Resources\Editor\Settings";    To = "$OuputBuildDirectory\Tetragrama\src\$Configurations\Settings"}
+                }
+                "Darwin" {
+                    @{ From = "$RepoRoot\Resources\Shaders";            To = "$OuputBuildDirectory\Tetragrama\src\$Configurations\Shaders"}
+                    @{ From = "$RepoRoot\Resources\Editor\Settings";    To = "$OuputBuildDirectory\Tetragrama\src\$Configurations\Settings"}
+                }
+                "Linux" {
+                    @{ From = "$RepoRoot\Resources\Shaders";            To = "$OuputBuildDirectory\Tetragrama\src\Shaders"}
+                    @{ From = "$RepoRoot\Resources\Editor\Settings";    To = "$OuputBuildDirectory\Tetragrama\src\Settings"}
+                }
+                Default {
+                    throw 'This system is not supported'
+                }
             }
         )
     },
     @{
         Name = "Tetragrama"
         IsDirectory = $true
         Contents = @(
-            @{ From = "$OuputBuildDirectory\Tetragrama\src\$Configurations"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\Editor"}
+            switch ($SystemName) {
+                "Windows" {
+                    @{ From = "$OuputBuildDirectory\Tetragrama\src\$Configurations"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\Editor"}
+                }
+                "Darwin" {
+                    switch ($Architectures) {
+                        "osx-x64" {
+                            @{ From = "$OuputBuildDirectory\Tetragrama\src\$Configurations"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\$Architectures\Editor"}
+                        }
+                        "osx-arm64" {
+                            @{ From = "$OuputBuildDirectory\Tetragrama\src\$Configurations"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\$Architectures\Editor"}
+                        }
+                        Default {
+                            throw 'This architecture is not supported'
+                        }
+                    }
+                }
+                "Linux" {
+                    @{ From = "$OuputBuildDirectory\Tetragrama\src\$Configurations"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\Editor"}
+                }
+                Default {
+                    throw 'This system is not supported'
+                }
+            }
         )
     }
 )