From 6fb95f701f04e736481e9b99685a8bfdf2636f88 Mon Sep 17 00:00:00 2001
From: Jonah Beckford <9566106-jonahbeckford@users.noreply.gitlab.com>
Date: Mon, 6 Nov 2023 05:54:01 -0800
Subject: [PATCH] Use moved Get-VSSetupInstance (2/2)

Part of https://github.com/diskuv/dkml-installer-ocaml/issues/76
---
 src/scripts/config-vsstudio.ps1       |  2 +-
 test/gh-darwin/pre/action.yml         | 10 ++++----
 test/gh-linux/pre/action.yml          | 10 ++++----
 test/gh-windows/pre/action.yml        | 14 +++++------
 test/gl/setup-dkml.gitlab-ci.yml      | 36 +++++++++++++--------------
 test/pc/setup-dkml-darwin_x86_64.sh   | 10 ++++----
 test/pc/setup-dkml-linux_x86.sh       | 10 ++++----
 test/pc/setup-dkml-linux_x86_64.sh    | 10 ++++----
 test/pc/setup-dkml-windows_x86.ps1    | 16 ++++++------
 test/pc/setup-dkml-windows_x86_64.ps1 | 16 ++++++------
 tmpl/gl/setup-dkml.gitlab-ci.yml      |  2 +-
 tmpl/pc/setup-dkml-windows_x86.ps1    |  2 +-
 tmpl/pc/setup-dkml-windows_x86_64.ps1 |  2 +-
 13 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/src/scripts/config-vsstudio.ps1 b/src/scripts/config-vsstudio.ps1
index 37983a13..0cfce971 100644
--- a/src/scripts/config-vsstudio.ps1
+++ b/src/scripts/config-vsstudio.ps1
@@ -33,7 +33,7 @@ if (("${env:GITLAB_CI}" -eq "true") -or ("${env:PC_CI}" -eq "true")) {
 
 # Locate Visual Studio (Windows)
 if ("${env:vsstudio_dir}" -eq "" -and (!(Test-Path -Path .ci/sd4/vsenv${ExportExt}) -or !(Test-Path -Path .ci/sd4/vsenv.ps1))) {
-    $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-runtime-distribution\src\windows"
+    $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-component-ocamlcompiler\assets\staging-files\win32\SingletonInstall"
     Import-Module Machine
 
     $CompatibleVisualStudios = Get-CompatibleVisualStudios -ErrorIfNotFound
diff --git a/test/gh-darwin/pre/action.yml b/test/gh-darwin/pre/action.yml
index 96a01c9c..be9cf784 100644
--- a/test/gh-darwin/pre/action.yml
+++ b/test/gh-darwin/pre/action.yml
@@ -312,18 +312,18 @@ runs:
 
         install -d .ci/sd4/g
 
-        # dkml-runtime-distribution
+        # dkml-component-ocamlcompiler
 
-        #   For 'Diagnose Visual Studio environment variables (Windows)' we need dkml-runtime-distribution
+        #   For 'Diagnose Visual Studio environment variables (Windows)' we need dkml-component-ocamlcompiler
         #   so that 'Import-Module Machine' and 'Get-VSSetupInstance' can be run.
         #   The version doesn't matter too much, as long as it has a functioning Get-VSSetupInstance
         #   that supports the Visual Studio versions of the latest GitLab CI and GitHub Actions machines.
         #   commit 4d6f1bfc3510c55ba4273cb240e43727854b5718 = WinSDK 19041 and VS 14.29
         case "$dkml_host_abi" in
         windows_*)
-            section_begin checkout-dkml-runtime-distribution 'Checkout dkml-runtime-distribution'
-            git_checkout dkml-runtime-distribution https://github.com/diskuv/dkml-runtime-distribution.git "4d6f1bfc3510c55ba4273cb240e43727854b5718"
-            section_end checkout-dkml-runtime-distribution
+            section_begin checkout-dkml-component-ocamlcompiler 'Checkout dkml-component-ocamlcompiler'
+            git_checkout dkml-component-ocamlcompiler https://github.com/diskuv/dkml-component-ocamlcompiler.git "b9142380b0b8771a0d02f8b88ea786152a6e3d09"
+            section_end checkout-dkml-component-ocamlcompiler
             ;;
         esac
 
diff --git a/test/gh-linux/pre/action.yml b/test/gh-linux/pre/action.yml
index 70403719..cdf6e7c6 100644
--- a/test/gh-linux/pre/action.yml
+++ b/test/gh-linux/pre/action.yml
@@ -340,18 +340,18 @@ runs:
 
         install -d .ci/sd4/g
 
-        # dkml-runtime-distribution
+        # dkml-component-ocamlcompiler
 
-        #   For 'Diagnose Visual Studio environment variables (Windows)' we need dkml-runtime-distribution
+        #   For 'Diagnose Visual Studio environment variables (Windows)' we need dkml-component-ocamlcompiler
         #   so that 'Import-Module Machine' and 'Get-VSSetupInstance' can be run.
         #   The version doesn't matter too much, as long as it has a functioning Get-VSSetupInstance
         #   that supports the Visual Studio versions of the latest GitLab CI and GitHub Actions machines.
         #   commit 4d6f1bfc3510c55ba4273cb240e43727854b5718 = WinSDK 19041 and VS 14.29
         case "$dkml_host_abi" in
         windows_*)
