diff --git a/configs/platforms/windows-2012r2-x64.rb b/configs/platforms/windows-2012r2-x64.rb index 493995a..985c8cb 100644 --- a/configs/platforms/windows-2012r2-x64.rb +++ b/configs/platforms/windows-2012r2-x64.rb @@ -10,7 +10,7 @@ # We don't want to install any packages from the chocolatey repo by accident plat.provision_with "C:/ProgramData/chocolatey/bin/choco.exe sources remove -name chocolatey" - plat.provision_with "C:/ProgramData/chocolatey/bin/choco.exe install -y mingw-w64 -version 5.2.0 -debug --no-progress" + plat.provision_with "C:/ProgramData/chocolatey/bin/choco.exe install -y mingw -version 11.2.0 -debug --no-progress" plat.provision_with "C:/ProgramData/chocolatey/bin/choco.exe install -y Wix310 -version 3.10.2 -debug -x86 --no-progress" plat.install_build_dependencies_with "C:/ProgramData/chocolatey/bin/choco.exe install -y --no-progress" diff --git a/configs/platforms/windows-2012r2-x86.rb b/configs/platforms/windows-2012r2-x86.rb index 703fdaf..ec04b85 100644 --- a/configs/platforms/windows-2012r2-x86.rb +++ b/configs/platforms/windows-2012r2-x86.rb @@ -10,7 +10,7 @@ # We don't want to install any packages from the chocolatey repo by accident plat.provision_with "C:/ProgramData/chocolatey/bin/choco.exe sources remove -name chocolatey" - plat.provision_with "C:/ProgramData/chocolatey/bin/choco.exe install -y mingw-w32 -version 5.2.0 -debug -x86 --no-progress" + plat.provision_with "C:/ProgramData/chocolatey/bin/choco.exe install -y mingw -version 11.2.0 -debug -x86 --no-progress" plat.provision_with "C:/ProgramData/chocolatey/bin/choco.exe install -y Wix310 -version 3.10.2 -debug -x86 --no-progress" plat.install_build_dependencies_with "C:/ProgramData/chocolatey/bin/choco.exe install -y --no-progress" diff --git a/configs/projects/pl-toolchain.rb b/configs/projects/pl-toolchain.rb index 76258b3..5e9b9ca 100644 --- a/configs/projects/pl-toolchain.rb +++ b/configs/projects/pl-toolchain.rb @@ -3,7 +3,7 @@ instance_eval File.read('configs/projects/pl-build-tools.rb') proj.description "Puppet Labs cmake toolchain files" - proj.version "2015.12.01" + proj.version "2025.10.15" proj.license "Puppet Labs" proj.vendor "Puppet Labs " proj.homepage "https://www.puppetlabs.com" diff --git a/files/cmake/windows-x64-toolchain.cmake b/files/cmake/windows-x64-toolchain.cmake index 53e73ab..57e9820 100644 --- a/files/cmake/windows-x64-toolchain.cmake +++ b/files/cmake/windows-x64-toolchain.cmake @@ -5,7 +5,7 @@ SET(CMAKE_SYSTEM_VERSION 1) # specify the cross compiler SET(PL_TOOLS_ROOT C:/tools/pl-build-tools) -SET(GCC_ROOT C:/tools/mingw64) +SET(GCC_ROOT C:/ProgramData/chocolatey/lib/mingw/tools/install/mingw64) SET(CMAKE_C_COMPILER ${GCC_ROOT}/bin/gcc.exe) SET(CMAKE_CXX_COMPILER ${GCC_ROOT}/bin/g++.exe) diff --git a/files/cmake/windows-x86-toolchain.cmake b/files/cmake/windows-x86-toolchain.cmake index 681d58e..3d7dd75 100644 --- a/files/cmake/windows-x86-toolchain.cmake +++ b/files/cmake/windows-x86-toolchain.cmake @@ -5,7 +5,7 @@ SET(CMAKE_SYSTEM_VERSION 1) # specify the cross compiler SET(PL_TOOLS_ROOT C:/tools/pl-build-tools) -SET(GCC_ROOT C:/tools/mingw32) +SET(GCC_ROOT C:/ProgramData/chocolatey/lib/mingw/tools/install/mingw32) SET(CMAKE_C_COMPILER ${GCC_ROOT}/bin/gcc.exe) SET(CMAKE_CXX_COMPILER ${GCC_ROOT}/bin/g++.exe)