Support R 4.x, modernise the build, and bring the console up to current libraries

.gitattributes

@@ -0,0 +1,3 @@
+
+# excel add-in, binary
+*.xlam binary

.github/workflows/ci.yml

@@ -0,0 +1,95 @@
+name: CI
+
+# What is built here, and what is not
+#
+# The console and the R-side checks run on every push. Neither native binary
+# is built, for different reasons.
+#
+# The add-in cannot be built at all: XLCALL.H and XLCALL.CPP come from
+# Microsoft's Excel XLL SDK and BERT/.gitignore deliberately keeps them out of
+# the repository, so BERT64.xll is not buildable from a clean checkout by
+# anyone, CI included.
+#
+# The controller can be built, but not yet here. It was tried, and the attempt
+# is worth recording because it found two real faults before it ran out of
+# road -- the vcpkg baseline was pinned for the add-in only, so a standalone
+# controller build resolved a protobuf incompatible with the checked-in
+# generated code; and R_ReadConsole carried R 3.5's signature and compiled
+# locally only because a header in the local R tree had been edited by hand.
+# Both are fixed.
+#
+# What the attempt needed, if anyone picks it up again:
+#
+#   r-lib/actions/setup-r@v2 with r-version 4.5.2  (not 'release': R 4.6
+#     removed Rf_isFrame and changed the ReadConsole callback signature)
+#   BertRHome pointed at that R, for its headers; the import libraries are
+#     checked in, so no .lib generation is needed
+#   vcpkg integrate install, because hosted runners ship vcpkg unintegrated
+#     and manifest mode otherwise restores nothing
+#   /p:PlatformToolset=v143, because the tree targets v145 (VS 2026) and
+#     hosted runners carry VS 2022
+#
+# Where it stops: the link fails with an unresolved __std_rotate out of
+# libprotobuf and abseil, which is a C runtime mismatch -- vcpkg resolves
+# protobuf:x64-windows (dynamic CRT) on the runner while the project links
+# the static CRT. Forcing /p:VcpkgTriplet=x64-windows-static is the obvious
+# next thing to try. It was not pursued: with the add-in unbuildable anyway,
+# a controller-only build earns less than the time it costs, and the native
+# build is exercised locally by Install/build-release.ps1 on every release.
+
+on:
+  push:
+    branches: [master, console-upgrade]
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+
+  console:
+    name: console (typescript + styles)
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: npm
+          cache-dependency-path: Console/package-lock.json
+
+      - name: install
+        working-directory: Console
+        run: npm ci
+
+      - name: build
+        working-directory: Console
+        run: npm run build
+
+      - name: the build produced something
+        working-directory: Console
+        shell: pwsh
+        run: |
+          $js = Get-ChildItem build -Recurse -Filter *.js -ErrorAction SilentlyContinue
+          if (-not $js) { throw "no javascript in Console/build" }
+          if (-not (Test-Path build/style.css)) { throw "no build/style.css" }
+          "compiled $($js.Count) files, $([math]::Round((Get-Item build/style.css).Length / 1kb)) kB of css"
+
+  r-checks:
+    name: startup.R on R ${{ matrix.r }}
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        # the oldest R the controller will start against, the version that
+        # began warning about length-2 conditions, the one that made it an
+        # error, and current
+        r: ['3.6.3', '4.2.3', '4.3.3', 'release']
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          r-version: ${{ matrix.r }}
+
+      - name: startup.R checks
+        run: Rscript tests/startup-guard.R

.github/workflows/modules.yml