-            section_begin checkout-dkml-runtime-distribution 'Checkout dkml-runtime-distribution'
-            git_checkout dkml-runtime-distribution https://github.com/diskuv/dkml-runtime-distribution.git "4d6f1bfc3510c55ba4273cb240e43727854b5718"
-            section_end checkout-dkml-runtime-distribution
+            section_begin checkout-dkml-component-ocamlcompiler 'Checkout dkml-component-ocamlcompiler'
+            git_checkout dkml-component-ocamlcompiler https://github.com/diskuv/dkml-component-ocamlcompiler.git "b9142380b0b8771a0d02f8b88ea786152a6e3d09"
+            section_end checkout-dkml-component-ocamlcompiler
             ;;
         esac
 
diff --git a/test/gh-windows/pre/action.yml b/test/gh-windows/pre/action.yml
index 6e1a59d2..a5965da6 100644
--- a/test/gh-windows/pre/action.yml
+++ b/test/gh-windows/pre/action.yml
@@ -373,18 +373,18 @@ runs:
 
         install -d .ci/sd4/g
 
-        # dkml-runtime-distribution
+        # dkml-component-ocamlcompiler
 
-        #   For 'Diagnose Visual Studio environment variables (Windows)' we need dkml-runtime-distribution
+        #   For 'Diagnose Visual Studio environment variables (Windows)' we need dkml-component-ocamlcompiler
         #   so that 'Import-Module Machine' and 'Get-VSSetupInstance' can be run.
         #   The version doesn't matter too much, as long as it has a functioning Get-VSSetupInstance
         #   that supports the Visual Studio versions of the latest GitLab CI and GitHub Actions machines.
         #   commit 4d6f1bfc3510c55ba4273cb240e43727854b5718 = WinSDK 19041 and VS 14.29
         case "$dkml_host_abi" in
         windows_*)
-            section_begin checkout-dkml-runtime-distribution 'Checkout dkml-runtime-distribution'
-            git_checkout dkml-runtime-distribution https://github.com/diskuv/dkml-runtime-distribution.git "4d6f1bfc3510c55ba4273cb240e43727854b5718"
-            section_end checkout-dkml-runtime-distribution
+            section_begin checkout-dkml-component-ocamlcompiler 'Checkout dkml-component-ocamlcompiler'
+            git_checkout dkml-component-ocamlcompiler https://github.com/diskuv/dkml-component-ocamlcompiler.git "b9142380b0b8771a0d02f8b88ea786152a6e3d09"
+            section_end checkout-dkml-component-ocamlcompiler
             ;;
         esac
 
@@ -1862,7 +1862,7 @@ runs:
                 Get-ChildItem "C:\Program Files (x86)\Windows Kits\10\Extension SDKs\WindowsDesktop"
             }
 
-            $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-runtime-distribution\src\windows"
+            $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-component-ocamlcompiler\assets\staging-files\win32\SingletonInstall"
             Import-Module Machine
 
             $allinstances = Get-VSSetupInstance
@@ -1887,7 +1887,7 @@ runs:
 
         # Locate Visual Studio (Windows)
         if ("${env:vsstudio_dir}" -eq "" -and (!(Test-Path -Path .ci/sd4/vsenv${ExportExt}) -or !(Test-Path -Path .ci/sd4/vsenv.ps1))) {
-            $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-runtime-distribution\src\windows"
+            $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-component-ocamlcompiler\assets\staging-files\win32\SingletonInstall"
             Import-Module Machine
 
             $CompatibleVisualStudios = Get-CompatibleVisualStudios -ErrorIfNotFound
diff --git a/test/gl/setup-dkml.gitlab-ci.yml b/test/gl/setup-dkml.gitlab-ci.yml
index e1169230..8e9f6ad4 100644
--- a/test/gl/setup-dkml.gitlab-ci.yml
+++ b/test/gl/setup-dkml.gitlab-ci.yml
@@ -593,18 +593,18 @@ variables:
 
       install -d .ci/sd4/g
 
-      # dkml-runtime-distribution
+      # dkml-component-ocamlcompiler
 
-      #   For 'Diagnose Visual Studio environment variables (Windows)' we need dkml-runtime-distribution
+      #   For 'Diagnose Visual Studio environment variables (Windows)' we need dkml-component-ocamlcompiler
       #   so that 'Import-Module Machine' and 'Get-VSSetupInstance' can be run.
       #   The version doesn't matter too much, as long as it has a functioning Get-VSSetupInstance
       #   that supports the Visual Studio versions of the latest GitLab CI and GitHub Actions machines.
       #   commit 4d6f1bfc3510c55ba4273cb240e43727854b5718 = WinSDK 19041 and VS 14.29
       case "$dkml_host_abi" in
       windows_*)
-          section_begin checkout-dkml-runtime-distribution 'Checkout dkml-runtime-distribution'
-          git_checkout dkml-runtime-distribution https://github.com/diskuv/dkml-runtime-distribution.git "4d6f1bfc3510c55ba4273cb240e43727854b5718"
-          section_end checkout-dkml-runtime-distribution
+          section_begin checkout-dkml-component-ocamlcompiler 'Checkout dkml-component-ocamlcompiler'
+          git_checkout dkml-component-ocamlcompiler https://github.com/diskuv/dkml-component-ocamlcompiler.git "b9142380b0b8771a0d02f8b88ea786152a6e3d09"
+          section_end checkout-dkml-component-ocamlcompiler
           ;;
       esac
 
@@ -1957,7 +1957,7 @@ variables:
               Get-ChildItem "C:\Program Files (x86)\Windows Kits\10\Extension SDKs\WindowsDesktop"
           }
 
-          $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-runtime-distribution\src\windows"
+          $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-component-ocamlcompiler\assets\staging-files\win32\SingletonInstall"
           Import-Module Machine
 
           $allinstances = Get-VSSetupInstance
@@ -1982,7 +1982,7 @@ variables:
 
       # Locate Visual Studio (Windows)
       if ("${env:vsstudio_dir}" -eq "" -and (!(Test-Path -Path .ci/sd4/vsenv${ExportExt}) -or !(Test-Path -Path .ci/sd4/vsenv.ps1))) {
-          $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-runtime-distribution\src\windows"
+          $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-component-ocamlcompiler\assets\staging-files\win32\SingletonInstall"
           Import-Module Machine
 
           $CompatibleVisualStudios = Get-CompatibleVisualStudios -ErrorIfNotFound
@@ -2076,7 +2076,7 @@ variables:
             dir "C:\Program Files (x86)\Windows Kits\10\Extension SDKs\WindowsDesktop"
           }
 
-          $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-runtime-distribution\src\windows"
+          $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-component-ocamlcompiler\assets\staging-files\win32\SingletonInstall"
           Import-Module Machine
 
           $allinstances = Get-VSSetupInstance
@@ -2587,18 +2587,18 @@ variables:
 
       install -d .ci/sd4/g
 
-      # dkml-runtime-distribution
+      # dkml-component-ocamlcompiler
 
-      #   For 'Diagnose Visual Studio environment variables (Windows)' we need dkml-runtime-distribution
+      #   For 'Diagnose Visual Studio environment variables (Windows)' we need dkml-component-ocamlcompiler
       #   so that 'Import-Module Machine' and 'Get-VSSetupInstance' can be run.
       #   The version doesn't matter too much, as long as it has a functioning Get-VSSetupInstance
       #   that supports the Visual Studio versions of the latest GitLab CI and GitHub Actions machines.
       #   commit 4d6f1bfc3510c55ba4273cb240e43727854b5718 = WinSDK 19041 and VS 14.29
       case "$dkml_host_abi" in
       windows_*)
-          section_begin checkout-dkml-runtime-distribution 'Checkout dkml-runtime-distribution'
-          git_checkout dkml-runtime-distribution https://github.com/diskuv/dkml-runtime-distribution.git "4d6f1bfc3510c55ba4273cb240e43727854b5718"
-          section_end checkout-dkml-runtime-distribution
+          section_begin checkout-dkml-component-ocamlcompiler 'Checkout dkml-component-ocamlcompiler'
+          git_checkout dkml-component-ocamlcompiler https://github.com/diskuv/dkml-component-ocamlcompiler.git "b9142380b0b8771a0d02f8b88ea786152a6e3d09"
+          section_end checkout-dkml-component-ocamlcompiler
           ;;
       esac
 
@@ -4296,18 +4296,18 @@ variables:
 
       install -d .ci/sd4/g
 
-      # dkml-runtime-distribution
+      # dkml-component-ocamlcompiler
 
-      #   For 'Diagnose Visual Studio environment variables (Windows)' we need dkml-runtime-distribution
+      #   For 'Diagnose Visual Studio environment variables (Windows)' we need dkml-component-ocamlcompiler
       #   so that 'Import-Module Machine' and 'Get-VSSetupInstance' can be run.
       #   The version doesn't matter too much, as long as it has a functioning Get-VSSetupInstance
       #   that supports the Visual Studio versions of the latest GitLab CI and GitHub Actions machines.
       #   commit 4d6f1bfc3510c55ba4273cb240e43727854b5718 = WinSDK 19041 and VS 14.29
       case "$dkml_host_abi" in
       windows_*)
-          section_begin checkout-dkml-runtime-distribution 'Checkout dkml-runtime-distribution'
-          git_checkout dkml-runtime-distribution https://github.com/diskuv/dkml-runtime-distribution.git "4d6f1bfc3510c55ba4273cb240e43727854b5718"
-          section_end checkout-dkml-runtime-distribution
+          section_begin checkout-dkml-component-ocamlcompiler 'Checkout dkml-component-ocamlcompiler'
+          git_checkout dkml-component-ocamlcompiler https://github.com/diskuv/dkml-component-ocamlcompiler.git "b9142380b0b8771a0d02f8b88ea786152a6e3d09"
+          section_end checkout-dkml-component-ocamlcompiler
           ;;
       esac
 
diff --git a/test/pc/setup-dkml-darwin_x86_64.sh b/test/pc/setup-dkml-darwin_x86_64.sh
index b5e78ab5..cb9565e6 100644
--- a/test/pc/setup-dkml-darwin_x86_64.sh
+++ b/test/pc/setup-dkml-darwin_x86_64.sh
@@ -1019,18 +1019,18 @@ section_end checkout-info
 
 install -d .ci/sd4/g
 
-# dkml-runtime-distribution
+# dkml-component-ocamlcompiler
 
-#   For 'Diagnose Visual Studio environment variables (Windows)' we need dkml-runtime-distribution
+#   For 'Diagnose Visual Studio environment variables (Windows)' we need dkml-component-ocamlcompiler
 #   so that 'Import-Module Machine' and 'Get-VSSetupInstance' can be run.
 #   The version doesn't matter too much, as long as it has a functioning Get-VSSetupInstance
 #   that supports the Visual Studio versions of the latest GitLab CI and GitHub Actions machines.
 #   commit 4d6f1bfc3510c55ba4273cb240e43727854b5718 = WinSDK 19041 and VS 14.29
 case "$dkml_host_abi" in
 windows_*)
-    section_begin checkout-dkml-runtime-distribution 'Checkout dkml-runtime-distribution'
-    git_checkout dkml-runtime-distribution https://github.com/diskuv/dkml-runtime-distribution.git "4d6f1bfc3510c55ba4273cb240e43727854b5718"
-    section_end checkout-dkml-runtime-distribution
+    section_begin checkout-dkml-component-ocamlcompiler 'Checkout dkml-component-ocamlcompiler'
+    git_checkout dkml-component-ocamlcompiler https://github.com/diskuv/dkml-component-ocamlcompiler.git "b9142380b0b8771a0d02f8b88ea786152a6e3d09"
+    section_end checkout-dkml-component-ocamlcompiler
     ;;
 esac
 
diff --git a/test/pc/setup-dkml-linux_x86.sh b/test/pc/setup-dkml-linux_x86.sh
index 0a30c592..428d1565 100644
--- a/test/pc/setup-dkml-linux_x86.sh
+++ b/test/pc/setup-dkml-linux_x86.sh
@@ -1026,18 +1026,18 @@ section_end checkout-info
 
 install -d .ci/sd4/g
 
-# dkml-runtime-distribution
+# dkml-component-ocamlcompiler
 
-#   For 'Diagnose Visual Studio environment variables (Windows)' we need dkml-runtime-distribution
+#   For 'Diagnose Visual Studio environment variables (Windows)' we need dkml-component-ocamlcompiler
 #   so that 'Import-Module Machine' and 'Get-VSSetupInstance' can be run.
 #   The version doesn't matter too much, as long as it has a functioning Get-VSSetupInstance
 #   that supports the Visual Studio versions of the latest GitLab CI and GitHub Actions machines.
 #   commit 4d6f1bfc3510c55ba4273cb240e43727854b5718 = WinSDK 19041 and VS 14.29
 case "$dkml_host_abi" in
 windows_*)
-    section_begin checkout-dkml-runtime-distribution 'Checkout dkml-runtime-distribution'
-    git_checkout dkml-runtime-distribution https://github.com/diskuv/dkml-runtime-distribution.git "4d6f1bfc3510c55ba4273cb240e43727854b5718"
-    section_end checkout-dkml-runtime-distribution
+    section_begin checkout-dkml-component-ocamlcompiler 'Checkout dkml-component-ocamlcompiler'
+    git_checkout dkml-component-ocamlcompiler https://github.com/diskuv/dkml-component-ocamlcompiler.git "b9142380b0b8771a0d02f8b88ea786152a6e3d09"
+    section_end checkout-dkml-component-ocamlcompiler
     ;;
 esac
 
diff --git a/test/pc/setup-dkml-linux_x86_64.sh b/test/pc/setup-dkml-linux_x86_64.sh
index ace3a210..6f1ff978 100644
--- a/test/pc/setup-dkml-linux_x86_64.sh
+++ b/test/pc/setup-dkml-linux_x86_64.sh
@@ -1026,18 +1026,18 @@ section_end checkout-info
 
 install -d .ci/sd4/g
 
-# dkml-runtime-distribution
+# dkml-component-ocamlcompiler
 
-#   For 'Diagnose Visual Studio environment variables (Windows)' we need dkml-runtime-distribution
+#   For 'Diagnose Visual Studio environment variables (Windows)' we need dkml-component-ocamlcompiler
 #   so that 'Import-Module Machine' and 'Get-VSSetupInstance' can be run.
 #   The version doesn't matter too much, as long as it has a functioning Get-VSSetupInstance
 #   that supports the Visual Studio versions of the latest GitLab CI and GitHub Actions machines.
 #   commit 4d6f1bfc3510c55ba4273cb240e43727854b5718 = WinSDK 19041 and VS 14.29
 case "$dkml_host_abi" in
 windows_*)
-    section_begin checkout-dkml-runtime-distribution 'Checkout dkml-runtime-distribution'
-    git_checkout dkml-runtime-distribution https://github.com/diskuv/dkml-runtime-distribution.git "4d6f1bfc3510c55ba4273cb240e43727854b5718"
-    section_end checkout-dkml-runtime-distribution
+    section_begin checkout-dkml-component-ocamlcompiler 'Checkout dkml-component-ocamlcompiler'
+    git_checkout dkml-component-ocamlcompiler https://github.com/diskuv/dkml-component-ocamlcompiler.git "b9142380b0b8771a0d02f8b88ea786152a6e3d09"
+    section_end checkout-dkml-component-ocamlcompiler
     ;;
 esac
 
diff --git a/test/pc/setup-dkml-windows_x86.ps1 b/test/pc/setup-dkml-windows_x86.ps1
index 7bd646ee..e527b83a 100644
--- a/test/pc/setup-dkml-windows_x86.ps1
+++ b/test/pc/setup-dkml-windows_x86.ps1
@@ -1269,18 +1269,18 @@ section_end checkout-info
 
 install -d .ci/sd4/g
 
-# dkml-runtime-distribution
+# dkml-component-ocamlcompiler
 
-#   For 'Diagnose Visual Studio environment variables (Windows)' we need dkml-runtime-distribution
+#   For 'Diagnose Visual Studio environment variables (Windows)' we need dkml-component-ocamlcompiler
 #   so that 'Import-Module Machine' and 'Get-VSSetupInstance' can be run.
 #   The version doesn't matter too much, as long as it has a functioning Get-VSSetupInstance
 #   that supports the Visual Studio versions of the latest GitLab CI and GitHub Actions machines.
 #   commit 4d6f1bfc3510c55ba4273cb240e43727854b5718 = WinSDK 19041 and VS 14.29
 case "$dkml_host_abi" in
 windows_*)
-    section_begin checkout-dkml-runtime-distribution 'Checkout dkml-runtime-distribution'
-    git_checkout dkml-runtime-distribution https://github.com/diskuv/dkml-runtime-distribution.git "4d6f1bfc3510c55ba4273cb240e43727854b5718"
-    section_end checkout-dkml-runtime-distribution
+    section_begin checkout-dkml-component-ocamlcompiler 'Checkout dkml-component-ocamlcompiler'
+    git_checkout dkml-component-ocamlcompiler https://github.com/diskuv/dkml-component-ocamlcompiler.git "b9142380b0b8771a0d02f8b88ea786152a6e3d09"
+    section_end checkout-dkml-component-ocamlcompiler
     ;;
 esac
 
@@ -2632,7 +2632,7 @@ if ( "${env:VERBOSE}" -eq "true" ) {
         Get-ChildItem "C:\Program Files (x86)\Windows Kits\10\Extension SDKs\WindowsDesktop"
     }
 
-    $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-runtime-distribution\src\windows"
+    $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-component-ocamlcompiler\assets\staging-files\win32\SingletonInstall"
     Import-Module Machine
 
     $allinstances = Get-VSSetupInstance
