fix: Develop2 - VS2022 install 7zip (#2316)

Author: RobBuchananCompPhys

develop.ps1

@@ -90,13 +90,11 @@ function Find-And-Remove {
         [string]$relativePath = ""
     )
 
-    if (Test-Path -Path $relativePath)
-    {
+    if (Test-Path -Path $relativePath) {
         Write-Host "Existing instance of object $relativePath found, cleaning up... " @info_colors
         Remove-Item $relativePath -Recurse -Force
     }
-    else
-    {
+    else {
         Write-Host "Existing instance of object $relativePath NOT found, could not clean up." @warn_colors
     }
 }
@@ -141,35 +139,31 @@ choco install -y cmake --version=3.30.1 --force
 
 # Ensure CMake version is 3.30.1
 $cmakeVersion = "$(cmake --version)"
-if (-not ($cmakeVersion -like "*3.30.1*"))
-{
+if (-not ($cmakeVersion -like "*3.30.1*")) {
     choco install -y cmake.install --version=3.30.1 --force --installargs "ADD_CMAKE_TO_PATH=User"
 }
 
 # Find git, install if not found
 try {
     & "git" --version
     Write-Output "Found system Git..."
-} catch {
+}
+catch {
     Write-Output "Could not find system Git - installing with Chocolatey..."
     choco install -y git
 }
 
 # Find python, install if not found
-if (-not [string]::IsNullOrEmpty($pythonPath))
-{
+if (-not [string]::IsNullOrEmpty($pythonPath)) {
     Write-Output "Using Python with path $pythonPath..." @info_colors
     $python = $pythonPath
 }
-else
-{
-    if (-not [string]::IsNullOrEmpty($forcePythonVersion))
-    {
+else {
+    if (-not [string]::IsNullOrEmpty($forcePythonVersion)) {
         Write-Output "Installing requested Python version $forcePythonVersion..." @info_colors
         choco install -y python --version=$forcePythonVersion --force
     }
-    else
-    {
+    else {
         try {
             & "python" --version
             Write-Output "Found system Python..." @info_colors
@@ -179,7 +173,8 @@ else
                 Write-Output "System Python is version $(python --version) and it is recommended to be version == 3.12 - installing with Chocolatey..." @info_colors
                 choco install -y python --version=3.12.0
             }
-        } catch {
+        }
+        catch {
             Write-Output "Could not find system Python - installing with Chocolatey..." @info_colors
             choco install -y python --version=3.12.0
         }
@@ -195,13 +190,11 @@ Write-Host "Creating a local Python virtual environment with $(& $python --versi
 & $python -m venv msvc-env
 
 Write-Host "Checking Python compiler type... " @info_colors
-if ($(& $python -c "import sys; print(sys.version)") -match "MSC v\.\d+")
-{ 
+if ($(& $python -c "import sys; print(sys.version)") -match "MSC v\.\d+") { 
     Write-Host " ...Python compiler type evaluated to MSC" @info_colors
     $pythonEnvSourceDir = "Scripts"
 }
-else 
-{ 
+else { 
     Write-Host " ...Python compiler type is not MSC" @info_colors
     $pythonEnvSourceDir = "bin"
 }
@@ -213,15 +206,14 @@ Write-Host "Activating Python virtual environment... " @info_colors
 
 Write-Host "Installing Python packages... " @info_colors
 & $python -m pip install --upgrade pip
-& $python -m pip install aqtinstall conan==$conanVersion.*
+& $python -m pip install py7zr==1.1.0 aqtinstall conan==$conanVersion.*
 
 $pythonEnvPath = Join-Path -Path $projectDir -ChildPath "msvc-env\$pythonEnvSourceDir"
 
 # Install Qt6, or find existing system Qt6 installation
 $qt6CMakeDir = ""
 
-if (-not [string]::IsNullOrEmpty($qtVersion))
-{
+if (-not [string]::IsNullOrEmpty($qtVersion)) {
     $qtInstallationDir = Join-Path -Path $dependencies -ChildPath "qt"
     New-Item -ItemType Directory -Path $qtInstallationDir -ErrorAction SilentlyContinue
 
@@ -237,20 +229,17 @@ if (-not [string]::IsNullOrEmpty($qtVersion))
     # We attempt to use an existing installation of Qt
     Write-Host "Attempting to use existing system installation of Qt6... " @info_colors
 
-    if (-not [string]::IsNullOrEmpty($systemQt))
-    {
-        $qt6Version = Get-ChildItem -Path $systemQt -Directory | Where-Object { $_.Name -match '^\d+\.\d+\.\d+$'} | Select-Object -First 1
-        $qt6ToolChain = Get-ChildItem -Path (Join-Path -Path $systemQt -ChildPath $qt6Version) -Directory | Where-Object { $_.Name -match '^msvc\d{4}_x64$'} | Select-Object -ExpandProperty Name
+    if (-not [string]::IsNullOrEmpty($systemQt)) {
+        $qt6Version = Get-ChildItem -Path $systemQt -Directory | Where-Object { $_.Name -match '^\d+\.\d+\.\d+$' } | Select-Object -First 1
+        $qt6ToolChain = Get-ChildItem -Path (Join-Path -Path $systemQt -ChildPath $qt6Version) -Directory | Where-Object { $_.Name -match '^msvc\d{4}_x64$' } | Select-Object -ExpandProperty Name
         $qt6BinDir = "$systemQt\$($qt6Version.Name)\$qt6ToolChain\bin"
         $qt6CMakeDir = "$systemQt\$($qt6Version.Name)\$qt6ToolChain\lib\cmake"
 
-        if (-not (Test-Path -Path $qt6CMakeDir -PathType Container))
-        {
+        if (-not (Test-Path -Path $qt6CMakeDir -PathType Container)) {
             Write-Host "Attempted to find the directory $qt6CMakeDir. Could NOT find a valid Qt6 installation." @warn_colors
         }
     }
-    else
-    {
+    else {
         Write-Host "Could NOT find a Qt6 installation. No path to Qt6 was supplied." @warn_colors
     }
 }
@@ -303,8 +292,8 @@ cmake --build . --target install --config $build
 $freetypeLib = "$freetypeInstall\lib"
 $freetypeBin = "$freetypeInstall\bin"
 
-$freetypeLibPath =  Join-Path -Path $projectDir -ChildPath "$dependencies\$freetypeLib"
-$freetypeBinPath =  Join-Path -Path $projectDir -ChildPath "$dependencies\$freetypeBin"
+$freetypeLibPath = Join-Path -Path $projectDir -ChildPath "$dependencies\$freetypeLib"
+$freetypeBinPath = Join-Path -Path $projectDir -ChildPath "$dependencies\$freetypeBin"
 
 $lib = [System.Environment]::GetEnvironmentVariable("LIB", [System.EnvironmentVariableTarget]::Machine)
 
@@ -353,8 +342,8 @@ cmake --build . --target install --config $build
 $ftglLib = "$ftglInstall\lib"
 $ftglBin = "$ftglInstall\bin"
 
-$ftglLibPath =  Join-Path -Path $projectDir -ChildPath "$dependencies\$ftglLib"
-$ftglBinPath =  Join-Path -Path $projectDir -ChildPath "$dependencies\$ftglBin"
+$ftglLibPath = Join-Path -Path $projectDir -ChildPath "$dependencies\$ftglLib"
+$ftglBinPath = Join-Path -Path $projectDir -ChildPath "$dependencies\$ftglBin"
 
 $lib = [System.Environment]::GetEnvironmentVariable("LIB", [System.EnvironmentVariableTarget]::Machine)
 
@@ -364,7 +353,7 @@ if ($lib -notlike "*$ftglInstall*") {
 }
 
 $ftglInclude = "$ftglRepo\src"
-$ftglIncludePath =  Join-Path -Path $projectDir -ChildPath "$dependencies\$ftglInclude"
+$ftglIncludePath = Join-Path -Path $projectDir -ChildPath "$dependencies\$ftglInclude"
 
 $include = [System.Environment]::GetEnvironmentVariable("INCLUDE", [System.EnvironmentVariableTarget]::Machine)
 
@@ -435,12 +424,12 @@ try {
     Write-Output "Found conan version $foundConanVersion..."
 
     $conan = "conan"
-} catch {
+}
+catch {
     Write-Output "Could not find conan, adding Python scripts to path..." @info_colors
     $scripts = & $python -c "import sysconfig; print(sysconfig.get_path('scripts'))"
 
-    if ($setSystemEnvVars)
-    {
+    if ($setSystemEnvVars) {
         $systemPath = [Environment]::GetEnvironmentVariable("PATH", [EnvironmentVariableTarget]::Machine)
         [Environment]::SetEnvironmentVariable("PATH", "$scripts;$systemPath", [EnvironmentVariableTarget]::Machine)
         Write-Host "Python scripts path at location $scripts added to system PATH." @info_colors
@@ -486,49 +475,45 @@ if ((-not [string]::IsNullOrEmpty($msvcVersion)) -and ($generator -eq "Visual St
 }
 
 # For MSVC version != v143 latest, and Ninja generator specified, set toolset at preset level
-if ((-not [string]::IsNullOrEmpty($msvcVersion)) -and ($generator -eq "Ninja"))
-{
+if ((-not [string]::IsNullOrEmpty($msvcVersion)) -and ($generator -eq "Ninja")) {
     $toolset = @{
-        value = "version=$msvcVersion"
+        value    = "version=$msvcVersion"
         strategy = "external"
     }
 }
 
 $cmakeUserPresets = [PSCustomObject]@{
-    version = 3
+    version              = 3
     cmakeMinimumRequired = @{
         major = 3
         minor = 21
     }
-    configurePresets = @()
+    configurePresets     = @()
 }
 
 $presets = @(
     [PSCustomObject]@{
-        name = "CLI-$build-MSVC"
+        name        = "CLI-$build-MSVC"
         displayName = "CLI $build Build"
         description = "The preset for a CLI $build build on MSVC"
-        generator = $generator
-        inherits = @("CLI-$build")
+        generator   = $generator
+        inherits    = @("CLI-$build")
     },
     [PSCustomObject]@{
-        name = "GUI-$build-MSVC"
+        name        = "GUI-$build-MSVC"
         displayName = "GUI $build Build"
         description = "The preset for a GUI $build build on MSVC"
-        generator = $generator
-        inherits = @("GUI-$build")
+        generator   = $generator
+        inherits    = @("GUI-$build")
     }
 )
 
 # Set environment variables
-if (-not $setSystemEnvVars)
-{
-    if ([string]::IsNullOrEmpty($scripts))
-    {
+if (-not $setSystemEnvVars) {
+    if ([string]::IsNullOrEmpty($scripts)) {
         $scripts = ''
     }
-    else
-    {
+    else {
         $scripts = "$scripts;"
     }
 
@@ -553,15 +538,13 @@ foreach ($preset in $presets) {
     $preset | Add-Member -MemberType NoteProperty -Name cacheVariables -Value $cacheVariables
 
     # Set environment variables
-    if (-not $setSystemEnvVars)
-    {
+    if (-not $setSystemEnvVars) {
         $preset | Add-Member -MemberType NoteProperty -Name environment -Value ($environment)
     }
 
     # Set toolset
-    if ($toolset)
-    {
-        $preset | Add-Member -MemberType NoteProperty -Name toolset -Value $toolset
+    if ($toolset) {
+        $preset | Add-Member -MemberType NoteProperty -Name toolset -Value ($toolset)
     }
 
     $cmakeUserPresets.configurePresets += $preset