@@ -0,0 +1,84 @@
+name: graphics modules
+
+# BERTModule is compiled against R's graphics engine, and R checks that
+# version whenever a graphics device is created -- so a module built for one R
+# series cannot draw on another, and the install ships one per series.
+#
+# Building them locally means an R installation and its matching Rtools for
+# every series, which is well over a gigabyte of downloads. Runners can do it
+# instead: setup-r installs the right Rtools for each version. Each job
+# uploads its module as an artifact, and Install/build-release.ps1 -FetchModules
+# collects them into Build/module for packaging.
+
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - 'Module/**'
+      - '.github/workflows/modules.yml'
+
+jobs:
+
+  module:
+    name: BERTModule for R ${{ matrix.r }}
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        # one per series BERT supports. old versions are allowed to fail
+        # without failing the run: the toolchains for them are ancient and
+        # may not be installable for ever.
+        r: ['4.6.1', '4.5.2', '4.4.3', '4.3.3', '4.2.3']
+        include:
+          - r: '3.5.3'
+            optional: true
+    continue-on-error: ${{ matrix.optional == true }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          r-version: ${{ matrix.r }}
+          # the matching toolchain; setup-r picks rtools by R version
+          update-rtools: true
+
+      - name: build the module
+        shell: pwsh
+        run: |
+          # the series comes from the matrix, not from asking R: one less
+          # thing to go wrong before anything has been built
+          $series = ("${{ matrix.r }}" -split '\.')[0..1] -join '.'
+          Write-Host "building BERTModule for R $series"
+          "SERIES=$series" | Out-File -FilePath $env:GITHUB_ENV -Append
+
+          Write-Host "R on this runner:"
+          & Rscript --vanilla -e "cat(R.version.string)"
+
+          # a module must never be relinked from objects compiled against
+          # another R. github runs pwsh with ErrorActionPreference=Stop, so
+          # guard the case where there is nothing to clean.
+          if (Test-Path Module/src) {
+            $stale = Get-ChildItem -Path Module/src/* -Include *.o, *.dll -File -ErrorAction Ignore
+            if ($stale) { $stale | Remove-Item -Force }
+          }
+
+          New-Item -ItemType Directory -Force "out/$series" | Out-Null
+          # R.exe, not R: powershell aliases R to Invoke-History, so "& R CMD"
+          # silently runs the wrong thing
+          & R.exe CMD INSTALL --library="out/$series" --no-multiarch Module
+          if ($LASTEXITCODE) { throw "R CMD INSTALL failed for R $series" }
+
+      - name: check what it was built against
+        shell: pwsh
+        run: |
+          $desc = (Get-Content "out/$env:SERIES/BERTModule/DESCRIPTION" | Select-String "^Built:").ToString()
+          Write-Host $desc
+          if ($desc -notmatch "R $([regex]::Escape($env:SERIES))") {
+            throw "module reports '$desc' but should be built for R $env:SERIES"
+          }
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: BERTModule-${{ env.SERIES }}
+          path: out/${{ env.SERIES }}
+          if-no-files-found: error

.gitignore

@@ -6,3 +6,47 @@ BERTModule_*.gz
 notes.md
 
 yarn-error.log
+
+# ---------------------------------------------------------------------------
+# added on the r4-support branch
+# ---------------------------------------------------------------------------
+
+# vcpkg manifest-mode install trees. these are regenerated from vcpkg.json
+# and vcpkg-configuration.json; they run to hundreds of megabytes each.
+vcpkg_installed/
+
+# R distributions used as build inputs (headers + import libs). these are
+# local installs, not part of the source tree. see docs/BUILDING.md.
+/R-3.5.0/
+/R-4.5.2/
+
+# visual studio per-user and per-machine state
+.vs/
+*.vcxproj.user
+
+# build output directories, all platforms
+[Xx]64/
+Win32/
+ARM64/
+ARM64EC/
+
+# editor-local settings and scratch notes
+.vscode/
+
+# local archives and scratch copies
+*.7z
+Console/generated/variable_pb_new.js
+Console/generated/variable_pb_old.js
+
+# release outputs (Install/build-release.ps1)
+Install/BERT-Installer-*.exe
+Install/BERT-*.zip
+Install/build-log.txt
+
+# R CMD INSTALL byproducts in the module source
+Module/src/*.dll
+Module/src/*.o
+
+# the third-party add-in the optional help feature ships; build-release.ps1
+# downloads and verifies it
+Install/ExcelDna.IntelliSense64.xll

BERT/.gitignore

@@ -19,3 +19,6 @@ enc_temp_folder
 
 *.exe
 *.xll
+ARM64
+ARM64EC
+vcpkg_installed

BERT/BERT.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2002
+# Visual Studio Version 18
+VisualStudioVersion = 18.1.11312.151
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BERT", "BERT\BERT.vcxproj", "{0CA760D0-16BE-4A7E-A1BF-7296BF699485}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -21,44 +21,58 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ControlJulia07", "..\Contro
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM64EC = Debug|ARM64EC
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Release|ARM64EC = Release|ARM64EC
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0CA760D0-16BE-4A7E-A1BF-7296BF699485}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
+		{0CA760D0-16BE-4A7E-A1BF-7296BF699485}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
 		{0CA760D0-16BE-4A7E-A1BF-7296BF699485}.Debug|x64.ActiveCfg = Debug|x64
 		{0CA760D0-16BE-4A7E-A1BF-7296BF699485}.Debug|x64.Build.0 = Debug|x64
 		{0CA760D0-16BE-4A7E-A1BF-7296BF699485}.Debug|x86.ActiveCfg = Debug|Win32
+		{0CA760D0-16BE-4A7E-A1BF-7296BF699485}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
+		{0CA760D0-16BE-4A7E-A1BF-7296BF699485}.Release|ARM64EC.Build.0 = Release|ARM64EC
 		{0CA760D0-16BE-4A7E-A1BF-7296BF699485}.Release|x64.ActiveCfg = Release|x64
 		{0CA760D0-16BE-4A7E-A1BF-7296BF699485}.Release|x64.Build.0 = Release|x64
 		{0CA760D0-16BE-4A7E-A1BF-7296BF699485}.Release|x86.ActiveCfg = Release|Win32
 		{0CA760D0-16BE-4A7E-A1BF-7296BF699485}.Release|x86.Build.0 = Release|Win32
+		{ADE9DA3C-93BF-4469-83B7-FBC015B6497F}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
+		{ADE9DA3C-93BF-4469-83B7-FBC015B6497F}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
 		{ADE9DA3C-93BF-4469-83B7-FBC015B6497F}.Debug|x64.ActiveCfg = Debug|x64
 		{ADE9DA3C-93BF-4469-83B7-FBC015B6497F}.Debug|x64.Build.0 = Debug|x64
 		{ADE9DA3C-93BF-4469-83B7-FBC015B6497F}.Debug|x86.ActiveCfg = Debug|Win32
+		{ADE9DA3C-93BF-4469-83B7-FBC015B6497F}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
+		{ADE9DA3C-93BF-4469-83B7-FBC015B6497F}.Release|ARM64EC.Build.0 = Release|ARM64EC
 		{ADE9DA3C-93BF-4469-83B7-FBC015B6497F}.Release|x64.ActiveCfg = Release|x64
 		{ADE9DA3C-93BF-4469-83B7-FBC015B6497F}.Release|x64.Build.0 = Release|x64
 		{ADE9DA3C-93BF-4469-83B7-FBC015B6497F}.Release|x86.ActiveCfg = Release|Win32
+		{3FAA4E29-8871-445F-9068-BF6518C295B5}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
+		{3FAA4E29-8871-445F-9068-BF6518C295B5}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
 		{3FAA4E29-8871-445F-9068-BF6518C295B5}.Debug|x64.ActiveCfg = Debug|x64
 		{3FAA4E29-8871-445F-9068-BF6518C295B5}.Debug|x64.Build.0 = Debug|x64
 		{3FAA4E29-8871-445F-9068-BF6518C295B5}.Debug|x86.ActiveCfg = Debug|Win32
+		{3FAA4E29-8871-445F-9068-BF6518C295B5}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
+		{3FAA4E29-8871-445F-9068-BF6518C295B5}.Release|ARM64EC.Build.0 = Release|ARM64EC
 		{3FAA4E29-8871-445F-9068-BF6518C295B5}.Release|x64.ActiveCfg = Release|x64
 		{3FAA4E29-8871-445F-9068-BF6518C295B5}.Release|x64.Build.0 = Release|x64
 		{3FAA4E29-8871-445F-9068-BF6518C295B5}.Release|x86.ActiveCfg = Release|Win32
 		{3FAA4E29-8871-445F-9068-BF6518C295B5}.Release|x86.Build.0 = Release|Win32
+		{3F1862DE-C93C-4980-84E1-D69792BF271F}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
 		{3F1862DE-C93C-4980-84E1-D69792BF271F}.Debug|x64.ActiveCfg = Debug|x64
-		{3F1862DE-C93C-4980-84E1-D69792BF271F}.Debug|x64.Build.0 = Debug|x64
 		{3F1862DE-C93C-4980-84E1-D69792BF271F}.Debug|x86.ActiveCfg = Debug|Win32
+		{3F1862DE-C93C-4980-84E1-D69792BF271F}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
 		{3F1862DE-C93C-4980-84E1-D69792BF271F}.Release|x64.ActiveCfg = Release|x64
-		{3F1862DE-C93C-4980-84E1-D69792BF271F}.Release|x64.Build.0 = Release|x64
 		{3F1862DE-C93C-4980-84E1-D69792BF271F}.Release|x86.ActiveCfg = Release|Win32
+		{E94424C4-D404-42CC-8D18-EF3462C4D7FB}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
 		{E94424C4-D404-42CC-8D18-EF3462C4D7FB}.Debug|x64.ActiveCfg = Debug|x64
-		{E94424C4-D404-42CC-8D18-EF3462C4D7FB}.Debug|x64.Build.0 = Debug|x64
 		{E94424C4-D404-42CC-8D18-EF3462C4D7FB}.Debug|x86.ActiveCfg = Debug|Win32
 		{E94424C4-D404-42CC-8D18-EF3462C4D7FB}.Debug|x86.Build.0 = Debug|Win32
+		{E94424C4-D404-42CC-8D18-EF3462C4D7FB}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
 		{E94424C4-D404-42CC-8D18-EF3462C4D7FB}.Release|x64.ActiveCfg = Release|x64
-		{E94424C4-D404-42CC-8D18-EF3462C4D7FB}.Release|x64.Build.0 = Release|x64
 		{E94424C4-D404-42CC-8D18-EF3462C4D7FB}.Release|x86.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution