Create runtime kit and adjust devkit (#9)

* create runtime kit and adjust devkit * bump version * make setup.ps1 reusable * add FNMPAPI PDB to devkit
microsoft · Nov 20, 2023 · edbd19e · edbd19e
1 parent 04cc720
commit edbd19e
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -79,6 +79,9 @@ jobs:
     - name: Create Dev Kit
       shell: PowerShell
       run: tools/create-devkit.ps1 -Config ${{ matrix.configuration }} -Platform ${{ matrix.platform }}
+    - name: Create Runtime Kit
+      shell: PowerShell
+      run: tools/create-runtimekit.ps1 -Config ${{ matrix.configuration }} -Platform ${{ matrix.platform }}
     - name: Upload Release Artifacts
       uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
       with:

diff --git a/src/fnmp.props b/src/fnmp.props
@@ -3,7 +3,7 @@
     <!-- Defines the project version numbers -->
     <MajorVersion>0</MajorVersion>
     <MinorVersion>1</MinorVersion>
-    <PatchVersion>0</PatchVersion>
+    <PatchVersion>1</PatchVersion>
   </PropertyGroup>
   <!-- The set of (eventually?) supported configurations -->
   <ItemGroup Label="ProjectConfigurations">

diff --git a/tools/create-devkit.ps1 b/tools/create-devkit.ps1
@@ -28,22 +28,11 @@ $DstPath = "artifacts\kit\$Name"
 Remove-Item $DstPath -Recurse -ErrorAction Ignore
 New-Item -Path $DstPath -ItemType Directory > $null
 
-New-Item -Path $DstPath\symbols -ItemType Directory > $null
-copy "artifacts\bin\$($Platform)_$($Config)\fnmp.pdb"   $DstPath\symbols
-copy "artifacts\bin\$($Platform)_$($Config)\fnmpapi.pdb" $DstPath\symbols
-
 New-Item -Path $DstPath\include -ItemType Directory > $null
 copy -Recurse inc\* $DstPath\include
 
 New-Item -Path $DstPath\lib -ItemType Directory > $null
 copy "artifacts\bin\$($Platform)_$($Config)\fnmpapi.lib" $DstPath\lib
+copy "artifacts\bin\$($Platform)_$($Config)\fnmpapi.pdb" $DstPath\lib
 
-$VersionString = Get-ProjectBuildVersionString
-
-if (!(Is-ReleaseBuild)) {
-    $VersionString += "-prerelease+" + (git.exe describe --long --always --dirty --exclude=* --abbrev=8)
-
-    copy "artifacts\bin\$($Platform)_$($Config)\CoreNetSignRoot.cer" $DstPath\bin
-}
-
-Compress-Archive -DestinationPath "$DstPath\$Name-$VersionString.zip" -Path $DstPath\*
+Compress-Archive -DestinationPath "$DstPath\$Name.zip" -Path $DstPath\*
diff --git a/tools/create-runtimekit.ps1 b/tools/create-runtimekit.ps1
@@ -0,0 +1,42 @@
+#
+# Assembles a runtime kit for FNMP execution.
+# Code must be built before running this script.
+#
+
+param (
+    [ValidateSet("x64")]
+    [Parameter(Mandatory=$false)]
+    [string]$Platform = "x64",
+
+    [ValidateSet("Debug", "Release")]
+    [Parameter(Mandatory=$false)]
+    [string]$Config = "Debug"
+)
+
+Set-StrictMode -Version 'Latest'
+$ErrorActionPreference = 'Stop'
+
+$RootDir = Split-Path $PSScriptRoot -Parent
+. $RootDir\tools\common.ps1
+
+$Name = "fnmp-runtime-$Platform"
+if ($Config -eq "Debug") {
+    $Name += "-debug"
+}
+$DstPath = "artifacts\kit\$Name"
+
+Remove-Item $DstPath -Recurse -ErrorAction Ignore
+New-Item -Path $DstPath -ItemType Directory > $null
+
+New-Item -Path $DstPath\bin -ItemType Directory > $null
+copy -Recurse "artifacts\bin\$($Platform)_$($Config)\fnmp\" $DstPath\bin
+
+New-Item -Path $DstPath\symbols -ItemType Directory > $null
+copy "artifacts\bin\$($Platform)_$($Config)\fnmp.pdb"   $DstPath\symbols
+
+New-Item -Path $DstPath\tools -ItemType Directory > $null
+copy ".\tools\common.ps1" $DstPath\tools
+copy ".\tools\prepare-machine.ps1" $DstPath\tools
+copy ".\tools\setup.ps1" $DstPath\tools
+
+Compress-Archive -DestinationPath "$DstPath\$Name.zip" -Path $DstPath\*
diff --git a/tools/prepare-machine.ps1 b/tools/prepare-machine.ps1
@@ -175,11 +175,12 @@ if ($Cleanup) {
             reg.exe add HKLM\System\CurrentControlSet\Control\CrashControl /v CrashDumpEnabled /d 1 /t REG_DWORD /f
             $Reboot = $true
         }
-    }
 
-    if ($ForTest) {
         Setup-VcRuntime
         Setup-VsTest
+    }
+
+    if ($ForTest) {
         Download-CoreNet-Deps
         Setup-TestSigning
         Install-Certs

diff --git a/tools/setup.ps1 b/tools/setup.ps1
@@ -15,6 +15,12 @@ This script installs or uninstalls various FNMP components.
 .PARAMETER Uninstall
     Attempts to uninstall all FNMP components.
 
+.PARAMETER ArtifactsDir
+    Supplies an optional directory containing FNMP component artifacts.
+
+.PARAMETER LogsDir
+    Supplies an optional directory to output logs.
+
 #>
 
 param (
@@ -32,7 +38,13 @@ param (
 
     [Parameter(Mandatory = $false)]
     [ValidateSet("", "fnmp")]
-    [string]$Uninstall = ""
+    [string]$Uninstall = "",
+
+    [Parameter(Mandatory = $false)]
+    [string]$ArtifactsDir = "",
+
+    [Parameter(Mandatory = $false)]
+    [string]$LogsDir = ""
 )
 
 Set-StrictMode -Version 'Latest'
@@ -43,8 +55,12 @@ $RootDir = Split-Path $PSScriptRoot -Parent
 . $RootDir\tools\common.ps1
 
 # Important paths.
-$ArtifactsDir = "$RootDir\artifacts\bin\$($Arch)_$($Config)"
-$LogsDir = "$RootDir\artifacts\logs"
+if ([string]::IsNullOrEmpty($ArtifactsDir)) {
+    $ArtifactsDir = "$RootDir\artifacts\bin\$($Arch)_$($Config)"
+}
+if ([string]::IsNullOrEmpty($LogsDir)) {
+    $LogsDir = "$RootDir\artifacts\logs"
+}
 $DevCon = Get-CoreNetCiArtifactPath -Name "devcon.exe"
 $DswDevice = Get-CoreNetCiArtifactPath -Name "dswdevice.exe"