@@ -2657,7 +2657,7 @@ if (("${env:GITLAB_CI}" -eq "true") -or ("${env:PC_CI}" -eq "true")) {
 
 # Locate Visual Studio (Windows)
 if ("${env:vsstudio_dir}" -eq "" -and (!(Test-Path -Path .ci/sd4/vsenv${ExportExt}) -or !(Test-Path -Path .ci/sd4/vsenv.ps1))) {
-    $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-runtime-distribution\src\windows"
+    $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-component-ocamlcompiler\assets\staging-files\win32\SingletonInstall"
     Import-Module Machine
 
     $CompatibleVisualStudios = Get-CompatibleVisualStudios -ErrorIfNotFound
@@ -2746,7 +2746,7 @@ If ( "${env:VERBOSE}" -eq "true" ) {
     Get-ChildItem "C:\Program Files (x86)\Windows Kits\10\Extension SDKs\WindowsDesktop"
   }
 
-  $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-runtime-distribution\src\windows"
+  $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-component-ocamlcompiler\assets\staging-files\win32\SingletonInstall"
   Import-Module Machine
 
   $allinstances = Get-VSSetupInstance
diff --git a/test/pc/setup-dkml-windows_x86_64.ps1 b/test/pc/setup-dkml-windows_x86_64.ps1
index 2a7f44fb..1ce2115e 100644
--- a/test/pc/setup-dkml-windows_x86_64.ps1
+++ b/test/pc/setup-dkml-windows_x86_64.ps1
@@ -1268,18 +1268,18 @@ section_end checkout-info
 
 install -d .ci/sd4/g
 
-# dkml-runtime-distribution
+# dkml-component-ocamlcompiler
 
-#   For 'Diagnose Visual Studio environment variables (Windows)' we need dkml-runtime-distribution
+#   For 'Diagnose Visual Studio environment variables (Windows)' we need dkml-component-ocamlcompiler
 #   so that 'Import-Module Machine' and 'Get-VSSetupInstance' can be run.
 #   The version doesn't matter too much, as long as it has a functioning Get-VSSetupInstance
 #   that supports the Visual Studio versions of the latest GitLab CI and GitHub Actions machines.
 #   commit 4d6f1bfc3510c55ba4273cb240e43727854b5718 = WinSDK 19041 and VS 14.29
 case "$dkml_host_abi" in
 windows_*)
-    section_begin checkout-dkml-runtime-distribution 'Checkout dkml-runtime-distribution'
-    git_checkout dkml-runtime-distribution https://github.com/diskuv/dkml-runtime-distribution.git "4d6f1bfc3510c55ba4273cb240e43727854b5718"
-    section_end checkout-dkml-runtime-distribution
+    section_begin checkout-dkml-component-ocamlcompiler 'Checkout dkml-component-ocamlcompiler'
+    git_checkout dkml-component-ocamlcompiler https://github.com/diskuv/dkml-component-ocamlcompiler.git "b9142380b0b8771a0d02f8b88ea786152a6e3d09"
+    section_end checkout-dkml-component-ocamlcompiler
     ;;
 esac
 
@@ -2631,7 +2631,7 @@ if ( "${env:VERBOSE}" -eq "true" ) {
         Get-ChildItem "C:\Program Files (x86)\Windows Kits\10\Extension SDKs\WindowsDesktop"
     }
 
-    $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-runtime-distribution\src\windows"
+    $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-component-ocamlcompiler\assets\staging-files\win32\SingletonInstall"
     Import-Module Machine
 
     $allinstances = Get-VSSetupInstance
@@ -2656,7 +2656,7 @@ if (("${env:GITLAB_CI}" -eq "true") -or ("${env:PC_CI}" -eq "true")) {
 
 # Locate Visual Studio (Windows)
 if ("${env:vsstudio_dir}" -eq "" -and (!(Test-Path -Path .ci/sd4/vsenv${ExportExt}) -or !(Test-Path -Path .ci/sd4/vsenv.ps1))) {
-    $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-runtime-distribution\src\windows"
+    $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-component-ocamlcompiler\assets\staging-files\win32\SingletonInstall"
     Import-Module Machine
 
     $CompatibleVisualStudios = Get-CompatibleVisualStudios -ErrorIfNotFound
@@ -2746,7 +2746,7 @@ If ( "${env:VERBOSE}" -eq "true" ) {
     Get-ChildItem "C:\Program Files (x86)\Windows Kits\10\Extension SDKs\WindowsDesktop"
   }
 
-  $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-runtime-distribution\src\windows"
+  $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-component-ocamlcompiler\assets\staging-files\win32\SingletonInstall"
   Import-Module Machine
 
   $allinstances = Get-VSSetupInstance
diff --git a/tmpl/gl/setup-dkml.gitlab-ci.yml b/tmpl/gl/setup-dkml.gitlab-ci.yml
index 50f0bc58..c388b5e5 100644
--- a/tmpl/gl/setup-dkml.gitlab-ci.yml
+++ b/tmpl/gl/setup-dkml.gitlab-ci.yml
@@ -271,7 +271,7 @@ variables:
             dir "C:\Program Files (x86)\Windows Kits\10\Extension SDKs\WindowsDesktop"
           }
 
-          $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-runtime-distribution\src\windows"
+          $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-component-ocamlcompiler\assets\staging-files\win32\SingletonInstall"
           Import-Module Machine
 
           $allinstances = Get-VSSetupInstance
diff --git a/tmpl/pc/setup-dkml-windows_x86.ps1 b/tmpl/pc/setup-dkml-windows_x86.ps1
index 7bd10494..b92195c0 100644
--- a/tmpl/pc/setup-dkml-windows_x86.ps1
+++ b/tmpl/pc/setup-dkml-windows_x86.ps1
@@ -243,7 +243,7 @@ If ( "${env:VERBOSE}" -eq "true" ) {
     Get-ChildItem "C:\Program Files (x86)\Windows Kits\10\Extension SDKs\WindowsDesktop"
   }
 
-  $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-runtime-distribution\src\windows"
+  $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-component-ocamlcompiler\assets\staging-files\win32\SingletonInstall"
   Import-Module Machine
 
   $allinstances = Get-VSSetupInstance
diff --git a/tmpl/pc/setup-dkml-windows_x86_64.ps1 b/tmpl/pc/setup-dkml-windows_x86_64.ps1
index c91faaab..c032da12 100644
--- a/tmpl/pc/setup-dkml-windows_x86_64.ps1
+++ b/tmpl/pc/setup-dkml-windows_x86_64.ps1
@@ -244,7 +244,7 @@ If ( "${env:VERBOSE}" -eq "true" ) {
     Get-ChildItem "C:\Program Files (x86)\Windows Kits\10\Extension SDKs\WindowsDesktop"
   }
 
-  $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-runtime-distribution\src\windows"
+  $env:PSModulePath += "$([System.IO.Path]::PathSeparator).ci\sd4\g\dkml-component-ocamlcompiler\assets\staging-files\win32\SingletonInstall"
   Import-Module Machine
 
   $allinstances = Get-VSSetupInstance