Package examples with releases

Author: fffonion

PdVm.Runner/Program.cs

@@ -5,10 +5,10 @@
 internal static class Program
 {
     [STAThread]
-    public static Task<int> Main(string[] args)
+    public static int Main(string[] args)
     {
         PdVmDotNetHost.InitializeWindowsFormsApplication();
-        return ProgramEntry.RunAsync(args);
+        return ProgramEntry.RunAsync(args).GetAwaiter().GetResult();
     }
 }
 

docs/dotnet-interop-wrapper-plan.md

@@ -30,7 +30,7 @@ The wrapper materializes virtual modules in an overlay source root. The source r
 use System::Console;
 use System::IO::Path;
 
-Console::WriteLine("hello");
+Console::WriteLineString("hello");
 let name = Path::GetFileName("scripts/main.rss");
 ```
 
@@ -51,10 +51,10 @@ CLR objects use typed module functions rather than string-based instance dispatc
 ```rust
 use System::Text::StringBuilder;
 
-let builder = StringBuilder::New();
-StringBuilder::Append(builder, "hello");
+let builder = StringBuilder::NewStringBuilder();
+StringBuilder::AppendStringInstance(builder, "hello");
 let text = StringBuilder::ToString(builder);
-StringBuilder::Release(builder);
+StringBuilder::ReleaseStringBuilder(builder);
 ```
 
 The first version represents CLR references as checked integer handles. A later language-level opaque-handle schema can replace this without changing the binding descriptor format.

examples/dotnet-typed-console.rss

@@ -2,12 +2,12 @@ use System::Console;
 use System::IO::Path;
 use System::Text::StringBuilder;
 
-Console::WriteLine("typed .NET interop from RustScript");
+Console::WriteLineString("typed .NET interop from RustScript");
 let name = Path::GetFileName("examples/demo.rss");
-Console::WriteLine(name);
+Console::WriteLineString(name);
 
-let builder = StringBuilder::New();
-StringBuilder::Append(builder, "CLR ");
-StringBuilder::Append(builder, "object handle");
-Console::WriteLine(StringBuilder::ToString(builder));
-StringBuilder::Release(builder);
+let builder = StringBuilder::NewStringBuilder();
+StringBuilder::AppendStringInstance(builder, "CLR ");
+StringBuilder::AppendStringInstance(builder, "object handle");
+Console::WriteLineString(StringBuilder::ToString(builder));
+StringBuilder::ReleaseStringBuilder(builder);

run-minesweeper.bat

@@ -0,0 +1,14 @@
+@echo off
+setlocal
+
+set "ROOT=%~dp0"
+set "RUNNER=%ROOT%PdVm.Runner.dll"
+if not exist "%RUNNER%" set "RUNNER=%ROOT%PdVm.Runner\bin\Release\net10.0\PdVm.Runner.dll"
+
+if not exist "%RUNNER%" (
+    echo PdVm.Runner.dll was not found. Build the solution or run this file from a release package.
+    exit /b 1
+)
+
+dotnet "%RUNNER%" run "%ROOT%examples\dotnet-minesweeper.rss" --profile winforms %*
+exit /b %ERRORLEVEL%

scripts/package-release.ps1

@@ -20,6 +20,11 @@ if (Test-Path -LiteralPath $packageRoot) {
 }
 New-Item -ItemType Directory -Path $packageRoot -Force | Out-Null
 
+$examplesSource = Join-Path $repoRoot 'examples'
+$examplesDestination = Join-Path $packageRoot 'examples'
+Copy-Item -LiteralPath $examplesSource -Destination $examplesDestination -Recurse
+Copy-Item -LiteralPath (Join-Path $repoRoot 'run-minesweeper.bat') -Destination $packageRoot
+
 $manifest = Join-Path $repoRoot 'native/pd-vm-compiler/Cargo.toml'
 cargo build --locked --release --target $RustTarget --manifest-path $manifest
 if ($LASTEXITCODE -ne 0) {
@@ -62,14 +67,24 @@ $requiredFiles = @(
     'PdVm.Compiler.pdb',
     'PdVm.Runtime.dll',
     'PdVm.Runtime.pdb',
-    $nativeName
+    $nativeName,
+    'run-minesweeper.bat'
 )
 foreach ($file in $requiredFiles) {
     if (-not (Test-Path -LiteralPath (Join-Path $packageRoot $file))) {
         throw "Release package is missing $file"
     }
 }
 
+$examplesPrefix = $examplesSource.TrimEnd([System.IO.Path]::DirectorySeparatorChar) + [System.IO.Path]::DirectorySeparatorChar
+foreach ($example in Get-ChildItem -LiteralPath $examplesSource -File -Recurse) {
+    $relative = $example.FullName.Substring($examplesPrefix.Length)
+    $packagedExample = Join-Path $examplesDestination $relative
+    if (-not (Test-Path -LiteralPath $packagedExample)) {
+        throw "Release package is missing example $relative"
+    }
+}
+
 $archiveExtension = if ($RuntimeIdentifier -eq 'win-x64') { 'zip' } else { 'tar.gz' }
 $archive = Join-Path $releaseRoot "pd-vm-clr-$RuntimeIdentifier.$archiveExtension"
 if (Test-Path -LiteralPath $archive) {