-
Notifications
You must be signed in to change notification settings - Fork 120
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #690 from jdpurcell/pr-winarm64
Windows ARM64
- Loading branch information
Showing
9 changed files
with
258 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,8 @@ | ||
| # Script assumes $env:arch will start with win64 or win32 | ||
| $win64orwin32 = $env:arch.substring(0, 5) | ||
| New-Item -Path "dist\win\qView-$win64orwin32" -ItemType Directory -ea 0 | ||
| copy -R bin\* "dist\win\qView-$win64orwin32" | ||
| iscc dist\win\qView$($env:arch.substring(3, 2)).iss | ||
| $suffix = | ||
| $env:buildArch -eq 'X86' ? '32' : | ||
| $env:buildArch -eq 'Arm64' ? 'Arm64' : | ||
| '64'; | ||
| New-Item -Path "dist\win\qView-Win$suffix" -ItemType Directory -ea 0 | ||
| copy -R bin\* "dist\win\qView-Win$suffix" | ||
| iscc dist\win\qView$suffix.iss | ||
| copy dist\win\Output\* bin\ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,20 @@ | ||
| # Script assumes $env:arch will start with win64 or win32 | ||
| # This should probably be an arg | ||
| $arch = $env:arch.substring(3, 2) | ||
| $path = Resolve-Path "${env:ProgramFiles(x86)}\Microsoft Visual Studio\*\*\VC\Auxiliary\Build" | select -ExpandProperty Path | ||
| using namespace System.Runtime.InteropServices | ||
|
|
||
| cmd.exe /c "call `"$path\vcvars$arch.bat`" && set > %temp%\vcvars.txt" | ||
| if ([RuntimeInformation]::OSArchitecture -ne [Architecture]::X64) { | ||
| throw 'Unsupported host architecture.' | ||
| } | ||
|
|
||
| $arch = | ||
| $env:buildArch -eq 'X86' ? 'x64_x86' : | ||
| $env:buildArch -eq 'Arm64' ? 'x64_arm64' : | ||
| 'x64' | ||
| $path = Resolve-Path "${env:ProgramFiles}\Microsoft Visual Studio\*\*\VC\Auxiliary\Build" | Select-Object -ExpandProperty Path | ||
|
|
||
| cmd.exe /c "call `"$path\vcvarsall.bat`" $arch && set > %temp%\vcvars.txt" | ||
|
|
||
| $exclusions = @('VCPKG_ROOT') # Workaround for https://developercommunity.visualstudio.com/t/VCPKG_ROOT-is-being-overwritten-by-the-D/10430650 | ||
| Get-Content "$env:temp\vcvars.txt" | Foreach-Object { | ||
| if ($_ -match "^(.*?)=(.*)$") { | ||
| Set-Content "env:\$($matches[1])" $matches[2] | ||
| } | ||
| } | ||
| if ($_ -match "^(.*?)=(.*)$" -and $matches[1] -notin $exclusions) { | ||
| [Environment]::SetEnvironmentVariable($matches[1], $matches[2]) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.