From 887ff3387c32ab8f7562b67953f863e525ed235b Mon Sep 17 00:00:00 2001
From: Don Olmstead <me@donolmstead.dev>
Date: Fri, 10 Oct 2025 16:40:11 -0700
Subject: [PATCH] Reorder tools installs

The perl installer changed so it adds a path with `cmake` and `ninja` in it. Move those installs before `perl`.
---
 tools/Dockerfile | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/tools/Dockerfile b/tools/Dockerfile
index 83e590d..f917d3d 100644
--- a/tools/Dockerfile
+++ b/tools/Dockerfile
@@ -52,6 +52,30 @@ COPY gperf C:/tools/gperf
 RUN Register-SystemPath -Path C:\Tools\gperf\bin; `
     gperf --version;
 
+#--------------------------------------------------------------------
+# Install CMake
+#--------------------------------------------------------------------
+
+ENV CMAKE_VERSION 3.31.9
+
+RUN Install-CMake -Version $env:CMAKE_VERSION -InstallationPath C:\tools\cmake;
+
+#--------------------------------------------------------------------
+# Install Ninja build system
+#--------------------------------------------------------------------
+
+ENV NINJA_VERSION 1.13.1
+
+RUN Install-Ninja -Version $env:NINJA_VERSION -InstallationPath C:\tools\ninja;
+
+#--------------------------------------------------------------------
+# Install NuGet CLI
+#--------------------------------------------------------------------
+
+ENV NUGET_VERSION 6.14.0
+
+RUN Install-NuGet -Version $env:NUGET_VERSION -InstallationPath C:\tools\nuget;
+
 #--------------------------------------------------------------------
 # Install Strawberry Perl x64
 #--------------------------------------------------------------------
@@ -101,30 +125,6 @@ ENV WEBRICK_VERSION 1.9.1
 
 RUN gem install webrick -v $env:WEBRICK_VERSION
 
-#--------------------------------------------------------------------
-# Install CMake
-#--------------------------------------------------------------------
-
-ENV CMAKE_VERSION 3.31.9
-
-RUN Install-CMake -Version $env:CMAKE_VERSION -InstallationPath C:\tools\cmake;
-
-#--------------------------------------------------------------------
-# Install Ninja build system
-#--------------------------------------------------------------------
-
-ENV NINJA_VERSION 1.13.1
-
-RUN Install-Ninja -Version $env:NINJA_VERSION -InstallationPath C:\tools\ninja;
-
-#--------------------------------------------------------------------
-# Install NuGet CLI
-#--------------------------------------------------------------------
-
-ENV NUGET_VERSION 6.14.0
-
-RUN Install-NuGet -Version $env:NUGET_VERSION -InstallationPath C:\tools\nuget;
-
 #--------------------------------------------------------------------
 # Install XAMPP
 #--------------------------------------------------------------------