update windows pwsh build

nervosys · Feb 29, 2024 · 224b27d · 224b27d
1 parent e1db33b
commit 224b27d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/.github/workflows/test_windows.yml b/.github/workflows/test_windows.yml
@@ -74,8 +74,10 @@ jobs:
         shell: pwsh
         run: |
           # Initialize Visual Studio 2022 Developer Command Prompt and prepend MSBuild to PATH.
-          [String]$VisualStudioDir = 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise'
-          . "${VisualStudioDir}\Common7\Tools\Launch-VsDevShell.ps1" -Latest
+          $ProjectDir = "$PWD"
+          $VisualStudioDir = 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise'
           ${env:PATH} += ";${VisualStudioDir}\MSBuild\Current\Bin"
+          ${env:CMAKE_GENERATOR} = 'Visual Studio 17 2022'
+          . "${VisualStudioDir}\Common7\Tools\Launch-VsDevShell.ps1" -Latest
           # Set-PSDebug -Trace 1
-          .\scripts\build.ps1 -BuildMode 'Release' -CmakeGenerator 'Visual Studio 17 2022' -UnrealAsset -Automate -Verbose
+          . "${ProjectDir}\scripts\build.ps1" -ProjectDir "$ProjectDir" -BuildMode 'Release' -CmakeGenerator "${env:CMAKE_GENERATOR}" -UnrealAsset -Automate -Verbose
diff --git a/scripts/build.ps1 b/scripts/build.ps1
@@ -8,11 +8,13 @@ AUTHOR:
 DATE:
   2024-02-27
 PARAMETERS:
+  - ProjectDir:     AutonomySim base directory.
   - BuildMode:      [ Debug | Release | RelWithDebInfo ]
   - CmakeGenerator: [ Visual Studio 17 2022 | Visual Studio 16 2019 ]
   - BuildDocs:      Enable to build and serve AutonomySim documentation.
-  - SystemDebug:    Enable for computer system debugging messages.
+  - UnrealEnvDir:   Path to Unreal Environment directory.
   - UnrealAsset:    Enable for an Unreal Engine full-polycount SUV asset.
+  - SystemDebug:    Enable for computer system debugging messages.
   - Automate:       Enable to automate Visual Studio installation selection.
 NOTES:
   - Assumes: PowerShell version >= 7, Unreal Engine >= 5, CMake >= 3.14, Visual Studio 2022.
@@ -29,24 +31,27 @@ WARNINGS:
 ###
 
 param(
+  [Parameter(HelpMessage = 'AutonomySim base directory.')]
+  [String]
+  $ProjectDir = "$PWD",
   [Parameter(HelpMessage = 'Options: [ Debug | Release | RelWithDebInfo ]')]
   [String]
   $BuildMode = 'Release',
   [Parameter(HelpMessage = 'Options: [ Visual Studio 17 2022 | Visual Studio 16 2019 ]')]
   [String]
   $CmakeGenerator = 'Visual Studio 17 2022',
+  [Parameter(HelpMessage = 'Enable to build and serve AutonomySim documentation.')]
+  [Switch]
+  $BuildDocs,
   [Parameter(HelpMessage = 'Path to Unreal Environment directory.')]
   [String]
   $UnrealEnvDir,
-  [Parameter(HelpMessage = 'Enable to build and serve AutonomySim documentation.')]
+  [Parameter(HelpMessage = 'Enable for an Unreal Engine full-polycount SUV asset.')]
   [Switch]
-  $BuildDocs,
+  $UnrealAsset,
   [Parameter(HelpMessage = 'Enable for computer system debugging messages.')]
   [Switch]
   $SystemDebug,
-  [Parameter(HelpMessage = 'Enable for an Unreal Engine full-polycount SUV asset.')]
-  [Switch]
-  $UnrealAsset,
   [Parameter(HelpMessage = 'Enable for CI/CD mode (e.g., GitHub Actions).')]
   [Switch]
   $Automate
@@ -80,8 +85,8 @@ Import-Module "${PWD}\scripts\mod_docs.psm1"          # imports: Build-Documenta
 ###
 
 # Static variables
-$PROJECT_DIR = "$PWD"
-$SCRIPT_DIR = "${PROJECT_DIR}\scripts"
+$PROJECT_DIR = "$ProjectDir"
+$SCRIPT_DIR = "${ProjectDir}\scripts"
 $UNREAL_ENV_DIR = if ( $PSBoundParameters.ContainsKey('UnrealEnvDir') ) {
   "$UnrealEnvDir"
 } else {