From 4f4dc1a3ed974ffa15a8a27c810b945424e3fc7a Mon Sep 17 00:00:00 2001 From: tschmidty69 Date: Mon, 28 Jul 2025 15:06:27 -0400 Subject: [PATCH] gm updated; small update to wix install --- buildtools/msys2installdeps.sh | 6 +++--- buildtools/windows-deps-install-wix4.ps1 | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/buildtools/msys2installdeps.sh b/buildtools/msys2installdeps.sh index 2fa607871e..8c4904db30 100644 --- a/buildtools/msys2installdeps.sh +++ b/buildtools/msys2installdeps.sh @@ -148,9 +148,9 @@ done # compile graphicsmagick for current arch as MSYS2 packaged one is buggy ( cd /tmp - wget https://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/1.3.43/GraphicsMagick-1.3.43.tar.xz - tar xJf GraphicsMagick-1.3.43.tar.xz - cd GraphicsMagick-1.3.43 + wget https://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/1.3.45/GraphicsMagick-1.3.45.tar.xz + tar xJf GraphicsMagick-1.3.45.tar.xz + cd GraphicsMagick-1.3.45 ./configure --enable-shared && make && make install ) diff --git a/buildtools/windows-deps-install-wix4.ps1 b/buildtools/windows-deps-install-wix4.ps1 index bdc0d2e5c3..95223bed74 100644 --- a/buildtools/windows-deps-install-wix4.ps1 +++ b/buildtools/windows-deps-install-wix4.ps1 @@ -20,5 +20,9 @@ if (-not $MSYS) { # install WiX in a path where MSYS finds it $WIXPATH = $MSYS + "\usr\local\bin\" $Env:DOTNET_CLI_TELEMETRY_OPTOUT = "1" +if (-not (Test-Path $WIXPATH)) { + New-Item -ItemType Directory -Path $WIXPATH -Force | Out-Null +} +dotnet nuget add source https://api.nuget.org/v3/index.json -n nuget.org dotnet tool install wix --version 4.0.4 --tool-path $WIXPATH & "$WIXPATH\wix" extension add --global WixToolset.UI.wixext/4.0.4 -- GitLab