deps.windows: Add arm64 slice to dependency build scripts for Windows

obsproject · Jan 11, 2024 · 7832f58 · 7832f58
1 parent 772c2e0
commit 7832f58
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 14 deletions.
diff --git a/deps.windows/40-detours.ps1 b/deps.windows/40-detours.ps1
@@ -2,26 +2,30 @@ param(
     [string] $Name = 'detours',
     [string] $Version = '4.0.1',
     [string] $Uri = 'https://github.com/microsoft/detours.git',
-    [string] $Hash = 'e4bfd6b03e50de46b47abfbd1e46b384f0c5f833'
+    [hashtable] $Hashes = @{
+        x86 = 'e4bfd6b03e50de46b47abfbd1e46b384f0c5f833'
+        x64 = 'e4bfd6b03e50de46b47abfbd1e46b384f0c5f833'
+        arm64 = '734ac64899c44933151c1335f6ef54a590219221'
+    }
 )
 
 function Setup {
-    Setup-Dependency -Uri $Uri -Hash $Hash -DestinationPath $Path
+    Setup-Dependency -Uri $Uri -Hash $Hash -DestinationPath $Path -Branch main
 }
 
 function Clean {
     Set-Location $Path
 
     $Items = @(
-        @{ErrorAction = "SilentlyContinue"; Path = "lib.${Target}"}
-        @{ErrorAction = "SilentlyContinue"; Path = "bin.${Target}"}
-        @{ErrorAction = "SilentlyContinue"; Path = "src/obj..${Target}"}
+        @{ErrorAction = "SilentlyContinue"; Path = "lib.$($Target.ToUpper())"}
+        @{ErrorAction = "SilentlyContinue"; Path = "bin.$($Target.ToUpper())"}
+        @{ErrorAction = "SilentlyContinue"; Path = "src/obj.$($Target.ToUpper())"}
     )
 
     $Items | ForEach-Object {
         $Item = $_
         Log-Information "Clean $($Item.Path) (${Target})"
-        Get-ChildItem @Item | Remove-Item
+        Get-ChildItem @Item | Remove-Item -Recurse
     }
 }
 

diff --git a/deps.windows/40-luajit.ps1 b/deps.windows/40-luajit.ps1
@@ -2,11 +2,15 @@ param(
     [string] $Name = 'luajit',
     [string] $Version = '2.1',
     [string] $Uri = 'https://github.com/luajit/luajit.git',
-    [string] $Hash = '8635cbabf3094c4d8bd00578c7d812bea87bb2d3'
+    [hashtable] $Hashes = @{
+        x64 = '8635cbabf3094c4d8bd00578c7d812bea87bb2d3'
+        x86 = '8635cbabf3094c4d8bd00578c7d812bea87bb2d3'
+        arm64 = '43d0a19158ceabaa51b0462c1ebc97612b420a2e'
+    }
 )
 
 function Setup {
-    Setup-Dependency -Uri $Uri -Hash $Hash -DestinationPath $Path
+    Setup-Dependency -Uri $Uri -Branch v2.1 -Hash $Hash -DestinationPath $Path
 }
 
 function Build {
@@ -18,6 +22,7 @@ function Build {
         BuildPath = "src"
         BuildCommand = "cmd.exe /c 'msvcbuild.bat amalg'"
         Target = $Target
+        HostArchitecture = $Target
     }
 
     Invoke-DevShell @Params

diff --git a/deps.windows/60-carla.ps1 b/deps.windows/60-carla.ps1
@@ -2,7 +2,8 @@ param(
     [string] $Name = 'carla',
     [string] $Version = '2.6.0-alpha1',
     [string] $Uri = 'https://github.com/falkTX/Carla.git',
-    [string] $Hash = 'cb7f1a975790dda458481e88de0a29c433b706c9'
+    [string] $Hash = 'cb7f1a975790dda458481e88de0a29c433b706c9',
+    [array] $Targets = @('x64', 'x86')
 )
 
 function Setup {

diff --git a/deps.windows/60-ntv2.ps1 b/deps.windows/60-ntv2.ps1
@@ -3,7 +3,8 @@ param(
     [string] $Version = '16.2',
     [string] $Uri = 'https://github.com/aja-video/ntv2.git',
     [string] $Hash = '0acbac70a0b5e6509cca78cfbf69974c73c10db9',
-    [switch] $ForceStatic = $true
+    [switch] $ForceStatic = $true,
+    [array] $Targets = @('x64', 'x86')
 )
 
 function Setup {

diff --git a/deps.windows/60-python.ps1 b/deps.windows/60-python.ps1
@@ -2,10 +2,11 @@ param(
     [string] $Name = 'python',
     [string] $Version = '3.1.1',
     [string] $Uri = 'https://github.com/pyenv-win/pyenv-win.git',
-    [string] $Hash = '754a6ca877f66aaa2bd4485a29411267d0705273',
+    [string] $Hash = '3201b6c2bf1e4d4791f66fc8634e80f3ff2731c6',
     [hashtable] $PythonVersion = @{
-         x86 = '3.8.10-win32'
-         x64 = '3.8.10'
+        x86 = '3.8.10-win32'
+        x64 = '3.8.10'
+        arm64 = '3.11.6-arm'
     }
 )
 

diff --git a/deps.windows/70-vpl.ps1 b/deps.windows/70-vpl.ps1
@@ -3,7 +3,8 @@ param(
     [string] $Version = 'v2023.3.0',
     [string] $Uri = 'https://github.com/oneapi-src/oneVPL.git',
     [string] $Hash = 'e12ace9761bb52786409e830f619916b86e87fc5',
-    [switch] $ForceStatic = $true
+    [switch] $ForceStatic = $true,
+    [array] $Targets = @('x64', 'x86')
 )
 
 function Setup {