Skip to content

Commit 34935f2

Browse files
authored
Reorder tools installs (#447)
The perl installer changed so it adds a path with `cmake` and `ninja` in it. Move those installs before `perl`.
1 parent 462ad08 commit 34935f2

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

tools/Dockerfile

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,30 @@ COPY gperf C:/tools/gperf
5252
RUN Register-SystemPath -Path C:\Tools\gperf\bin; `
5353
gperf --version;
5454

55+
#--------------------------------------------------------------------
56+
# Install CMake
57+
#--------------------------------------------------------------------
58+
59+
ENV CMAKE_VERSION 3.31.9
60+
61+
RUN Install-CMake -Version $env:CMAKE_VERSION -InstallationPath C:\tools\cmake;
62+
63+
#--------------------------------------------------------------------
64+
# Install Ninja build system
65+
#--------------------------------------------------------------------
66+
67+
ENV NINJA_VERSION 1.13.1
68+
69+
RUN Install-Ninja -Version $env:NINJA_VERSION -InstallationPath C:\tools\ninja;
70+
71+
#--------------------------------------------------------------------
72+
# Install NuGet CLI
73+
#--------------------------------------------------------------------
74+
75+
ENV NUGET_VERSION 6.14.0
76+
77+
RUN Install-NuGet -Version $env:NUGET_VERSION -InstallationPath C:\tools\nuget;
78+
5579
#--------------------------------------------------------------------
5680
# Install Strawberry Perl x64
5781
#--------------------------------------------------------------------
@@ -101,30 +125,6 @@ ENV WEBRICK_VERSION 1.9.1
101125

102126
RUN gem install webrick -v $env:WEBRICK_VERSION
103127

104-
#--------------------------------------------------------------------
105-
# Install CMake
106-
#--------------------------------------------------------------------
107-
108-
ENV CMAKE_VERSION 3.31.9
109-
110-
RUN Install-CMake -Version $env:CMAKE_VERSION -InstallationPath C:\tools\cmake;
111-
112-
#--------------------------------------------------------------------
113-
# Install Ninja build system
114-
#--------------------------------------------------------------------
115-
116-
ENV NINJA_VERSION 1.13.1
117-
118-
RUN Install-Ninja -Version $env:NINJA_VERSION -InstallationPath C:\tools\ninja;
119-
120-
#--------------------------------------------------------------------
121-
# Install NuGet CLI
122-
#--------------------------------------------------------------------
123-
124-
ENV NUGET_VERSION 6.14.0
125-
126-
RUN Install-NuGet -Version $env:NUGET_VERSION -InstallationPath C:\tools\nuget;
127-
128128
#--------------------------------------------------------------------
129129
# Install XAMPP
130130
#--------------------------------------------------------------------

0 commit comments

Comments
 (0)